diff options
| author | Kai Engert <kaie@kuix.de> | 2017-12-14 10:13:44 +0100 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2017-12-14 10:13:44 +0100 |
| commit | 9fbf83a69957107af71d5d0124412a6661d2a6a5 (patch) | |
| tree | 545a14ad33563c01b88fdc4161fa3d7d072450ef | |
| parent | f6c18a8a122d728099ef44c63f9b7260ca6e7067 (diff) | |
| download | nss-hg-9fbf83a69957107af71d5d0124412a6661d2a6a5.tar.gz | |
Bug 1424282, certutil -D should use API CERT_FindCertByNicknameOrEmailAddrCX to prevent unnecessary password prompt, r=rrelyea
| -rw-r--r-- | cmd/certutil/certutil.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/certutil/certutil.c b/cmd/certutil/certutil.c index f0ecf3284..254182763 100644 --- a/cmd/certutil/certutil.c +++ b/cmd/certutil/certutil.c @@ -653,12 +653,12 @@ ListCerts(CERTCertDBHandle *handle, char *nickname, char *email, } static SECStatus -DeleteCert(CERTCertDBHandle *handle, char *name) +DeleteCert(CERTCertDBHandle *handle, char *name, void *pwdata) { SECStatus rv; CERTCertificate *cert; - cert = CERT_FindCertByNicknameOrEmailAddr(handle, name); + cert = CERT_FindCertByNicknameOrEmailAddrCX(handle, name, pwdata); if (!cert) { SECU_PrintError(progName, "could not find certificate named \"%s\"", name); @@ -674,12 +674,12 @@ DeleteCert(CERTCertDBHandle *handle, char *name) } static SECStatus -RenameCert(CERTCertDBHandle *handle, char *name, char *newName) +RenameCert(CERTCertDBHandle *handle, char *name, char *newName, void *pwdata) { SECStatus rv; CERTCertificate *cert; - cert = CERT_FindCertByNicknameOrEmailAddr(handle, name); + cert = CERT_FindCertByNicknameOrEmailAddrCX(handle, name, pwdata); if (!cert) { SECU_PrintError(progName, "could not find certificate named \"%s\"", name); @@ -3334,12 +3334,12 @@ certutil_main(int argc, char **argv, PRBool initialize) } /* Delete cert (-D) */ if (certutil.commands[cmd_DeleteCert].activated) { - rv = DeleteCert(certHandle, name); + rv = DeleteCert(certHandle, name, &pwdata); goto shutdown; } /* Rename cert (--rename) */ if (certutil.commands[cmd_Rename].activated) { - rv = RenameCert(certHandle, name, newName); + rv = RenameCert(certHandle, name, newName, &pwdata); goto shutdown; } /* Delete key (-F) */ |