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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1504923011: Update NSS to 3.21 RTM and NSPR to 4.11 RTM (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Created 5 years 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
« nss/lib/freebl/ecl/ecp_jac.c ('K') | « nss/lib/pk11wrap/pk11load.c ('k') | nss/lib/pk11wrap/pk11merge.c » ('j') | nss/lib/util/pkcs11n.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 maps various PKCS #11 Mechanisms to related mechanisms, key 5 * This file maps various PKCS #11 Mechanisms to related mechanisms, key
6 * types, and ASN.1 encodings. 6 * types, and ASN.1 encodings.
7 */ 7 */
8 #include "seccomon.h" 8 #include "seccomon.h"
9 #include "secmod.h" 9 #include "secmod.h"
10 #include "secmodi.h" 10 #include "secmodi.h"
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 case CKM_SSL3_MASTER_KEY_DERIVE_DH: 376 case CKM_SSL3_MASTER_KEY_DERIVE_DH:
377 case CKM_SSL3_KEY_AND_MAC_DERIVE: 377 case CKM_SSL3_KEY_AND_MAC_DERIVE:
378 case CKM_SSL3_SHA1_MAC: 378 case CKM_SSL3_SHA1_MAC:
379 case CKM_SSL3_MD5_MAC: 379 case CKM_SSL3_MD5_MAC:
380 case CKM_TLS_MASTER_KEY_DERIVE: 380 case CKM_TLS_MASTER_KEY_DERIVE:
381 case CKM_NSS_TLS_MASTER_KEY_DERIVE_SHA256: 381 case CKM_NSS_TLS_MASTER_KEY_DERIVE_SHA256:
382 case CKM_TLS_MASTER_KEY_DERIVE_DH: 382 case CKM_TLS_MASTER_KEY_DERIVE_DH:
383 case CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256: 383 case CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256:
384 case CKM_TLS_KEY_AND_MAC_DERIVE: 384 case CKM_TLS_KEY_AND_MAC_DERIVE:
385 case CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256: 385 case CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256:
386 case CKM_NSS_TLS_EXTENDED_MASTER_KEY_DERIVE:
387 case CKM_NSS_TLS_EXTENDED_MASTER_KEY_DERIVE_DH:
386 case CKM_SHA_1_HMAC: 388 case CKM_SHA_1_HMAC:
387 case CKM_SHA_1_HMAC_GENERAL: 389 case CKM_SHA_1_HMAC_GENERAL:
388 case CKM_SHA224_HMAC: 390 case CKM_SHA224_HMAC:
389 case CKM_SHA224_HMAC_GENERAL: 391 case CKM_SHA224_HMAC_GENERAL:
390 case CKM_SHA256_HMAC: 392 case CKM_SHA256_HMAC:
391 case CKM_SHA256_HMAC_GENERAL: 393 case CKM_SHA256_HMAC_GENERAL:
392 case CKM_SHA384_HMAC: 394 case CKM_SHA384_HMAC:
393 case CKM_SHA384_HMAC_GENERAL: 395 case CKM_SHA384_HMAC_GENERAL:
394 case CKM_SHA512_HMAC: 396 case CKM_SHA512_HMAC:
395 case CKM_SHA512_HMAC_GENERAL: 397 case CKM_SHA512_HMAC_GENERAL:
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 case CKM_ECDH1_DERIVE: 574 case CKM_ECDH1_DERIVE:
573 return CKM_EC_KEY_PAIR_GEN; 575 return CKM_EC_KEY_PAIR_GEN;
574 case CKM_SSL3_PRE_MASTER_KEY_GEN: 576 case CKM_SSL3_PRE_MASTER_KEY_GEN:
575 case CKM_SSL3_MASTER_KEY_DERIVE: 577 case CKM_SSL3_MASTER_KEY_DERIVE:
576 case CKM_SSL3_KEY_AND_MAC_DERIVE: 578 case CKM_SSL3_KEY_AND_MAC_DERIVE:
577 case CKM_SSL3_SHA1_MAC: 579 case CKM_SSL3_SHA1_MAC:
578 case CKM_SSL3_MD5_MAC: 580 case CKM_SSL3_MD5_MAC:
579 case CKM_TLS_MASTER_KEY_DERIVE: 581 case CKM_TLS_MASTER_KEY_DERIVE:
580 case CKM_TLS_KEY_AND_MAC_DERIVE: 582 case CKM_TLS_KEY_AND_MAC_DERIVE:
581 case CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256: 583 case CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256:
584 case CKM_NSS_TLS_EXTENDED_MASTER_KEY_DERIVE:
585 case CKM_NSS_TLS_EXTENDED_MASTER_KEY_DERIVE_DH:
582 return CKM_SSL3_PRE_MASTER_KEY_GEN; 586 return CKM_SSL3_PRE_MASTER_KEY_GEN;
583 case CKM_SHA_1_HMAC: 587 case CKM_SHA_1_HMAC:
584 case CKM_SHA_1_HMAC_GENERAL: 588 case CKM_SHA_1_HMAC_GENERAL:
585 case CKM_SHA224_HMAC: 589 case CKM_SHA224_HMAC:
586 case CKM_SHA224_HMAC_GENERAL: 590 case CKM_SHA224_HMAC_GENERAL:
587 case CKM_SHA256_HMAC: 591 case CKM_SHA256_HMAC:
588 case CKM_SHA256_HMAC_GENERAL: 592 case CKM_SHA256_HMAC_GENERAL:
589 case CKM_SHA384_HMAC: 593 case CKM_SHA384_HMAC:
590 case CKM_SHA384_HMAC_GENERAL: 594 case CKM_SHA384_HMAC_GENERAL:
591 case CKM_SHA512_HMAC: 595 case CKM_SHA512_HMAC:
(...skipping 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after
1880 case SEC_OID_MISSI_DSS: 1884 case SEC_OID_MISSI_DSS:
1881 case SEC_OID_MISSI_DSS_OLD: 1885 case SEC_OID_MISSI_DSS_OLD:
1882 case SEC_OID_MISSI_KEA_DSS_OLD: 1886 case SEC_OID_MISSI_KEA_DSS_OLD:
1883 case SEC_OID_BOGUS_DSA_SIGNATURE_WITH_SHA1_DIGEST: 1887 case SEC_OID_BOGUS_DSA_SIGNATURE_WITH_SHA1_DIGEST:
1884 return SEC_OID_ANSIX9_DSA_SIGNATURE; 1888 return SEC_OID_ANSIX9_DSA_SIGNATURE;
1885 default: 1889 default:
1886 break; 1890 break;
1887 } 1891 }
1888 return algTag; 1892 return algTag;
1889 } 1893 }
OLDNEW
« nss/lib/freebl/ecl/ecp_jac.c ('K') | « nss/lib/pk11wrap/pk11load.c ('k') | nss/lib/pk11wrap/pk11merge.c » ('j') | nss/lib/util/pkcs11n.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698