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

Side by Side Diff: nss/lib/pk11wrap/pk11skey.c

Issue 319593003: Update to NSS 3.16.2 Beta 3. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Remove unused function SEC_NumberOrNameStringToOIDTag Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 /* 4 /*
5 * This file implements the Symkey wrapper and the PKCS context 5 * This file implements the Symkey wrapper and the PKCS context
6 * Interfaces. 6 * Interfaces.
7 */ 7 */
8 8
9 #include "seccomon.h" 9 #include "seccomon.h"
10 #include "secmod.h" 10 #include "secmod.h"
(...skipping 2211 matching lines...) Expand 10 before | Expand all | Expand 10 after
2222 case dsaKey: 2222 case dsaKey:
2223 case keaKey: 2223 case keaKey:
2224 case fortezzaKey: 2224 case fortezzaKey:
2225 case dhKey: 2225 case dhKey:
2226 return PK11_PubDerive(privKey, pubKey, isSender, randomA, randomB, 2226 return PK11_PubDerive(privKey, pubKey, isSender, randomA, randomB,
2227 derive, target, operation, keySize, wincx); 2227 derive, target, operation, keySize, wincx);
2228 case ecKey: 2228 case ecKey:
2229 return pk11_PubDeriveECKeyWithKDF( privKey, pubKey, isSender, 2229 return pk11_PubDeriveECKeyWithKDF( privKey, pubKey, isSender,
2230 randomA, randomB, derive, target, operation, keySize, 2230 randomA, randomB, derive, target, operation, keySize,
2231 kdf, sharedData, wincx); 2231 kdf, sharedData, wincx);
2232 default: break; 2232 default:
2233 PORT_SetError(SEC_ERROR_BAD_KEY);
2234 break;
2233 } 2235 }
2234 2236
2235 return NULL; 2237 return NULL;
2236 } 2238 }
2237 2239
2238 /* 2240 /*
2239 * this little function uses the Decrypt function to unwrap a key, just in 2241 * this little function uses the Decrypt function to unwrap a key, just in
2240 * case we are having problem with unwrap. NOTE: The key size may 2242 * case we are having problem with unwrap. NOTE: The key size may
2241 * not be preserved properly for some algorithms! 2243 * not be preserved properly for some algorithms!
2242 */ 2244 */
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
2659 PK11_ExitSlotMonitor(symKey->slot); 2661 PK11_ExitSlotMonitor(symKey->slot);
2660 return rv; 2662 return rv;
2661 } 2663 }
2662 2664
2663 CK_OBJECT_HANDLE 2665 CK_OBJECT_HANDLE
2664 PK11_GetSymKeyHandle(PK11SymKey *symKey) 2666 PK11_GetSymKeyHandle(PK11SymKey *symKey)
2665 { 2667 {
2666 return symKey->objectID; 2668 return symKey->objectID;
2667 } 2669 }
2668 2670
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698