|
Line 0
Link Here
|
|
|
1 |
openssl: acknowledge SRP disabling in configure properly |
| 2 |
https://github.com/curl/curl/pull/6094 |
| 3 |
|
| 4 |
diff --git lib/vtls/openssl.c lib/vtls/openssl.c |
| 5 |
index 28a1ae6dab6..58b9aa867b1 100644 |
| 6 |
--- lib/vtls/openssl.c |
| 7 |
+++ lib/vtls/openssl.c |
| 8 |
@@ -225,6 +225,14 @@ |
| 9 |
"ALL:!EXPORT:!EXPORT40:!EXPORT56:!aNULL:!LOW:!RC4:@STRENGTH" |
| 10 |
#endif |
| 11 |
|
| 12 |
+#ifdef HAVE_OPENSSL_SRP |
| 13 |
+/* the function exists */ |
| 14 |
+#ifdef USE_TLS_SRP |
| 15 |
+/* the functionality is not disabled */ |
| 16 |
+#define USE_OPENSSL_SRP |
| 17 |
+#endif |
| 18 |
+#endif |
| 19 |
+ |
| 20 |
struct ssl_backend_data { |
| 21 |
/* these ones requires specific SSL-types */ |
| 22 |
SSL_CTX* ctx; |
| 23 |
@@ -2471,7 +2479,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) |
| 24 |
#endif |
| 25 |
#endif |
| 26 |
const long int ssl_version = SSL_CONN_CONFIG(version); |
| 27 |
-#ifdef HAVE_OPENSSL_SRP |
| 28 |
+#ifdef USE_OPENSSL_SRP |
| 29 |
const enum CURL_TLSAUTH ssl_authtype = SSL_SET_OPTION(authtype); |
| 30 |
#endif |
| 31 |
char * const ssl_cert = SSL_SET_OPTION(primary.clientcert); |
| 32 |
@@ -2516,7 +2524,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) |
| 33 |
failf(data, OSSL_PACKAGE " was built without SSLv2 support"); |
| 34 |
return CURLE_NOT_BUILT_IN; |
| 35 |
#else |
| 36 |
-#ifdef HAVE_OPENSSL_SRP |
| 37 |
+#ifdef USE_OPENSSL_SRP |
| 38 |
if(ssl_authtype == CURL_TLSAUTH_SRP) |
| 39 |
return CURLE_SSL_CONNECT_ERROR; |
| 40 |
#endif |
| 41 |
@@ -2529,7 +2537,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) |
| 42 |
failf(data, OSSL_PACKAGE " was built without SSLv3 support"); |
| 43 |
return CURLE_NOT_BUILT_IN; |
| 44 |
#else |
| 45 |
-#ifdef HAVE_OPENSSL_SRP |
| 46 |
+#ifdef USE_OPENSSL_SRP |
| 47 |
if(ssl_authtype == CURL_TLSAUTH_SRP) |
| 48 |
return CURLE_SSL_CONNECT_ERROR; |
| 49 |
#endif |
| 50 |
@@ -2797,7 +2805,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) |
| 51 |
} |
| 52 |
#endif |
| 53 |
|
| 54 |
-#ifdef HAVE_OPENSSL_SRP |
| 55 |
+#ifdef USE_OPENSSL_SRP |
| 56 |
if(ssl_authtype == CURL_TLSAUTH_SRP) { |
| 57 |
char * const ssl_username = SSL_SET_OPTION(username); |
| 58 |
|