diff options
| author | rrelyea%redhat.com <devnull@localhost> | 2009-03-29 19:04:29 +0000 |
|---|---|---|
| committer | rrelyea%redhat.com <devnull@localhost> | 2009-03-29 19:04:29 +0000 |
| commit | c0ccc10e3bf0eb008323f816b77a11fd1573d196 (patch) | |
| tree | 1240b0b2d71b00d51ec99b120bc75f2e4d108ea3 | |
| parent | 6592edd743a1da6c2b0ba591463f6a17c198ee23 (diff) | |
| download | nss-hg-c0ccc10e3bf0eb008323f816b77a11fd1573d196.tar.gz | |
Add Camilla cipher suites TLS RFC4132 bug 361025
code supplied by okazaki@kick.gr.jp
| -rw-r--r-- | security/nss/cmd/lib/pk11table.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/security/nss/cmd/lib/pk11table.c b/security/nss/cmd/lib/pk11table.c index 1f1406a65..c233fd80d 100644 --- a/security/nss/cmd/lib/pk11table.c +++ b/security/nss/cmd/lib/pk11table.c @@ -188,6 +188,7 @@ const Constant _consts[] = { mkEntry(CKK_JUNIPER, KeyType), mkEntry(CKK_CDMF, KeyType), mkEntry(CKK_AES, KeyType), + mkEntry(CKK_CAMELLIA, KeyType), mkEntry(CKK_NETSCAPE_PKCS8, KeyType), mkEntry(CKC_X_509, CertType), @@ -476,6 +477,12 @@ const Constant _consts[] = { mkEntry(CKM_AES_MAC, Mechanism), mkEntry(CKM_AES_MAC_GENERAL, Mechanism), mkEntry(CKM_AES_CBC_PAD, Mechanism), + mkEntry(CKM_CAMELLIA_KEY_GEN, Mechanism), + mkEntry(CKM_CAMELLIA_ECB, Mechanism), + mkEntry(CKM_CAMELLIA_CBC, Mechanism), + mkEntry(CKM_CAMELLIA_MAC, Mechanism), + mkEntry(CKM_CAMELLIA_MAC_GENERAL, Mechanism), + mkEntry(CKM_CAMELLIA_CBC_PAD, Mechanism), mkEntry(CKM_DSA_PARAMETER_GEN, Mechanism), mkEntry(CKM_DH_PKCS_PARAMETER_GEN, Mechanism), mkEntry(CKM_NETSCAPE_AES_KEY_WRAP, Mechanism), @@ -1222,9 +1229,10 @@ const Commands _commands[] = { {ArgVar|ArgNew, ArgVar, ArgULong, ArgNone, ArgNone, ArgNone, ArgNone, ArgNone, ArgNone, ArgNone }}, {"NewInitArg", F_NewInitializeArgs, -"NewInitArg varName string\n\n" +"NewInitArg varName flags string\n\n" "Creates a new init variable.\n" " varName variable name of the new initArg\n" +" flags value to set the flags field\n" " string string parameter for init arg\n", {ArgVar|ArgNew, ArgULong, ArgVar|ArgNew, ArgNone, ArgNone, ArgNone, ArgNone, ArgNone, ArgNone, ArgNone }}, |