diff options
| author | neil.williams%sun.com <devnull@localhost> | 2007-06-19 01:18:41 +0000 |
|---|---|---|
| committer | neil.williams%sun.com <devnull@localhost> | 2007-06-19 01:18:41 +0000 |
| commit | ad3465cfd86386ea7dda09599f556ec0cd17dba3 (patch) | |
| tree | 62ff4c8cb1d420c34dd76efd7da58dba74f8f96e | |
| parent | ca48841616c6f45e2f502a94393acb596d418794 (diff) | |
| download | nss-hg-ad3465cfd86386ea7dda09599f556ec0cd17dba3.tar.gz | |
Bug 382292, Add support for Camellia cipher to symkeyutil
r=neil.williams
| -rw-r--r-- | security/nss/cmd/symkeyutil/symkey.man | 2 | ||||
| -rw-r--r-- | security/nss/cmd/symkeyutil/symkeyutil.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/security/nss/cmd/symkeyutil/symkey.man b/security/nss/cmd/symkeyutil/symkey.man index 9f7c4f336..4cf7b19f6 100644 --- a/security/nss/cmd/symkeyutil/symkey.man +++ b/security/nss/cmd/symkeyutil/symkey.man @@ -130,7 +130,7 @@ OPTIONS are: generic, rc2, rc4, des, des2, des3, cast, cast3, cast5, cast128, rc5, idea, skipjack, baton, juniper, - cdmf, aes + cdmf, aes, camellia Not all tokens support all key types. The generic key type is usually used in MACing and key derivation diff --git a/security/nss/cmd/symkeyutil/symkeyutil.c b/security/nss/cmd/symkeyutil/symkeyutil.c index 9eb23b693..1c1aff6f3 100644 --- a/security/nss/cmd/symkeyutil/symkeyutil.c +++ b/security/nss/cmd/symkeyutil/symkeyutil.c @@ -103,6 +103,7 @@ static KeyTypes keyArray[] = { { CKK_JUNIPER, CKM_JUNIPER_CBC128, CKM_JUNIPER_WRAP, "juniper" }, { CKK_CDMF, CKM_CDMF_CBC, CKM_CDMF_ECB, "cdmf" }, { CKK_AES, CKM_AES_CBC, CKM_AES_ECB, "aes" }, + { CKK_CAMELLIA, CKM_CAMELLIA_CBC, CKM_CAMELLIA_ECB, "camellia" }, }; static int keyArraySize = sizeof(keyArray)/sizeof(keyArray[0]); |