Commit 64fa3b8d authored by Kamil Dudka's avatar Kamil Dudka
Browse files

nss: search slash in forward direction in dup_nickname() 

It is wasteful to search it backwards if we look for _any_ slash.
parent 6390e656

lib/vtls/nss.c

+2 −8
Original line number Diff line number Diff line
@@ -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);