Bug 1095307 - Clean up nssPKIX509_GetIssuerAndSerialFromDER(). r=relyea.NSS_3_18_BETA3

This patch:

- Removes the two static issuer_and_serial_from_encoding() functions.

- Rewrites nssPKIX509_GetIssuerAndSerialFromDER() to be almost identical to the
  issuer_and_serial_from_encoding() from pkistore.c. This new version avoids
  unnecessary heap allocations (and so doesn't need an |arena| argument),
  obtains the issuer and serial in the order suggested by the function name,
  and is more readable than the old version.

- Tweaks nssTrustDomain_FindCertificateByEncodedCertificate() to be more like
  nssTrustDomain_GetCertByDERFromCache() and
  nssCertificateStore_FindCertificateByEncodedCertificate(), which are the
  other two functions that now call nssPKIX509_GetIssuerAndSerialFromDER().

1 files changed, 11 insertions, 10 deletions

diff --git a/lib/pki/pki3hack.c b/lib/pki/pki3hack.c
index 6364eaf33..7430ca9f4 100644
--- a/lib/pki/pki3hack.c
+++ b/lib/pki/pki3hack.c
@@ -247,27 +247,28 @@ STAN_GetCertIdentifierFromDER(NSSArena *arenaOpt, NSSDER *der)
 }
 
 NSS_IMPLEMENT PRStatus
-nssPKIX509_GetIssuerAndSerialFromDER(NSSDER *der, NSSArena *arena, 
+nssPKIX509_GetIssuerAndSerialFromDER(NSSDER *der,
                                      NSSDER *issuer, NSSDER *serial)
 {
-    SECStatus secrv;
-    SECItem derCert;
+    SECItem derCert   = { 0 };
     SECItem derIssuer = { 0 };
     SECItem derSerial = { 0 };
-    SECITEM_FROM_NSSITEM(&derCert, der);
-    secrv = CERT_SerialNumberFromDERCert(&derCert, &derSerial);
+    SECStatus secrv;
+    derCert.data = (unsigned char *)der->data;
+    derCert.len = der->size;
+    secrv = CERT_IssuerNameFromDERCert(&derCert, &derIssuer);
     if (secrv != SECSuccess) {
 	return PR_FAILURE;
     }
-    (void)nssItem_Create(arena, serial, derSerial.len, derSerial.data);
-    secrv = CERT_IssuerNameFromDERCert(&derCert, &derIssuer);
+    secrv = CERT_SerialNumberFromDERCert(&derCert, &derSerial);
     if (secrv != SECSuccess) {
 	PORT_Free(derSerial.data);
 	return PR_FAILURE;
     }
-    (void)nssItem_Create(arena, issuer, derIssuer.len, derIssuer.data);
-    PORT_Free(derSerial.data);
-    PORT_Free(derIssuer.data);
+    issuer->data = derIssuer.data;
+    issuer->size = derIssuer.len;
+    serial->data = derSerial.data;
+    serial->size = derSerial.len;
     return PR_SUCCESS;
 }