46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From ec122e23098aad8b6e3d97070cca5858b72558e2 Mon Sep 17 00:00:00 2001
|
|
From: Kamil Dudka <kdudka@redhat.com>
|
|
Date: Mon, 22 Aug 2016 10:24:35 +0200
|
|
Subject: [PATCH] nss: refuse previously loaded certificate from file
|
|
|
|
... when we are not asked to use a certificate from file
|
|
|
|
Upstream-commit: 7700fcba64bf5806de28f6c1c7da3b4f0b38567d
|
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
---
|
|
lib/vtls/nss.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
|
|
index ad33f25..e467360 100644
|
|
--- a/lib/vtls/nss.c
|
|
+++ b/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;
|
|
--
|
|
2.7.4
|
|
|