mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-12-09 06:30:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

gtls: fix build for disabled TLS-SRP

Browse Source 
Prior to this change if, at build time, the GnuTLS backend was found to
have TLS-SRP support (HAVE_GNUTLS_SRP) but TLS-SRP was disabled in curl
via --disable-tls-srp (!USE_TLS_SRP) then a build error would occur.

Bug: https://curl.se/mail/lib-2022-03/0046.html
Reported-by: Robert Brose

Closes https://github.com/curl/curl/pull/8604
This commit is contained in:
Jay Satiro 2022-03-17 15:31:10 -04:00
parent ccea329848
commit 8b1cae63b7
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/vtls/gtls.c
View File

@ -55,6 +55,14 @@
/* The last #include file should be: */ /* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
#ifdef HAVE_GNUTLS_SRP
/* the function exists */
#ifdef USE_TLS_SRP
/* the functionality is not disabled */
#define USE_GNUTLS_SRP
#endif
#endif
/* Enable GnuTLS debugging by defining GTLSDEBUG */ /* Enable GnuTLS debugging by defining GTLSDEBUG */
/*#define GTLSDEBUG */ /*#define GTLSDEBUG */
@ -75,7 +83,7 @@ static bool gtls_inited = FALSE;
struct ssl_backend_data { struct ssl_backend_data {
gnutls_session_t session; gnutls_session_t session;
gnutls_certificate_credentials_t cred; gnutls_certificate_credentials_t cred;
#ifdef HAVE_GNUTLS_SRP #ifdef USE_GNUTLS_SRP
gnutls_srp_client_credentials_t srp_client_cred; gnutls_srp_client_credentials_t srp_client_cred;
#endif #endif
}; };
@ -436,7 +444,7 @@ gtls_connect_step1(struct Curl_easy *data,
return CURLE_SSL_CONNECT_ERROR; return CURLE_SSL_CONNECT_ERROR;
} }
#ifdef HAVE_GNUTLS_SRP #ifdef USE_GNUTLS_SRP
if(SSL_SET_OPTION(authtype) == CURL_TLSAUTH_SRP) { if(SSL_SET_OPTION(authtype) == CURL_TLSAUTH_SRP) {
infof(data, "Using TLS-SRP username: %s", SSL_SET_OPTION(username)); infof(data, "Using TLS-SRP username: %s", SSL_SET_OPTION(username));
@ -587,7 +595,7 @@ gtls_connect_step1(struct Curl_easy *data,
if(result) if(result)
return result; return result;
#ifdef HAVE_GNUTLS_SRP #ifdef USE_GNUTLS_SRP
/* Only add SRP to the cipher list if SRP is requested. Otherwise /* Only add SRP to the cipher list if SRP is requested. Otherwise
* GnuTLS will disable TLS 1.3 support. */ * GnuTLS will disable TLS 1.3 support. */
if(SSL_SET_OPTION(authtype) == CURL_TLSAUTH_SRP) { if(SSL_SET_OPTION(authtype) == CURL_TLSAUTH_SRP) {
@ -609,7 +617,7 @@ gtls_connect_step1(struct Curl_easy *data,
#endif #endif
infof(data, "GnuTLS ciphers: %s", prioritylist); infof(data, "GnuTLS ciphers: %s", prioritylist);
rc = gnutls_priority_set_direct(session, prioritylist, &err); rc = gnutls_priority_set_direct(session, prioritylist, &err);
#ifdef HAVE_GNUTLS_SRP #ifdef USE_GNUTLS_SRP
} }
#endif #endif
@ -683,7 +691,7 @@ gtls_connect_step1(struct Curl_easy *data,
} }
} }
#ifdef HAVE_GNUTLS_SRP #ifdef USE_GNUTLS_SRP
/* put the credentials to the current session */ /* put the credentials to the current session */
if(SSL_SET_OPTION(authtype) == CURL_TLSAUTH_SRP) { if(SSL_SET_OPTION(authtype) == CURL_TLSAUTH_SRP) {
rc = gnutls_credentials_set(session, GNUTLS_CRD_SRP, rc = gnutls_credentials_set(session, GNUTLS_CRD_SRP,
@ -866,7 +874,7 @@ Curl_gtls_verifyserver(struct Curl_easy *data,
if(SSL_CONN_CONFIG(verifypeer) || if(SSL_CONN_CONFIG(verifypeer) ||
SSL_CONN_CONFIG(verifyhost) || SSL_CONN_CONFIG(verifyhost) ||
SSL_CONN_CONFIG(issuercert)) { SSL_CONN_CONFIG(issuercert)) {
#ifdef HAVE_GNUTLS_SRP #ifdef USE_GNUTLS_SRP
if(SSL_SET_OPTION(authtype) == CURL_TLSAUTH_SRP if(SSL_SET_OPTION(authtype) == CURL_TLSAUTH_SRP
&& SSL_SET_OPTION(username) != NULL && SSL_SET_OPTION(username) != NULL
&& !SSL_CONN_CONFIG(verifypeer) && !SSL_CONN_CONFIG(verifypeer)
@ -879,7 +887,7 @@ Curl_gtls_verifyserver(struct Curl_easy *data,
failf(data, "failed to get server cert"); failf(data, "failed to get server cert");
*certverifyresult = GNUTLS_E_NO_CERTIFICATE_FOUND; *certverifyresult = GNUTLS_E_NO_CERTIFICATE_FOUND;
return CURLE_PEER_FAILED_VERIFICATION; return CURLE_PEER_FAILED_VERIFICATION;
#ifdef HAVE_GNUTLS_SRP #ifdef USE_GNUTLS_SRP
} }
#endif #endif
} }
@ -1469,7 +1477,7 @@ static void close_one(struct ssl_connect_data *connssl)
gnutls_certificate_free_credentials(backend->cred); gnutls_certificate_free_credentials(backend->cred);
backend->cred = NULL; backend->cred = NULL;
} }
#ifdef HAVE_GNUTLS_SRP #ifdef USE_GNUTLS_SRP
if(backend->srp_client_cred) { if(backend->srp_client_cred) {
gnutls_srp_free_client_credentials(backend->srp_client_cred); gnutls_srp_free_client_credentials(backend->srp_client_cred);
backend->srp_client_cred = NULL; backend->srp_client_cred = NULL;
@ -1555,7 +1563,7 @@ static int gtls_shutdown(struct Curl_easy *data, struct connectdata *conn,
} }
gnutls_certificate_free_credentials(backend->cred); gnutls_certificate_free_credentials(backend->cred);
#ifdef HAVE_GNUTLS_SRP #ifdef USE_GNUTLS_SRP
if(SSL_SET_OPTION(authtype) == CURL_TLSAUTH_SRP if(SSL_SET_OPTION(authtype) == CURL_TLSAUTH_SRP
&& SSL_SET_OPTION(username) != NULL) && SSL_SET_OPTION(username) != NULL)
gnutls_srp_free_client_credentials(backend->srp_client_cred); gnutls_srp_free_client_credentials(backend->srp_client_cred);