summaryrefslogtreecommitdiffstats
path: root/crypto/objects/objects.txt
diff options
context:
space:
mode:
authorJon Spillett <jon.spillett@oracle.com>2017-08-22 09:56:13 +1000
committerRichard Levitte <levitte@openssl.org>2017-08-30 12:33:53 +0200
commitbc32673869842c7f00ae7016040a612f516ead7e (patch)
treead88525fc75299889456ce83876ea76fd819c3ef /crypto/objects/objects.txt
parent1c2ac294721b636665aa7d62f5e3f843d3b1ac71 (diff)
Implement Aria GCM/CCM Modes and TLS cipher suites
AEAD cipher mode implementation is based on that used for AES: https://tools.ietf.org/html/rfc5116 TLS GCM cipher suites as specified in: https://tools.ietf.org/html/rfc6209 Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4287)
Diffstat (limited to 'crypto/objects/objects.txt')
-rw-r--r--crypto/objects/objects.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 7464d670e9..185a7a72e4 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1442,6 +1442,13 @@ aria 15 : ARIA-256-CTR : aria-256-ctr
: ARIA-192-CFB8 : aria-192-cfb8
: ARIA-256-CFB8 : aria-256-cfb8
+aria 37 : ARIA-128-CCM : aria-128-ccm
+aria 38 : ARIA-192-CCM : aria-192-ccm
+aria 39 : ARIA-256-CCM : aria-256-ccm
+aria 34 : ARIA-128-GCM : aria-128-gcm
+aria 35 : ARIA-192-GCM : aria-192-gcm
+aria 36 : ARIA-256-GCM : aria-256-gcm
+
# Definitions for SEED cipher - ECB, CBC, OFB mode
member-body 410 200004 : KISA : kisa