[patch] Net-SSLeay-1.810.0-openssl-1.1.patch

Net-SSLeay-1.810.0-openssl-1.1.patch (text/plain), 4.13 KB, created by Mark Wright on 2017-10-18 06:58:19 UTC

--- Net-SSLeay-1.81-orig/SSLeay.xs	2017-03-04 15:25:15.000000000 +1100
+++ Net-SSLeay-1.81/SSLeay.xs	2017-10-18 16:38:26.218341291 +1100
@@ -195,6 +195,11 @@
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
 #include <openssl/ocsp.h>
 #endif
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/rsa.h>
+#endif
 #undef BLOCK
 
 /* Debugging output - to enable use:
@@ -1471,6 +1476,88 @@
         : &PL_sv_undef;
 }
 
+#if OPENSSL_API_COMPAT >= 0x10100000L
+#define SSLeay                  OpenSSL_version_num
+#define SSLeay_version          OpenSSL_version
+
+#define SSL_library_init() OPENSSL_init_ssl(0, NULL)
+#define SSL_load_error_strings() \
+    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                     | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+
+#define ERR_load_crypto_strings() \
+    OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+#define ERR_free_strings() while(0) continue
+
+#define RAND_pseudo_bytes RAND_bytes
+
+#define RAND_cleanup() while(0) continue
+
+#define X509_get_notBefore X509_getm_notBefore
+#define X509_get_notAfter X509_getm_notAfter
+#define X509_set_notBefore X509_set1_notBefore
+#define X509_set_notAfter X509_set1_notAfter
+#define X509_CRL_get_lastUpdate X509_CRL_get0_lastUpdate
+#define X509_CRL_get_nextUpdate X509_CRL_get0_nextUpdate
+#define X509_CRL_set_lastUpdate X509_CRL_set1_lastUpdate
+#define X509_CRL_set_nextUpdate X509_CRL_set1_nextUpdate
+
+#define ASN1_STRING_data ASN1_STRING_get0_data
+
+#define OPENSSL_add_all_algorithms_conf() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                        | OPENSSL_INIT_ADD_ALL_DIGESTS \
+                        | OPENSSL_INIT_LOAD_CONFIG, NULL)
+
+#define OPENSSL_add_all_algorithms_noconf() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                        | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+
+#ifdef OPENSSL_LOAD_CONF
+#define OpenSSL_add_all_algorithms() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                        | OPENSSL_INIT_ADD_ALL_DIGESTS \
+                        | OPENSSL_INIT_LOAD_CONFIG, NULL)
+#else
+#define OpenSSL_add_all_algorithms() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                        | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+#endif
+
+#define OpenSSL_add_all_digests() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+
+static void _set_protocol_version(const SSL_METHOD *m, int version)
+{
+    SSL_CTX *ctx = SSL_CTX_new(m);
+    SSL_CTX_set_min_proto_version(ctx, version);
+    SSL_CTX_set_max_proto_version(ctx, version);
+    SSL_CTX_free(ctx);
+}
+
+const SSL_METHOD *TLSv1_method(void)
+{
+    const SSL_METHOD *m = TLS_method();
+    _set_protocol_version(m, TLS1_VERSION);
+    return m;
+}
+
+const SSL_METHOD *TLSv1_1_method(void)
+{
+    const SSL_METHOD *m = TLS_method();
+    _set_protocol_version(m, TLS1_1_VERSION);
+    return m;
+}
+
+const SSL_METHOD *TLSv1_2_method(void)
+{
+    const SSL_METHOD *m = TLS_method();
+    _set_protocol_version(m, TLS1_2_VERSION);
+    return m;
+}
+
+#endif
+
 /* ============= end of helper functions ============== */
 
 MODULE = Net::SSLeay		PACKAGE = Net::SSLeay          PREFIX = SSL_
@@ -4942,7 +5029,7 @@
 
 #endif
 
-#ifdef __ANDROID__
+#if defined(__ANDROID__) || OPENSSL_API_COMPAT >= 0x10100000L
 
 RSA *
 RSA_generate_key(bits,ee,perl_cb=&PL_sv_undef,perl_data=&PL_sv_undef)
@@ -4961,17 +5048,19 @@
        e = BN_new();
        BN_set_word(e, ee);
        cb_data = simple_cb_data_new(perl_cb, perl_data);
-       BN_GENCB new_cb;
-       BN_GENCB_set_old(&new_cb, ssleay_RSA_generate_key_cb_invoke, cb_data);
+       BN_GENCB *new_cb  = BN_GENCB_new();
+       BN_GENCB_set_old(new_cb, ssleay_RSA_generate_key_cb_invoke, cb_data);
 
        ret = RSA_new();
-       rc = RSA_generate_key_ex(ret, bits, e, &new_cb);
+       rc = RSA_generate_key_ex(ret, bits, e, new_cb);
        
        if (rc == -1 || ret == NULL)
            croak("Couldn't generate RSA key");
        simple_cb_data_free(cb_data);
        BN_free(e);
        e = NULL;
+       BN_GENCB_free(new_cb);
+       new_cb = NULL;
        RETVAL = ret;
     OUTPUT:
         RETVAL