Bug 1162897, Allow certificates to be specified by RFC7512 PKCS#11 URI, patch 0008, r=rrelyea

Rename and export find_objects_by_template()

2 files changed, 24 insertions, 15 deletions

diff --git a/lib/dev/dev.h b/lib/dev/dev.h
index 7e64e7612..26ac8957e 100644
--- a/lib/dev/dev.h
+++ b/lib/dev/dev.h
@@ -312,6 +312,15 @@ NSS_EXTERN PRBool
 nssToken_NeedsPINInitialization(
     NSSToken *token);
 
+NSS_EXTERN nssCryptokiObject **
+nssToken_FindObjectsByTemplate(
+    NSSToken *token,
+    nssSession *sessionOpt,
+    CK_ATTRIBUTE_PTR obj_template,
+    CK_ULONG otsize,
+    PRUint32 maximumOpt,
+    PRStatus *statusOpt);
+
 NSS_EXTERN nssCryptokiObject *
 nssToken_ImportCertificate(
     NSSToken *tok,
diff --git a/lib/dev/devtoken.c b/lib/dev/devtoken.c
index 0adbca8bc..380a9a348 100644
--- a/lib/dev/devtoken.c
+++ b/lib/dev/devtoken.c
@@ -368,8 +368,8 @@ loser:
     return (nssCryptokiObject **)NULL;
 }
 
-static nssCryptokiObject **
-find_objects_by_template(
+NSS_IMPLEMENT nssCryptokiObject **
+nssToken_FindObjectsByTemplate(
     NSSToken *token,
     nssSession *sessionOpt,
     CK_ATTRIBUTE_PTR obj_template,
@@ -581,7 +581,7 @@ nssToken_FindObjects(
                                obj_template, obj_size,
                                maximumOpt, statusOpt);
     } else {
-        objects = find_objects_by_template(token, sessionOpt,
+        objects = nssToken_FindObjectsByTemplate(token, sessionOpt,
                                            obj_template, obj_size,
                                            maximumOpt, statusOpt);
     }
@@ -612,7 +612,7 @@ nssToken_FindCertificatesBySubject(
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_SUBJECT, subject);
     NSS_CK_TEMPLATE_FINISH(subj_template, attr, stsize);
     /* now locate the token certs matching this template */
-    objects = find_objects_by_template(token, sessionOpt,
+    objects = nssToken_FindObjectsByTemplate(token, sessionOpt,
                                        subj_template, stsize,
                                        maximumOpt, statusOpt);
     return objects;
@@ -642,7 +642,7 @@ nssToken_FindCertificatesByNickname(
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_CLASS, &g_ck_class_cert);
     NSS_CK_TEMPLATE_FINISH(nick_template, attr, ntsize);
     /* now locate the token certs matching this template */
-    objects = find_objects_by_template(token, sessionOpt,
+    objects = nssToken_FindObjectsByTemplate(token, sessionOpt,
                                        nick_template, ntsize,
                                        maximumOpt, statusOpt);
     if (!objects) {
@@ -653,7 +653,7 @@ nssToken_FindCertificatesByNickname(
          * well, its needed by the builtin token...
          */
         nick_template[0].ulValueLen++;
-        objects = find_objects_by_template(token, sessionOpt,
+        objects = nssToken_FindObjectsByTemplate(token, sessionOpt,
                                            nick_template, ntsize,
                                            maximumOpt, statusOpt);
     }
@@ -732,7 +732,7 @@ nssToken_FindCertificatesByID(
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_CLASS, &g_ck_class_cert);
     NSS_CK_TEMPLATE_FINISH(id_template, attr, idtsize);
     /* now locate the token certs matching this template */
-    objects = find_objects_by_template(token, sessionOpt,
+    objects = nssToken_FindObjectsByTemplate(token, sessionOpt,
                                        id_template, idtsize,
                                        maximumOpt, statusOpt);
     return objects;
@@ -822,7 +822,7 @@ nssToken_FindCertificateByIssuerAndSerialNumber(
                                cert_template, ctsize,
                                1, statusOpt);
     } else {
-        objects = find_objects_by_template(token, sessionOpt,
+        objects = nssToken_FindObjectsByTemplate(token, sessionOpt,
                                            cert_template, ctsize,
                                            1, statusOpt);
     }
@@ -849,7 +849,7 @@ nssToken_FindCertificateByIssuerAndSerialNumber(
                                    cert_template, ctsize,
                                    1, statusOpt);
         } else {
-            objects = find_objects_by_template(token, sessionOpt,
+            objects = nssToken_FindObjectsByTemplate(token, sessionOpt,
                                                cert_template, ctsize,
                                                1, statusOpt);
         }
@@ -885,7 +885,7 @@ nssToken_FindCertificateByEncodedCertificate(
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_VALUE, encodedCertificate);
     NSS_CK_TEMPLATE_FINISH(cert_template, attr, ctsize);
     /* get the object handle */
-    objects = find_objects_by_template(token, sessionOpt,
+    objects = nssToken_FindObjectsByTemplate(token, sessionOpt,
                                        cert_template, ctsize,
                                        1, statusOpt);
     if (objects) {
@@ -917,7 +917,7 @@ nssToken_FindPrivateKeys(
     }
     NSS_CK_TEMPLATE_FINISH(key_template, attr, ktsize);
 
-    objects = find_objects_by_template(token, sessionOpt,
+    objects = nssToken_FindObjectsByTemplate(token, sessionOpt,
                                        key_template, ktsize,
                                        maximumOpt, statusOpt);
     return objects;
@@ -942,7 +942,7 @@ nssToken_FindPrivateKeyByID(
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_ID, keyID);
     NSS_CK_TEMPLATE_FINISH(key_template, attr, ktsize);
 
-    objects = find_objects_by_template(token, sessionOpt,
+    objects = nssToken_FindObjectsByTemplate(token, sessionOpt,
                                        key_template, ktsize,
                                        1, NULL);
     if (objects) {
@@ -971,7 +971,7 @@ nssToken_FindPublicKeyByID(
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_ID, keyID);
     NSS_CK_TEMPLATE_FINISH(key_template, attr, ktsize);
 
-    objects = find_objects_by_template(token, sessionOpt,
+    objects = nssToken_FindObjectsByTemplate(token, sessionOpt,
                                        key_template, ktsize,
                                        1, NULL);
     if (objects) {
@@ -1130,7 +1130,7 @@ nssToken_FindTrustForCertificate(
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_ISSUER, certIssuer);
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_SERIAL_NUMBER, certSerial);
     NSS_CK_TEMPLATE_FINISH(tobj_template, attr, tobj_size);
-    objects = find_objects_by_template(token, session,
+    objects = nssToken_FindObjectsByTemplate(token, session,
                                        tobj_template, tobj_size,
                                        1, NULL);
     if (objects) {
@@ -1215,7 +1215,7 @@ nssToken_FindCRLsBySubject(
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_SUBJECT, subject);
     NSS_CK_TEMPLATE_FINISH(crlobj_template, attr, crlobj_size);
 
-    objects = find_objects_by_template(token, session,
+    objects = nssToken_FindObjectsByTemplate(token, session,
                                        crlobj_template, crlobj_size,
                                        maximumOpt, statusOpt);
     return objects;