diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-07 12:46:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-07 12:46:42 (GMT) |
| commit | 4b53a693bd804b15380e8adfafc4de47f3f3e50e (patch) | |
| tree | d81e15053d7dead90c21f087ab8e7a14b771566a | |
| parent | 0fd54137aed8e1f76ee614bf7532881a91a0cbc5 (diff) | |
| download | CMake-4b53a693bd804b15380e8adfafc4de47f3f3e50e.zip CMake-4b53a693bd804b15380e8adfafc4de47f3f3e50e.tar.gz CMake-4b53a693bd804b15380e8adfafc4de47f3f3e50e.tar.bz2 | |
curl: Backport certificate reuse fix from 7.50.2
Backport curl upstream commit curl-7_50_2~32 (nss: refuse previously
loaded certificate from file, 2016-08-22).
| -rw-r--r-- | Utilities/cmcurl/lib/vtls/nss.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Utilities/cmcurl/lib/vtls/nss.c b/Utilities/cmcurl/lib/vtls/nss.c index ad33f25..e467360 100644 --- a/Utilities/cmcurl/lib/vtls/nss.c +++ b/Utilities/cmcurl/lib/vtls/nss.c @@ -1004,10 +1004,10 @@ static SECStatus SelectClientCert(void *arg, PRFileDesc *sock, struct ssl_connect_data *connssl = (struct ssl_connect_data *)arg; struct Curl_easy *data = connssl->data; const char *nickname = connssl->client_nickname; + static const char pem_slotname[] = "PEM Token #1"; if(connssl->obj_clicert) { /* use the cert/key provided by PEM reader */ - static const char pem_slotname[] = "PEM Token #1"; SECItem cert_der = { 0, NULL, 0 }; void *proto_win = SSL_RevealPinArg(sock); struct CERTCertificateStr *cert; @@ -1069,6 +1069,12 @@ static SECStatus SelectClientCert(void *arg, PRFileDesc *sock, if(NULL == nickname) nickname = "[unknown]"; + if(!strncmp(nickname, pem_slotname, sizeof(pem_slotname) - 1U)) { + failf(data, "NSS: refusing previously loaded certificate from file: %s", + nickname); + return SECFailure; + } + if(NULL == *pRetKey) { failf(data, "NSS: private key not found for certificate: %s", nickname); return SECFailure; |