Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: nss/mozilla/security/nss/lib/pk11wrap/pk11cxt.c

Issue 3135002: Update to NSS 3.12.7 and NSPR 4.8.6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« nss/mozilla/security/nss/lib/cryptohi/seckey.c ('K') | « nss/mozilla/security/nss/lib/pk11wrap/pk11cert.c ('k') | nss/mozilla/security/nss/lib/pk11wrap/pk11err.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/mozilla/security/nss/lib/pk11wrap/pk11cxt.c
===================================================================
--- nss/mozilla/security/nss/lib/pk11wrap/pk11cxt.c (revision 55475)
+++ nss/mozilla/security/nss/lib/pk11wrap/pk11cxt.c (working copy)
@@ -249,7 +249,8 @@
SECStatus rv;
PORT_Assert(slot != NULL);
- if (!slot || (!symKey && operation != CKA_DIGEST)) {
+ if (!slot || (!symKey && ((operation != CKA_DIGEST) ||
+ (type == CKM_SKIPJACK_CBC64)))) {
PORT_SetError(SEC_ERROR_INVALID_ARGS);
return NULL;
}
« nss/mozilla/security/nss/lib/cryptohi/seckey.c ('K') | « nss/mozilla/security/nss/lib/pk11wrap/pk11cert.c ('k') | nss/mozilla/security/nss/lib/pk11wrap/pk11err.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698