summaryrefslogtreecommitdiffstats
path: root/crypto/objects/objects.txt
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2015-02-11 20:28:47 +0100
committerAndy Polyakov <appro@openssl.org>2015-02-11 20:28:47 +0100
commitc79e17731f462d6d42b917027a7085c0f59a2214 (patch)
treeee1a8c9fe32e627b3655ac9b527f7a105b75228c /crypto/objects/objects.txt
parentb7c9187b32a14b5b4a850161aed5c044d2130d5a (diff)
Add more Camellia OIDs.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/objects/objects.txt')
-rw-r--r--crypto/objects/objects.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index a4af282173..ee389100ba 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1251,18 +1251,30 @@ camellia 1 : CAMELLIA-128-ECB : camellia-128-ecb
camellia 3 : CAMELLIA-128-OFB : camellia-128-ofb
!Cname camellia-128-cfb128
camellia 4 : CAMELLIA-128-CFB : camellia-128-cfb
+camellia 6 : CAMELLIA-128-GCM : camellia-128-gcm
+camellia 7 : CAMELLIA-128-CCM : camellia-128-ccm
+camellia 9 : CAMELLIA-128-CTR : camellia-128-ctr
+camellia 10 : CAMELLIA-128-CMAC : camellia-128-cmac
camellia 21 : CAMELLIA-192-ECB : camellia-192-ecb
!Cname camellia-192-ofb128
camellia 23 : CAMELLIA-192-OFB : camellia-192-ofb
!Cname camellia-192-cfb128
camellia 24 : CAMELLIA-192-CFB : camellia-192-cfb
+camellia 26 : CAMELLIA-192-GCM : camellia-192-gcm
+camellia 27 : CAMELLIA-192-CCM : camellia-192-ccm
+camellia 29 : CAMELLIA-192-CTR : camellia-192-ctr
+camellia 30 : CAMELLIA-192-CMAC : camellia-192-cmac
camellia 41 : CAMELLIA-256-ECB : camellia-256-ecb
!Cname camellia-256-ofb128
camellia 43 : CAMELLIA-256-OFB : camellia-256-ofb
!Cname camellia-256-cfb128
camellia 44 : CAMELLIA-256-CFB : camellia-256-cfb
+camellia 46 : CAMELLIA-256-GCM : camellia-256-gcm
+camellia 47 : CAMELLIA-256-CCM : camellia-256-ccm
+camellia 49 : CAMELLIA-256-CTR : camellia-256-ctr
+camellia 50 : CAMELLIA-256-CMAC : camellia-256-cmac
# There are no OIDs for these modes...