From c029c23ecf0a910c7cee29f8a4345ccdd53ffe81 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Thu, 18 Aug 2016 01:03:39 +0100
Subject: [PATCH] From edf8aafda42fbcf30ed3c13d4b404d2d5c821238 Mon Sep 17
 00:00:00 2001 Bug 1162897, Detect PKCS#11 URI in
 PK11_FindCert{s,}FromNickname and search accordingly, r=rrelyea

---
 lib/pk11wrap/pk11cert.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/pk11wrap/pk11cert.c b/lib/pk11wrap/pk11cert.c
index 40c0969a3f..804db6da98 100644
--- a/lib/pk11wrap/pk11cert.c
+++ b/lib/pk11wrap/pk11cert.c
@@ -741,6 +741,11 @@ find_certs_from_nickname(const char *nickname, void *wincx)
     char *delimit = NULL;
     char *tokenName;
 
+    if (!strncmp(nickname, "pkcs11:", strlen("pkcs11:"))) {
+        certs = find_certs_from_uri(nickname, wincx);
+        if (certs)
+            return certs;
+    }
     nickCopy = PORT_Strdup(nickname);
     if (!nickCopy) {
         /* error code is set */