From 2b19386ae79141377f0b3026a5705884da397b92 Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Tue, 22 May 2018 23:49:45 -0400 Subject: Add OIDS for Camellia and SM4 in GCM and CBC modes Making them usable for private key encryption --- src/build-data/oids.txt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src/build-data/oids.txt') diff --git a/src/build-data/oids.txt b/src/build-data/oids.txt index 314e4e44f..45fb80d58 100644 --- a/src/build-data/oids.txt +++ b/src/build-data/oids.txt @@ -46,9 +46,7 @@ 2.16.840.1.101.3.4.1.22 = AES-192/CBC 2.16.840.1.101.3.4.1.42 = AES-256/CBC 1.2.410.200004.1.4 = SEED/CBC -1.3.6.1.4.1.25258.3.1 = Serpent/CBC -1.3.6.1.4.1.25258.3.2 = Threefish-512/CBC -1.3.6.1.4.1.25258.3.3 = Twofish/CBC +1.2.156.10197.1.104.2 = SM4/CBC 2.16.840.1.101.3.4.1.6 = AES-128/GCM 2.16.840.1.101.3.4.1.26 = AES-192/GCM @@ -58,6 +56,20 @@ 2.16.840.1.101.3.4.1.27 = AES-192/CCM 2.16.840.1.101.3.4.1.47 = AES-256/CCM +1.2.392.200011.61.1.1.1.2 = Camellia-128/CBC +1.2.392.200011.61.1.1.1.3 = Camellia-192/CBC +1.2.392.200011.61.1.1.1.4 = Camellia-256/CBC + +0.3.4401.5.3.1.9.6 = Camellia-128/GCM +0.3.4401.5.3.1.9.26 = Camellia-192/GCM +0.3.4401.5.3.1.9.46 = Camellia-256/GCM + +1.2.156.10197.1.104.8 = SM4/GCM + +1.3.6.1.4.1.25258.3.1 = Serpent/CBC +1.3.6.1.4.1.25258.3.2 = Threefish-512/CBC +1.3.6.1.4.1.25258.3.3 = Twofish/CBC + 1.3.6.1.4.1.25258.3.101 = Serpent/GCM 1.3.6.1.4.1.25258.3.102 = Twofish/GCM -- cgit v1.2.3