Uprev NSS to 3.18 RTM

nss/lib/pki/trustdomain.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef DEV_H
 #include "dev.h"
 #endif /* DEV_H */
 
 #ifndef PKIM_H
 #include "pkim.h"
@@ skipping 813 matching lines @@
 NSS_IMPLEMENT NSSCertificate *
 nssTrustDomain_FindCertificateByEncodedCertificate (
   NSSTrustDomain *td,
   NSSBER *ber
 )
 {
     PRStatus status;
     NSSCertificate *rvCert = NULL;
     NSSDER issuer = { 0 };
     NSSDER serial = { 0 };
-    NSSArena *arena = nssArena_Create();
-    if (!arena) {
-        return (NSSCertificate *)NULL;
-    }
     /* XXX this is not generic...  will any cert crack into issuer/serial? */
-    status = nssPKIX509_GetIssuerAndSerialFromDER(ber, arena, &issuer, &serial);
+    status = nssPKIX509_GetIssuerAndSerialFromDER(ber, &issuer, &serial);
     if (status != PR_SUCCESS) {
-        goto finish;
+        return NULL;
     }
     rvCert = nssTrustDomain_FindCertificateByIssuerAndSerialNumber(td,
                                                                    &issuer,
                                                                    &serial);
-finish:
-    nssArena_Destroy(arena);
+    PORT_Free(issuer.data);
+    PORT_Free(serial.data);
     return rvCert;
 }
 
 NSS_IMPLEMENT NSSCertificate *
 NSSTrustDomain_FindCertificateByEncodedCertificate (
   NSSTrustDomain *td,
   NSSBER *ber
 )
 {
     return nssTrustDomain_FindCertificateByEncodedCertificate(td, ber);
@@ skipping 387 matching lines @@
 NSS_IMPLEMENT NSSCryptoContext *
 NSSTrustDomain_CreateCryptoContextForAlgorithmAndParameters (
   NSSTrustDomain *td,
   NSSAlgorithmAndParameters *ap
 )
 {
     nss_SetError(NSS_ERROR_NOT_FOUND);
     return NULL;
 }