Attachment 218791 Details for Bug 250384 – Fix building with OpenSSL (and TLS_SRP disabled)

[patch] Fix building with OpenSSL (and TLS_SRP disabled)

curl-7.73.0.diff (text/plain), 2.45 KB, created by Ralf van der Enden on 2020-10-16 08:33:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2020-10-16 08:33:47 UTC

Size: 2.45 KB

patch

obsolete

>Index: files/patch-lib-vtls-openssl.c
>===================================================================
>--- files/patch-lib-vtls-openssl.c	(nonexistent)
>+++ files/patch-lib-vtls-openssl.c	(working copy)
>@@ -0,0 +1,58 @@
>+openssl: acknowledge SRP disabling in configure properly
>+https://github.com/curl/curl/pull/6094
>+
>+diff --git lib/vtls/openssl.c lib/vtls/openssl.c
>+index 28a1ae6dab6..58b9aa867b1 100644
>+--- lib/vtls/openssl.c
>++++ lib/vtls/openssl.c
>+@@ -225,6 +225,14 @@
>+   "ALL:!EXPORT:!EXPORT40:!EXPORT56:!aNULL:!LOW:!RC4:@STRENGTH"
>+ #endif
>+ 
>++#ifdef HAVE_OPENSSL_SRP
>++/* the function exists */
>++#ifdef USE_TLS_SRP
>++/* the functionality is not disabled */
>++#define USE_OPENSSL_SRP
>++#endif
>++#endif
>++
>+ struct ssl_backend_data {
>+   /* these ones requires specific SSL-types */
>+   SSL_CTX* ctx;
>+@@ -2471,7 +2479,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
>+ #endif
>+ #endif
>+   const long int ssl_version = SSL_CONN_CONFIG(version);
>+-#ifdef HAVE_OPENSSL_SRP
>++#ifdef USE_OPENSSL_SRP
>+   const enum CURL_TLSAUTH ssl_authtype = SSL_SET_OPTION(authtype);
>+ #endif
>+   char * const ssl_cert = SSL_SET_OPTION(primary.clientcert);
>+@@ -2516,7 +2524,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
>+     failf(data, OSSL_PACKAGE " was built without SSLv2 support");
>+     return CURLE_NOT_BUILT_IN;
>+ #else
>+-#ifdef HAVE_OPENSSL_SRP
>++#ifdef USE_OPENSSL_SRP
>+     if(ssl_authtype == CURL_TLSAUTH_SRP)
>+       return CURLE_SSL_CONNECT_ERROR;
>+ #endif
>+@@ -2529,7 +2537,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
>+     failf(data, OSSL_PACKAGE " was built without SSLv3 support");
>+     return CURLE_NOT_BUILT_IN;
>+ #else
>+-#ifdef HAVE_OPENSSL_SRP
>++#ifdef USE_OPENSSL_SRP
>+     if(ssl_authtype == CURL_TLSAUTH_SRP)
>+       return CURLE_SSL_CONNECT_ERROR;
>+ #endif
>+@@ -2797,7 +2805,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
>+   }
>+ #endif
>+ 
>+-#ifdef HAVE_OPENSSL_SRP
>++#ifdef USE_OPENSSL_SRP
>+   if(ssl_authtype == CURL_TLSAUTH_SRP) {
>+     char * const ssl_username = SSL_SET_OPTION(username);
>+ 
>
>Property changes on: files/patch-lib-vtls-openssl.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

tremere: maintainer-approval?

Actions: View | Diff

Attachments on bug 250384: 218791