[rs-commit] r28 - in /redwax-tool/trunk: config.h.in configure.ac redwax_openssl.c

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Tue Nov 16 20:52:12 2021
New Revision: 28

Log:
Handle missing X509_get0_notAfter and X509_get0_notBefore.

Modified:
    redwax-tool/trunk/config.h.in
    redwax-tool/trunk/configure.ac
    redwax-tool/trunk/redwax_openssl.c

Modified: redwax-tool/trunk/config.h.in
==============================================================================
--- redwax-tool/trunk/config.h.in	(original)
+++ redwax-tool/trunk/config.h.in	Tue Nov 16 20:52:12 2021
@@ -89,6 +89,12 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the `X509_get0_notAfter' function. */
+#undef HAVE_X509_GET0_NOTAFTER
+
+/* Define to 1 if you have the `X509_get0_notBefore' function. */
+#undef HAVE_X509_GET0_NOTBEFORE
+
 /* Define to 1 if you have the `X509_STORE_CTX_get_num_untrusted' function. */
 #undef HAVE_X509_STORE_CTX_GET_NUM_UNTRUSTED
 

Modified: redwax-tool/trunk/configure.ac
==============================================================================
--- redwax-tool/trunk/configure.ac	(original)
+++ redwax-tool/trunk/configure.ac	Tue Nov 16 20:52:12 2021
@@ -18,7 +18,7 @@
 AC_ARG_WITH(openssl,[  --with-openssl      use openssl library],
   [
     if test "$with_openssl" != "no"; then
-      PKG_CHECK_MODULES(openssl, openssl >= 1.1.0)
+      PKG_CHECK_MODULES(openssl, openssl >= 1.0.2)
 
       CFLAGS="$CFLAGS $openssl_CFLAGS"
       CPPFLAGS="$CPPFLAGS $openssl_CPPFLAGS"
@@ -96,7 +96,7 @@
 
 # Checks for library functions.
 AC_FUNC_MALLOC
-AC_CHECK_FUNCS([OPENSSL_init_crypto X509_STORE_get0_param X509_STORE_CTX_set0_trusted_stack X509_STORE_CTX_get_num_untrusted EVP_PKEY_get0_description EVP_PKEY_get_bn_param RSA_get0_n RSA_get0_e RSA_get0_d RSA_get0_p RSA_get0_q RSA_get0_dmp1 RSA_get0_dmq1 RSA_get0_iqmp NSS_Initialize p11_kit_modules_load_and_initialize apr_crypto_clear])
+AC_CHECK_FUNCS([OPENSSL_init_crypto X509_STORE_get0_param X509_STORE_CTX_set0_trusted_stack X509_STORE_CTX_get_num_untrusted X509_get0_notBefore X509_get0_notAfter EVP_PKEY_get0_description EVP_PKEY_get_bn_param RSA_get0_n RSA_get0_e RSA_get0_d RSA_get0_p RSA_get0_q RSA_get0_dmp1 RSA_get0_dmq1 RSA_get0_iqmp NSS_Initialize p11_kit_modules_load_and_initialize apr_crypto_clear])
 
 AC_OUTPUT
 

Modified: redwax-tool/trunk/redwax_openssl.c
==============================================================================
--- redwax-tool/trunk/redwax_openssl.c	(original)
+++ redwax-tool/trunk/redwax_openssl.c	Tue Nov 16 20:52:12 2021
@@ -94,6 +94,14 @@
 
 #if !HAVE_X509_STORE_CTX_SET0_TRUSTED_STACK
 #define X509_STORE_CTX_set0_trusted_stack X509_STORE_CTX_trusted_stack
+#endif
+
+#if !HAVE_X509_GET0_NOTBEFORE
+#define X509_get0_notBefore X509_get_notBefore
+#endif
+
+#if !HAVE_X509_GET0_NOTAFTER
+#define X509_get0_notAfter X509_get_notAfter
 #endif
 
 #if !HAVE_EVP_PKEY_GET_BN_PARAM