[patch] Fix LibreSSL 2.7

libressl-2.7.patch (text/plain), 1.56 KB, created by Tom Li on 2018-06-16 09:59:31 UTC

diff -upr pypy3-v6.0.0-src/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509.py pypy3-v6.0.0-src-libressl/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509.py
--- pypy3-v6.0.0-src/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509.py	2018-04-24 14:05:26.000000000 +0800
+++ pypy3-v6.0.0-src-libressl/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509.py	2018-06-16 14:17:19.150644372 +0800
@@ -341,7 +341,7 @@ void X509_REQ_get0_signature(const X509_
 CUSTOMIZATIONS = """
 /* Added in 1.0.2 beta but we need it in all versions now due to the great
    opaquing. */
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 || defined(LIBRESSL_VERSION_NUMBER)
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 /* from x509/x_x509.c version 1.0.2 */
 void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
                          const X509 *x)
diff -upr pypy3-v6.0.0-src/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509_vfy.py pypy3-v6.0.0-src-libressl/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509_vfy.py
--- pypy3-v6.0.0-src/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509_vfy.py	2018-04-24 14:05:26.000000000 +0800
+++ pypy3-v6.0.0-src-libressl/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509_vfy.py	2018-06-16 14:17:35.147556333 +0800
@@ -292,7 +292,7 @@ int X509_OBJECT_get_type(const X509_OBJE
 }
 #endif
 
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE5 || defined(LIBRESSL_VERSION_NUMBER)
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE5 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 X509 *X509_OBJECT_get0_X509(X509_OBJECT *x) {
     return x->data.x509;
 }