WL#15135 post-push fix

Add stub functions to allow NodeCertificate.cpp to compile
succesfully on EL7 with OpenSSL 1.0.2.

Change-Id: I882743ea6f652847b2205a94f60b6d03e2a2f478

Author: jdduncan

storage/ndb/include/util/ndb_openssl3_compat.h

@@ -30,7 +30,7 @@
 #ifndef NDB_PORTLIB_OPENSSL_COMPAT_H
 #define NDB_PORTLIB_OPENSSL_COMPAT_H
 #include <openssl/ssl.h>
-
+#include "portlib/ndb_openssl_version.h"
 
 #if OPENSSL_VERSION_NUMBER < 0x30000000L && OPENSSL_VERSION_NUMBER > 0x10002000L
 
@@ -44,4 +44,27 @@ EVP_PKEY * EVP_EC_generate(const char * curve);
 
 #endif  /* OPENSSL_VERSION_NUMBER */
 
+/* These stub functions allow NodeCertificate.cpp to compile with old OpenSSL */
+#if OPENSSL_VERSION_NUMBER < NDB_TLS_MINIMUM_OPENSSL
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+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
+#endif
+
+EVP_PKEY  *X509_REQ_get0_pubkey(X509_REQ *);
+void X509_get0_signature(const ASN1_BIT_STRING **, const X509_ALGOR **,
+                         const X509 *);
+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 *);
+
+#endif
+
 #endif  /* NDB_PORTLIB_OPENSSL_COMPAT_H */

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

@@ -78,11 +78,11 @@ int PkiFile::assign(PathName & path, const char * dir, const char * file) {
 static void expand(BaseString & result, const BaseString & path, int envStart) {
   const char * item = path.c_str();
   size_t envEnd = envStart + 1;
-  char c;
-  do {
+  char c = item[envEnd];
+  while(isalnum(c) || c == '_') {
     envEnd++;
     c = item[envEnd];
-  } while(isalnum(c) || c == '_');
+  }
 
   BaseString envVar = path.substr(envStart + 1, envEnd);
   if(envStart > 0)
@@ -1393,7 +1393,7 @@ static int cert_lifetime_test() {
   CertLifetime c2;
   c2.set_lifetime(20, 0);
   t2 = c2.replace_time(5) - time(&t1);
-  printf("t2: %ld, days: %ld \n", t2, t2/CertLifetime::SecondsPerDay);
+  printf("t2: %ld days\n", (long) t2/CertLifetime::SecondsPerDay);
   if(t2 != five_days) return 9;
 
   /* Write lifetime to certificate */

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

@@ -100,3 +100,46 @@ int EVP_PKEY_eq(const EVP_PKEY *a, const EVP_PKEY *b) {
 
 #endif
 
+/* Stub functions to allow NodeCertificate.cpp to compile with old OpenSSL */
+#if OPENSSL_VERSION_NUMBER < NDB_TLS_MINIMUM_OPENSSL
+
+const ASN1_INTEGER *X509_get0_serialNumber(const X509 *x) {
+  return X509_get_serialNumber(const_cast<X509 *>(x));
+}
+
+EVP_PKEY *X509_REQ_get0_pubkey(X509_REQ *csr) {
+  EVP_PKEY * key = X509_REQ_get_pubkey(csr);
+  if(key)
+    EVP_PKEY_free(key);
+  return key;
+}
+
+void X509_get0_signature(const ASN1_BIT_STRING ** sig, const X509_ALGOR ** alg,
+                         const X509 * x) {
+  X509_get0_signature(sig, const_cast<X509_ALGOR **>(alg), x);
+}
+
+int X509_get_signature_info(X509 *, int *, int *, int *, uint32_t *) {
+  return 0;
+}
+
+X509_EXTENSION *X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf,
+                                    X509V3_CTX *ctx, int ext_nid,
+                                    const char *value) {
+  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;
+}
+
+int X509_up_ref(X509 *) {
+  return 0;
+}
+
+
+#endif

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

@@ -44,7 +44,7 @@
 #include "util/TlsKeyManager.hpp"
 
 int opt_port = 4400;
-short opt_last_test = INT16_MAX;
+int opt_last_test = INT16_MAX;
 
 static struct my_option options[] =
 {