diff options
| author | Anthony Scarpino <Anthony.Scarpino@Sun.COM> | 2009-04-10 15:07:07 -0700 |
|---|---|---|
| committer | Anthony Scarpino <Anthony.Scarpino@Sun.COM> | 2009-04-10 15:07:07 -0700 |
| commit | d288ba7491829a622697c947c3f1a30aec18c133 (patch) | |
| tree | 7b4df4095fa05b996a5ddae56c434df274c8a624 /usr/src/lib/libcryptoutil/common/mechstr.c | |
| parent | dde769a2c00c82faaf80563ddd5610de2f4da339 (diff) | |
| download | illumos-gate-d288ba7491829a622697c947c3f1a30aec18c133.tar.gz | |
6439989 CKM_CMS_SIG & WTLS missing from pkcs11_mech2str mapping
6282064 C_GetSlotInfo returns CKR_SLOT_ID_INVALID when the logical provider is the only slot on the system
6177650 Wrong error code returned when key does not allow requested operation
6437677 C_GenerateKey with missing CKA_VALUE_LEN attr should fail with CKR_TEMPLATE_INCOMPLETE
6499687 softDSA.c should use a meaningful #define rather than a hard coded number
6773550 Crypto Framework is too strict when checking DSA key parameters
6815120 C_Logout with metaslot can leave metaslot object info in memory
6606384 SCF consumers crash after mechanisms are disabled using cryptoadm when using libumem
6636169 softtoken is confused by .nfs files
6636960 C_GetOperationState should fail if there is no active digest operation
6627939 functional test failure - got CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT
Diffstat (limited to 'usr/src/lib/libcryptoutil/common/mechstr.c')
| -rw-r--r-- | usr/src/lib/libcryptoutil/common/mechstr.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/usr/src/lib/libcryptoutil/common/mechstr.c b/usr/src/lib/libcryptoutil/common/mechstr.c index a5936ad7e9..007d7bc0da 100644 --- a/usr/src/lib/libcryptoutil/common/mechstr.c +++ b/usr/src/lib/libcryptoutil/common/mechstr.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Convert Algorithm names as strings to PKCS#11 Mech numbers and vice versa. */ @@ -224,6 +222,15 @@ static const pkcs11_mapping_t mapping[] = { { "CKM_PBE_SHA1_RC2_40_CBC", CKM_PBE_SHA1_RC2_40_CBC }, { "CKM_PKCS5_PBKD2", CKM_PKCS5_PBKD2 }, { "CKM_PBA_SHA1_WITH_SHA1_HMAC", CKM_PBA_SHA1_WITH_SHA1_HMAC }, + { "CKM_WTLS_PRE_MASTER_KEY_GEN", CKM_WTLS_PRE_MASTER_KEY_GEN }, + { "CKM_WTLS_MASTER_KEY_DERIVE", CKM_WTLS_MASTER_KEY_DERIVE }, + { "CKM_WTLS_MASTER_KEY_DERIVE_DH_ECC", + CKM_WTLS_MASTER_KEY_DERIVE_DH_ECC }, + { "CKM_WTLS_PRF", CKM_WTLS_PRF }, + { "CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE", + CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE }, + { "CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE", + CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE }, { "CKM_KEY_WRAP_LYNKS", CKM_KEY_WRAP_LYNKS }, { "CKM_KEY_WRAP_SET_OAEP", CKM_KEY_WRAP_SET_OAEP }, { "CKM_KIP_DERIVE", CKM_KIP_DERIVE }, @@ -246,6 +253,7 @@ static const pkcs11_mapping_t mapping[] = { { "CKM_ARIA_CBC_PAD", CKM_ARIA_CBC_PAD }, { "CKM_ARIA_ECB_ENCRYPT_DATA", CKM_ARIA_ECB_ENCRYPT_DATA }, { "CKM_ARIA_CBC_ENCRYPT_DATA", CKM_ARIA_CBC_ENCRYPT_DATA }, + { "CKM_CMS_SIG", CKM_CMS_SIG }, { "CKM_SKIPJACK_KEY_GEN", CKM_SKIPJACK_KEY_GEN }, { "CKM_SKIPJACK_ECB64", CKM_SKIPJACK_ECB64 }, { "CKM_SKIPJACK_CBC64", CKM_SKIPJACK_CBC64 }, |