[rs-commit] r151 - /mod_csr/trunk/mod_csr.c /mod_csr/trunk/openssl_setter_compat.h /mod_scep/trunk/mod_scep.c /mod_scep/trunk/openssl_setter_compat.h

[rs-commit at redwax.eu]

Author: dirkx at redwax.eu
Date: Fri Dec  6 20:33:56 2019
New Revision: 151

Log:
As the OpenSSL discussion may not finish before 1.1.1e -- isolate ourselves for now - so we can tag a relase for NixOS builds earlier.

Modified:
    mod_csr/trunk/mod_csr.c
    mod_csr/trunk/openssl_setter_compat.h
    mod_scep/trunk/mod_scep.c
    mod_scep/trunk/openssl_setter_compat.h

Modified: mod_csr/trunk/mod_csr.c
==============================================================================
--- mod_csr/trunk/mod_csr.c	(original)
+++ mod_csr/trunk/mod_csr.c	Fri Dec  6 20:33:56 2019
@@ -902,7 +902,7 @@
 #if OPENSSL_VERSION_NUMBER  >= 0x010100000L
     const X509_ALGOR *psigalg;
     X509_REQ_get0_signature(req, NULL, &psigalg);
-    X509_REQ_set1_signature(creq, X509_ALGOR_dup((X509_ALGOR*)psigalg));
+    _X509_REQ_set1_signature(creq, X509_ALGOR_dup((X509_ALGOR*)psigalg));
 #else
     creq->sig_alg = X509_ALGOR_dup(req->sig_alg);
 #endif

Modified: mod_csr/trunk/openssl_setter_compat.h
==============================================================================
--- mod_csr/trunk/openssl_setter_compat.h	(original)
+++ mod_csr/trunk/openssl_setter_compat.h	Fri Dec  6 20:33:56 2019
@@ -27,7 +27,8 @@
 //   openssl-1.1.1d 0x01010104fL (last version that needs it)
 //   openssl-1.1.1-dev		 (should not need it - post PR#10563).
 //
-#if OPENSSL_VERSION_NUMBER >= 0x010100000L &&  OPENSSL_VERSION_NUMBER  <= 0x01010104fL
+/* #if OPENSSL_VERSION_NUMBER >= 0x010100000L &&  OPENSSL_VERSION_NUMBER  <= 0x01010104fL */
+#if OPENSSL_VERSION_NUMBER >= 0x010100000L 
 #include "openssl/x509.h"
 
 #define HAS_OPENSSL_PR10563_WORK_AROUND
@@ -54,7 +55,7 @@
 };
 
 
-void X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg)
+static void _X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg)
 {
     if (req->sig_alg.algorithm)
         ASN1_OBJECT_free(req->sig_alg.algorithm);

Modified: mod_scep/trunk/mod_scep.c
==============================================================================
--- mod_scep/trunk/mod_scep.c	(original)
+++ mod_scep/trunk/mod_scep.c	Fri Dec  6 20:33:56 2019
@@ -2009,7 +2009,7 @@
 #if OPENSSL_VERSION_NUMBER  >= 0x010100000L
     const X509_ALGOR *psigalg;
     X509_REQ_get0_signature(req, NULL, &psigalg);
-    X509_REQ_set1_signature(creq, X509_ALGOR_dup((X509_ALGOR*)psigalg));
+    _X509_REQ_set1_signature(creq, X509_ALGOR_dup((X509_ALGOR*)psigalg));
 #else
     creq->sig_alg = X509_ALGOR_dup(req->sig_alg);
 #endif

Modified: mod_scep/trunk/openssl_setter_compat.h
==============================================================================
--- mod_scep/trunk/openssl_setter_compat.h	(original)
+++ mod_scep/trunk/openssl_setter_compat.h	Fri Dec  6 20:33:56 2019
@@ -27,7 +27,8 @@
 //   openssl-1.1.1d 0x01010104fL (last version that needs it)
 //   openssl-1.1.1-dev		 (should not need it - post PR#10563).
 //
-#if OPENSSL_VERSION_NUMBER >= 0x010100000L &&  OPENSSL_VERSION_NUMBER  <= 0x01010104fL
+/* #if OPENSSL_VERSION_NUMBER >= 0x010100000L &&  OPENSSL_VERSION_NUMBER  <= 0x01010104fL */
+#if OPENSSL_VERSION_NUMBER >= 0x010100000L 
 #include "openssl/x509.h"
 
 #define HAS_OPENSSL_PR10563_WORK_AROUND
@@ -54,7 +55,7 @@
 };
 
 
-void X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg)
+static void _X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg)
 {
     if (req->sig_alg.algorithm)
         ASN1_OBJECT_free(req->sig_alg.algorithm);