93 lines
2.7 KiB
Diff
93 lines
2.7 KiB
Diff
|
--- a/configure
|
||
|
|
+++ b/configure
|
||
|
|
@@ -23246,20 +23246,18 @@
|
||
|
|
|
||
|
|
#include <openssl/opensslv.h>
|
||
|
|
#include <openssl/ssl.h>
|
||
|
|
- #if OPENSSL_VERSION_NUMBER < 0x10101000L
|
||
|
|
- #error "OpenSSL >= 1.1.1 is required"
|
||
|
|
- #endif
|
||
|
|
- static void keylog_cb(const SSL *ssl, const char *line) {}
|
||
|
|
|
||
|
|
int
|
||
|
|
main ()
|
||
|
|
{
|
||
|
|
-
|
||
|
|
- SSL_CTX *ctx = SSL_CTX_new(TLS_client_method());
|
||
|
|
- SSL_CTX_set_keylog_callback(ctx, keylog_cb);
|
||
|
|
+ const SSL_METHOD *method = NULL;
|
||
|
|
+#ifdef TLS_client_method
|
||
|
|
+ method = TLS_client_method()
|
||
|
|
+#else
|
||
|
|
+ method = TLSv1_method();
|
||
|
|
+#endif
|
||
|
|
+ SSL_CTX *ctx = SSL_CTX_new(method);
|
||
|
|
SSL *ssl = SSL_new(ctx);
|
||
|
|
- X509_VERIFY_PARAM *param = SSL_get0_param(ssl);
|
||
|
|
- X509_VERIFY_PARAM_set1_host(param, "python.org", 0);
|
||
|
|
SSL_free(ssl);
|
||
|
|
SSL_CTX_free(ctx);
|
||
|
|
|
||
|
|
@@ -23307,9 +23305,6 @@
|
||
|
|
|
||
|
|
#include <openssl/opensslv.h>
|
||
|
|
#include <openssl/evp.h>
|
||
|
|
- #if OPENSSL_VERSION_NUMBER < 0x10101000L
|
||
|
|
- #error "OpenSSL >= 1.1.1 is required"
|
||
|
|
- #endif
|
||
|
|
|
||
|
|
int
|
||
|
|
main ()
|
||
|
|
@@ -23317,9 +23312,6 @@
|
||
|
|
|
||
|
|
OBJ_nid2sn(NID_md5);
|
||
|
|
OBJ_nid2sn(NID_sha1);
|
||
|
|
- OBJ_nid2sn(NID_sha3_512);
|
||
|
|
- OBJ_nid2sn(NID_blake2b512);
|
||
|
|
- EVP_PBE_scrypt(NULL, 0, NULL, 0, 2, 8, 1, 0, NULL, 0);
|
||
|
|
|
||
|
|
;
|
||
|
|
return 0;
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -6689,16 +6689,15 @@
|
||
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([
|
||
|
|
#include <openssl/opensslv.h>
|
||
|
|
#include <openssl/ssl.h>
|
||
|
|
- #if OPENSSL_VERSION_NUMBER < 0x10101000L
|
||
|
|
- #error "OpenSSL >= 1.1.1 is required"
|
||
|
|
- #endif
|
||
|
|
- static void keylog_cb(const SSL *ssl, const char *line) {}
|
||
|
|
], [
|
||
|
|
- SSL_CTX *ctx = SSL_CTX_new(TLS_client_method());
|
||
|
|
- SSL_CTX_set_keylog_callback(ctx, keylog_cb);
|
||
|
|
+ const SSL_METHOD *method = NULL;
|
||
|
|
+#ifdef TLS_client_method
|
||
|
|
+ method = TLS_client_method()
|
||
|
|
+#else
|
||
|
|
+ method = TLSv1_method();
|
||
|
|
+#endif
|
||
|
|
+ SSL_CTX *ctx = SSL_CTX_new(method);
|
||
|
|
SSL *ssl = SSL_new(ctx);
|
||
|
|
- X509_VERIFY_PARAM *param = SSL_get0_param(ssl);
|
||
|
|
- X509_VERIFY_PARAM_set1_host(param, "python.org", 0);
|
||
|
|
SSL_free(ssl);
|
||
|
|
SSL_CTX_free(ctx);
|
||
|
|
])], [ac_cv_working_openssl_ssl=yes], [ac_cv_working_openssl_ssl=no])
|
||
|
|
@@ -6714,15 +6713,9 @@
|
||
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([
|
||
|
|
#include <openssl/opensslv.h>
|
||
|
|
#include <openssl/evp.h>
|
||
|
|
- #if OPENSSL_VERSION_NUMBER < 0x10101000L
|
||
|
|
- #error "OpenSSL >= 1.1.1 is required"
|
||
|
|
- #endif
|
||
|
|
], [
|
||
|
|
OBJ_nid2sn(NID_md5);
|
||
|
|
OBJ_nid2sn(NID_sha1);
|
||
|
|
- OBJ_nid2sn(NID_sha3_512);
|
||
|
|
- OBJ_nid2sn(NID_blake2b512);
|
||
|
|
- EVP_PBE_scrypt(NULL, 0, NULL, 0, 2, 8, 1, 0, NULL, 0);
|
||
|
|
])], [ac_cv_working_openssl_hashlib=yes], [ac_cv_working_openssl_hashlib=no])
|
||
|
|
])
|
||
|
|
])
|