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

Side by Side Diff: nss/lib/softoken/pkcs11.c

Issue 295043002: Add RSA-OAEP support from upstream NSS bugs 1009794 and 1009785 (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Created 6 years, 7 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 PKCS 11 on top of our existing security modules 5 * This file implements PKCS 11 on top of our existing security modules
6 * 6 *
7 * For more information about PKCS 11 See PKCS 11 Token Inteface Standard. 7 * For more information about PKCS 11 See PKCS 11 Token Inteface Standard.
8 * This implementation has two slots: 8 * This implementation has two slots:
9 * slot 1 is our generic crypto support. It does not require login. 9 * slot 1 is our generic crypto support. It does not require login.
10 * It supports Public Key ops, and all they bulk ciphers and hashes. 10 * It supports Public Key ops, and all they bulk ciphers and hashes.
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 * 259 *
260 */ 260 */
261 261
262 /* ------------------------- RSA Operations ---------------------------*/ 262 /* ------------------------- RSA Operations ---------------------------*/
263 {CKM_RSA_PKCS_KEY_PAIR_GEN,{RSA_MIN_MODULUS_BITS,CK_MAX, 263 {CKM_RSA_PKCS_KEY_PAIR_GEN,{RSA_MIN_MODULUS_BITS,CK_MAX,
264 CKF_GENERATE_KEY_PAIR},PR_TRUE}, 264 CKF_GENERATE_KEY_PAIR},PR_TRUE},
265 {CKM_RSA_PKCS, {RSA_MIN_MODULUS_BITS,CK_MAX, 265 {CKM_RSA_PKCS, {RSA_MIN_MODULUS_BITS,CK_MAX,
266 CKF_DUZ_IT_ALL}, PR_TRUE}, 266 CKF_DUZ_IT_ALL}, PR_TRUE},
267 {CKM_RSA_PKCS_PSS, {RSA_MIN_MODULUS_BITS,CK_MAX, 267 {CKM_RSA_PKCS_PSS, {RSA_MIN_MODULUS_BITS,CK_MAX,
268 CKF_SN_VR}, PR_TRUE}, 268 CKF_SN_VR}, PR_TRUE},
269 {CKM_RSA_PKCS_OAEP, {RSA_MIN_MODULUS_BITS,CK_MAX,
270 CKF_EN_DE_WR_UN}, PR_TRUE},
269 #ifdef SFTK_RSA9796_SUPPORTED 271 #ifdef SFTK_RSA9796_SUPPORTED
270 {CKM_RSA_9796, {RSA_MIN_MODULUS_BITS,CK_MAX, 272 {CKM_RSA_9796, {RSA_MIN_MODULUS_BITS,CK_MAX,
271 CKF_DUZ_IT_ALL}, PR_TRUE}, 273 CKF_DUZ_IT_ALL}, PR_TRUE},
272 #endif 274 #endif
273 {CKM_RSA_X_509, {RSA_MIN_MODULUS_BITS,CK_MAX, 275 {CKM_RSA_X_509, {RSA_MIN_MODULUS_BITS,CK_MAX,
274 CKF_DUZ_IT_ALL}, PR_TRUE}, 276 CKF_DUZ_IT_ALL}, PR_TRUE},
275 /* -------------- RSA Multipart Signing Operations -------------------- */ 277 /* -------------- RSA Multipart Signing Operations -------------------- */
276 {CKM_MD2_RSA_PKCS, {RSA_MIN_MODULUS_BITS,CK_MAX, 278 {CKM_MD2_RSA_PKCS, {RSA_MIN_MODULUS_BITS,CK_MAX,
277 CKF_SN_VR}, PR_TRUE}, 279 CKF_SN_VR}, PR_TRUE},
278 {CKM_MD5_RSA_PKCS, {RSA_MIN_MODULUS_BITS,CK_MAX, 280 {CKM_MD5_RSA_PKCS, {RSA_MIN_MODULUS_BITS,CK_MAX,
(...skipping 4446 matching lines...) Expand 10 before | Expand all | Expand 10 after
4725 4727
4726 4728
4727 CK_RV NSC_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, 4729 CK_RV NSC_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot,
4728 CK_VOID_PTR pReserved) 4730 CK_VOID_PTR pReserved)
4729 { 4731 {
4730 CHECK_FORK(); 4732 CHECK_FORK();
4731 4733
4732 return CKR_FUNCTION_NOT_SUPPORTED; 4734 return CKR_FUNCTION_NOT_SUPPORTED;
4733 } 4735 }
4734 4736
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698