From 64fa3b8d643f694ab2e606a5b4d89b73579a4a7b Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Thu, 4 Feb 2016 10:44:52 +0100 Subject: nss: search slash in forward direction in dup_nickname() It is wasteful to search it backwards if we look for _any_ slash. --- lib/vtls/nss.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c index 2fc3f433a..3922d9c90 100644 --- a/lib/vtls/nss.c +++ b/lib/vtls/nss.c @@ -328,8 +328,8 @@ static char* dup_nickname(struct SessionHandle *data, enum dupstring cert_kind) /* no such file exists, use the string as nickname */ return strdup(str); - /* search the last slash; we require at least one slash in a file name */ - n = strrchr(str, '/'); + /* search the first slash; we require at least one slash in a file name */ + n = strchr(str, '/'); if(!n) { infof(data, "warning: certificate file name \"%s\" handled as nickname; " "please use \"./%s\" to force file name\n", str, str); @@ -928,12 +928,6 @@ static SECStatus check_issuer_cert(PRFileDesc *sock, SECStatus res=SECSuccess; void *proto_win = NULL; - /* - PRArenaPool *tmpArena = NULL; - CERTAuthKeyID *authorityKeyID = NULL; - SECITEM *caname = NULL; - */ - cert = SSL_PeerCertificate(sock); cert_issuer = CERT_FindCertIssuer(cert, PR_Now(), certUsageObjectSigner); -- cgit v1.2.3