WL#15135 third set of post-push fixes

Disable most of NodeCertificate-t in builds that use OpenSSL 1.0.x.

Change-Id: Ic197e5d81302e39f000824d3a8ac13d635337988

Author: jdduncan

storage/ndb/include/util/ndb_openssl3_compat.h

@@ -51,11 +51,15 @@ EVP_PKEY * EVP_EC_generate(const char * curve);
 const ASN1_INTEGER *X509_get0_serialNumber(const X509 *);
 
 #ifndef X509_getm_notBefore
+
 #define X509_getm_notBefore X509_get_notBefore
 #define X509_getm_notAfter X509_get_notAfter
-#define __NEED_STUB_ASN1_TIME_GET0_FUNCTIONS 1
+#define __NEED_STUB_ASN1_FUNCTIONS 1
+int ASN1_INTEGER_get_uint64(uint64_t *, const ASN1_INTEGER *);
+int ASN1_TIME_to_tm(const ASN1_TIME *, struct tm *);
 const ASN1_TIME *X509_get0_notBefore(const X509 *);
 const ASN1_TIME *X509_get0_notAfter(const X509 *);
+
 #endif
 
 EVP_PKEY *X509_get0_pubkey(X509 *);
@@ -65,7 +69,6 @@ inline void X509_get0_signature(const ASN1_BIT_STRING **, const X509_ALGOR **,
 int X509_get_signature_info(X509 *, int *, int *, int *, uint32_t *);
 X509_EXTENSION *X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *,
                                     X509V3_CTX *, int, const char *);
-int ASN1_TIME_to_tm(const ASN1_TIME *, struct tm *);
 int EVP_PKEY_up_ref(EVP_PKEY *);
 int X509_up_ref(X509 *);
 

storage/ndb/src/common/util/NodeCertificate.cpp

@@ -1349,6 +1349,10 @@ static constexpr bool isWin32 = 1;
 static constexpr bool isWin32 = 0;
 #endif
 
+static constexpr bool openssl_version_ok =
+  ((OPENSSL_VERSION_NUMBER >= NDB_TLS_MINIMUM_OPENSSL) ||
+   (OPENSSL_VERSION_NUMBER == UBUNTU18_OPENSSL_VER_ID));
+
 /*
   Test name parsing
 */
@@ -1740,17 +1744,21 @@ int main(int argc, char *argv[]) {
   r1 = search_path_test();
   if(r1 != 0) return fail("search path", r1);
 
-  r1 = cert_lifetime_test();
-  if(r1 != 0) return fail("lifetime", r1);
-
   r1 = parser_test();
   if(r1 != 0) return fail("parser", r1);
 
-  r1 = file_test();
-  if(r1 != 0) return fail("file", r1);
+  if(openssl_version_ok) {
+
+    r1 = cert_lifetime_test();
+    if(r1 != 0) return fail("lifetime", r1);
 
-  r1 = verify_test();
-  if(r1 != 0) return fail("verify", r1);
+    r1 = file_test();
+    if(r1 != 0) return fail("file", r1);
+
+    r1 = verify_test();
+    if(r1 != 0) return fail("verify", r1);
+
+  }
 
   return 0;
 }

storage/ndb/src/common/util/ndb_openssl3_compat.cpp

@@ -131,10 +131,6 @@ X509_EXTENSION *X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf,
   return X509V3_EXT_conf_nid(conf, ctx, ext_nid, const_cast<char *>(value));
 }
 
-int ASN1_TIME_to_tm(const ASN1_TIME *, struct tm *) {
-  return 0;
-}
-
 int EVP_PKEY_up_ref(EVP_PKEY *) {
   return 0;
 }
@@ -143,14 +139,24 @@ int X509_up_ref(X509 *) {
   return 0;
 }
 
-#ifdef __NEED_STUB_ASN1_TIME_GET0_FUNCTIONS
+#ifdef __NEED_STUB_ASN1_FUNCTIONS
 const ASN1_TIME *X509_get0_notBefore(const X509 *x) {
   return X509_get_notBefore(x);
 }
 
 const ASN1_TIME *X509_get0_notAfter(const X509 *x) {
   return X509_get_notAfter(x);
 }
-#endif // __NEED_STUB_ASN1_TIME_GET0_FUNCTIONS
+
+int ASN1_TIME_to_tm(const ASN1_TIME *, struct tm *) {
+  return 0;
+}
+
+int ASN1_INTEGER_get_uint64(uint64_t *v, const ASN1_INTEGER *) {
+  *v = 0;
+  return 0;
+}
+
+#endif // __NEED_STUB_ASN1_FUNCTIONS
 
 #endif