66 lines
2.9 KiB
Diff
66 lines
2.9 KiB
Diff
|
--- a/ext/openssl/openssl.c 2018-04-04 14:26:34.583000000 +0000
|
||
|
|
+++ b/ext/openssl/openssl.c 2018-04-04 14:20:16.907000000 +0000
|
||
|
|
@@ -73,7 +73,7 @@
|
||
|
|
#ifdef HAVE_OPENSSL_MD2_H
|
||
|
|
#define OPENSSL_ALGO_MD2 4
|
||
|
|
#endif
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
|
||
|
|
#define OPENSSL_ALGO_DSS1 5
|
||
|
|
#endif
|
||
|
|
#define OPENSSL_ALGO_SHA224 6
|
||
|
|
@@ -560,7 +560,7 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
/* {{{ OpenSSL compatibility functions and macros */
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
|
||
|
|
#define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa
|
||
|
|
#define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh
|
||
|
|
#define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa
|
||
|
|
@@ -677,7 +677,7 @@
|
||
|
|
return M_ASN1_STRING_data(asn1);
|
||
|
|
}
|
||
|
|
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER)
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
|
||
|
|
|
||
|
|
static int X509_get_signature_nid(const X509 *x)
|
||
|
|
{
|
||
|
|
@@ -1324,7 +1324,7 @@
|
||
|
|
mdtype = (EVP_MD *) EVP_md2();
|
||
|
|
break;
|
||
|
|
#endif
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
|
||
|
|
case OPENSSL_ALGO_DSS1:
|
||
|
|
mdtype = (EVP_MD *) EVP_dss1();
|
||
|
|
break;
|
||
|
|
@@ -1450,7 +1450,7 @@
|
||
|
|
#ifdef HAVE_OPENSSL_MD2_H
|
||
|
|
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2, CONST_CS|CONST_PERSISTENT);
|
||
|
|
#endif
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
|
||
|
|
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT);
|
||
|
|
#endif
|
||
|
|
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA224", OPENSSL_ALGO_SHA224, CONST_CS|CONST_PERSISTENT);
|
||
|
|
@@ -3620,7 +3620,7 @@
|
||
|
|
RETURN_FALSE;
|
||
|
|
}
|
||
|
|
|
||
|
|
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
|
||
|
|
/* Due to changes in OpenSSL 1.1 related to locking when decoding CSR,
|
||
|
|
* the pub key is not changed after assigning. It means if we pass
|
||
|
|
* a private key, it will be returned including the private part.
|
||
|
|
@@ -3631,7 +3631,7 @@
|
||
|
|
/* Retrieve the public key from the CSR */
|
||
|
|
tpubkey = X509_REQ_get_pubkey(csr);
|
||
|
|
|
||
|
|
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
|
||
|
|
/* We need to free the CSR as it was duplicated */
|
||
|
|
X509_REQ_free(csr);
|
||
|
|
#endif
|