diff options
author | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
commit | 4043d7db4e466d15193c3bad3b204048fc13b785 (patch) | |
tree | 8156ce31a6e4a155fc240551f48c23b5a42a6e5e /openssl/trunk/crypto/objects/obj_mac.num | |
parent | aba277548b76071e75fc9478002a6fc2145f64f1 (diff) |
Merged in changes from OpenSSL 0.9.8d
svn path=/openssl/trunk/CHANGES; revision=377
Diffstat (limited to 'openssl/trunk/crypto/objects/obj_mac.num')
-rw-r--r-- | openssl/trunk/crypto/objects/obj_mac.num | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/openssl/trunk/crypto/objects/obj_mac.num b/openssl/trunk/crypto/objects/obj_mac.num index 56a2bf7f..fb9fbb91 100644 --- a/openssl/trunk/crypto/objects/obj_mac.num +++ b/openssl/trunk/crypto/objects/obj_mac.num @@ -748,3 +748,21 @@ policy_mappings 747 inhibit_any_policy 748 ipsec3 749 ipsec4 750 +camellia_128_cbc 751 +camellia_192_cbc 752 +camellia_256_cbc 753 +camellia_128_ecb 754 +camellia_192_ecb 755 +camellia_256_ecb 756 +camellia_128_cfb128 757 +camellia_192_cfb128 758 +camellia_256_cfb128 759 +camellia_128_cfb1 760 +camellia_192_cfb1 761 +camellia_256_cfb1 762 +camellia_128_cfb8 763 +camellia_192_cfb8 764 +camellia_256_cfb8 765 +camellia_128_ofb128 766 +camellia_192_ofb128 767 +camellia_256_ofb128 768 |