Deleted code that was made obsolete by the previous revision.
Deleted code that was made obsolete by the previous revision.
--- a/security/nss/lib/certdb/certdb.c
+++ b/security/nss/lib/certdb/certdb.c
@@ -2032,17 +2032,16 @@ CERT_ImportCerts(CERTCertDBHandle *certd
derCerts[i],
NULL,
PR_FALSE,
PR_TRUE);
if (certs[fcerts]) fcerts++;
}
if ( keepCerts ) {
- PK11SlotInfo *intSlot = PK11_GetInternalKeySlot();
for ( i = 0; i < fcerts; i++ ) {
SECKEY_UpdateCertPQG(certs[i]);
if(CERT_IsCACert(certs[i], NULL) && (fcerts > 1)) {
/* if we are importing only a single cert and specifying
* a nickname, we want to use that nickname if it a CA,
* otherwise if there are more than one cert, we don't
* know which cert it belongs to.
*/
@@ -2050,17 +2049,16 @@ CERT_ImportCerts(CERTCertDBHandle *certd
} else {
rv = CERT_AddTempCertToPerm(certs[i], nickname, NULL);
}
if (rv == SECSuccess) {
CERT_SaveImportedCert(certs[i], usage, caOnly, NULL);
}
/* don't care if it fails - keep going */
}
- PK11_FreeSlot(intSlot);
}
}
if ( retCerts ) {
*retCerts = certs;
} else {
if (certs) {
CERT_DestroyCertArray(certs, fcerts);