File 0025-CPPXT-110-OpenSSL-1.1-Fix-some-signatures-... of Package xmltooling

Overview Repositories Revisions Requests Users Attributes Meta

File 0025-CPPXT-110-OpenSSL-1.1-Fix-some-signatures-and-names.patch of Package xmltooling

From 1d41f3aa173bdce6ce00fc56839afab00e6e3dbe Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Fri, 29 Jul 2016 16:10:19 +0100
Subject: [PATCH 25/31] CPPXT-110 OpenSSL 1.1: Fix some signatures and names

https://issues.shibboleth.net/jira/browse/CPPXT-110

Some of the helper functions previously introduced had the
wrong signature and namespace.

(Cherry-picked from openssl1.1 branch)
---
 xmltooling/security/impl/OpenSSLSupport.cpp | 20 ++++++++++----------
 xmltooling/security/impl/OpenSSLSupport.h   | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/xmltooling/security/impl/OpenSSLSupport.cpp b/xmltooling/security/impl/OpenSSLSupport.cpp
index 28dd378..ab9fe00 100644
--- a/xmltooling/security/impl/OpenSSLSupport.cpp
+++ b/xmltooling/security/impl/OpenSSLSupport.cpp
@@ -69,56 +69,56 @@ void X509StoreCtxRAII::set0TrustedStack(STACK_OF(X509) *sk)
     }
 }
 
-BIGNUM *DSA_get0_pubkey(const DSA *dsa)
+const BIGNUM *xmltooling::DSA_get0_pubkey(const DSA *dsa)
 {
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     return dsa->pub_key;
 #else
-    BIGNUM *result;
+    const BIGNUM *result;
     DSA_get0_key(dsa, &result, NULL);
     return result;
 #endif
 }
 
-BIGNUM *DSA_get0_privkey(const DSA *dsa)
+const BIGNUM *xmltooling::DSA_get0_privkey(const DSA *dsa)
 {
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     return dsa->priv_key;
 #else
-    BIGNUM *result;
+    const BIGNUM *result;
     DSA_get0_key(dsa, NULL, &result);
     return result;
 #endif
 }
 
-BIGNUM *RSA_get0_n(const RSA *rsa)
+const BIGNUM *xmltooling::RSA_get0_n(const RSA *rsa)
 {
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     return rsa->n;
 #else
-    BIGNUM *result;
+    const BIGNUM *result;
     RSA_get0_key(rsa, &result, NULL, NULL);
     return result;
 #endif
 }
 
-BIGNUM *RSA_get0_e(const RSA *rsa)
+const BIGNUM *xmltooling::RSA_get0_e(const RSA *rsa)
 {
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     return rsa->e;
 #else
-    BIGNUM *result;
+    const BIGNUM *result;
     RSA_get0_key(rsa, NULL, &result, NULL);
     return result;
 #endif
 }
 
-BIGNUM *RSA_get0_d(const RSA *rsa)
+const BIGNUM *xmltooling::RSA_get0_d(const RSA *rsa)
 {
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     return rsa->d;
 #else
-    BIGNUM *result;
+    const BIGNUM *result;
     RSA_get0_key(rsa, NULL, NULL, &result);
     return result;
 #endif
diff --git a/xmltooling/security/impl/OpenSSLSupport.h b/xmltooling/security/impl/OpenSSLSupport.h
index 2d267be..cf3e799 100644
--- a/xmltooling/security/impl/OpenSSLSupport.h
+++ b/xmltooling/security/impl/OpenSSLSupport.h
@@ -71,11 +71,11 @@ namespace xmltooling {
     };
 
 
-    BIGNUM *DSA_get0_pubkey(const DSA *dsa);
-    BIGNUM *DSA_get0_privkey(const DSA *dsa);
+    const BIGNUM *DSA_get0_pubkey(const DSA *dsa);
+    const BIGNUM *DSA_get0_privkey(const DSA *dsa);
 
-    BIGNUM *RSA_get0_n(const RSA *rsa);
-    BIGNUM *RSA_get0_d(const RSA *rsa);
-    BIGNUM *RSA_get0_e(const RSA *rsa);
+    const BIGNUM *RSA_get0_n(const RSA *rsa);
+    const BIGNUM *RSA_get0_d(const RSA *rsa);
+    const BIGNUM *RSA_get0_e(const RSA *rsa);
 
 }
-- 
2.13.6

Places

File 0025-CPPXT-110-OpenSSL-1.1-Fix-some-signatures-and-names.patch of Package xmltooling

Places