Add SEED encryption algorithm.

PR: 1503
Submitted by: KISA
Reviewed by: Bodo Moeller

4 files changed, 70 insertions, 5 deletions

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 5108a3b20d..872d79ba4f 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -62,12 +62,12 @@
  * [including the GNU Public Licence.]
  */
 
-#define NUM_NID 837
-#define NUM_SN 833
-#define NUM_LN 833
-#define NUM_OBJ 787
+#define NUM_NID 842
+#define NUM_SN 838
+#define NUM_LN 838
+#define NUM_OBJ 792
 
-static unsigned char lvalues[5560]={
+static unsigned char lvalues[5598]={
 0x00,                                        /* [  0] OBJ_undef */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@@ -855,6 +855,11 @@ static unsigned char lvalues[5560]={
 0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x04,     /* [5533] OBJ_ecdsa_with_SHA512 */
 0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x01,/* [5541] OBJ_dsa_with_SHA224 */
 0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x02,/* [5550] OBJ_dsa_with_SHA256 */
+0x2A,0x83,0x1A,0x8C,0x9A,0x44,               /* [5559] OBJ_kisa */
+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x03,     /* [5565] OBJ_seed_ecb */
+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x04,     /* [5573] OBJ_seed_cbc */
+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x05,     /* [5581] OBJ_seed_cfb128 */
+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x06,     /* [5589] OBJ_seed_ofb128 */
 };
 
 static ASN1_OBJECT nid_objs[NUM_NID]={
@@ -2210,6 +2215,11 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 	&(lvalues[5550]),0},
 {"gost89-cnt","gost89-cnt",NID_gost89_cnt,0,NULL,0},
 {"HMAC","hmac",NID_hmac,0,NULL,0},
+{"KISA","kisa",NID_kisa,6,&(lvalues[5559]),0},
+{"SEED-ECB","seed-ecb",NID_seed_ecb,8,&(lvalues[5565]),0},
+{"SEED-CBC","seed-cbc",NID_seed_cbc,8,&(lvalues[5573]),0},
+{"SEED-CFB","seed-cfb",NID_seed_cfb128,8,&(lvalues[5581]),0},
+{"SEED-OFB","seed-ofb",NID_seed_ofb128,8,&(lvalues[5589]),0},
 };
 
 static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -2300,6 +2310,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[183]),/* "ISO-US" */
 &(nid_objs[645]),/* "ITU-T" */
 &(nid_objs[646]),/* "JOINT-ISO-ITU-T" */
+&(nid_objs[837]),/* "KISA" */
 &(nid_objs[15]),/* "L" */
 &(nid_objs[ 3]),/* "MD2" */
 &(nid_objs[257]),/* "MD4" */
@@ -2362,6 +2373,10 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[668]),/* "RSA-SHA256" */
 &(nid_objs[669]),/* "RSA-SHA384" */
 &(nid_objs[670]),/* "RSA-SHA512" */
+&(nid_objs[839]),/* "SEED-CBC" */
+&(nid_objs[840]),/* "SEED-CFB" */
+&(nid_objs[838]),/* "SEED-ECB" */
+&(nid_objs[841]),/* "SEED-OFB" */
 &(nid_objs[41]),/* "SHA" */
 &(nid_objs[64]),/* "SHA1" */
 &(nid_objs[675]),/* "SHA224" */
@@ -3564,6 +3579,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[492]),/* "janetMailbox" */
 &(nid_objs[646]),/* "joint-iso-itu-t" */
 &(nid_objs[150]),/* "keyBag" */
+&(nid_objs[837]),/* "kisa" */
 &(nid_objs[477]),/* "lastModifiedBy" */
 &(nid_objs[476]),/* "lastModifiedTime" */
 &(nid_objs[157]),/* "localKeyID" */
@@ -3714,6 +3730,10 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[733]),/* "sect571k1" */
 &(nid_objs[734]),/* "sect571r1" */
 &(nid_objs[635]),/* "secure device signature" */
+&(nid_objs[839]),/* "seed-cbc" */
+&(nid_objs[840]),/* "seed-cfb" */
+&(nid_objs[838]),/* "seed-ecb" */
+&(nid_objs[841]),/* "seed-ofb" */
 &(nid_objs[105]),/* "serialNumber" */
 &(nid_objs[625]),/* "set-addPolicy" */
 &(nid_objs[515]),/* "set-attr" */
@@ -4158,6 +4178,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[777]),/* OBJ_whirlpool                    1 0 10118 3 0 55 */
 &(nid_objs[124]),/* OBJ_rle_compression              1 1 1 1 666 1 */
 &(nid_objs[125]),/* OBJ_zlib_compression             1 1 1 1 666 2 */
+&(nid_objs[837]),/* OBJ_kisa                         1 2 410 200004 */
 &(nid_objs[780]),/* OBJ_id_GostR3411_94_with_GostR3410_2001 1 2 643 2 2 3 */
 &(nid_objs[781]),/* OBJ_id_GostR3411_94_with_GostR3410_94 1 2 643 2 2 4 */
 &(nid_objs[782]),/* OBJ_id_GostR3411_94              1 2 643 2 2 9 */
@@ -4251,6 +4272,10 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[768]),/* OBJ_camellia_256_ofb128          0 3 4401 5 3 1 9 43 */
 &(nid_objs[759]),/* OBJ_camellia_256_cfb128          0 3 4401 5 3 1 9 44 */
 &(nid_objs[437]),/* OBJ_pilot                        0 9 2342 19200300 100 */
+&(nid_objs[838]),/* OBJ_seed_ecb                     1 2 410 200004 1 3 */
+&(nid_objs[839]),/* OBJ_seed_cbc                     1 2 410 200004 1 4 */
+&(nid_objs[840]),/* OBJ_seed_cfb128                  1 2 410 200004 1 5 */
+&(nid_objs[841]),/* OBJ_seed_ofb128                  1 2 410 200004 1 6 */
 &(nid_objs[824]),/* OBJ_id_GostR3411_94_with_GostR3410_94_cc 1 2 643 2 9 1 3 3 */
 &(nid_objs[825]),/* OBJ_id_GostR3411_94_with_GostR3410_2001_cc 1 2 643 2 9 1 3 4 */
 &(nid_objs[822]),/* OBJ_id_GostR3410_94_cc           1 2 643 2 9 1 5 3 */
diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 6461c3453b..68e3ecfdb7 100644
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -3680,6 +3680,31 @@
 #define LN_camellia_256_cfb8		"camellia-256-cfb8"
 #define NID_camellia_256_cfb8		765
 
+#define SN_kisa		"KISA"
+#define LN_kisa		"kisa"
+#define NID_kisa		837
+#define OBJ_kisa		OBJ_member_body,410L,200004L
+
+#define SN_seed_ecb		"SEED-ECB"
+#define LN_seed_ecb		"seed-ecb"
+#define NID_seed_ecb		838
+#define OBJ_seed_ecb		OBJ_kisa,1L,3L
+
+#define SN_seed_cbc		"SEED-CBC"
+#define LN_seed_cbc		"seed-cbc"
+#define NID_seed_cbc		839
+#define OBJ_seed_cbc		OBJ_kisa,1L,4L
+
+#define SN_seed_cfb128		"SEED-CFB"
+#define LN_seed_cfb128		"seed-cfb"
+#define NID_seed_cfb128		840
+#define OBJ_seed_cfb128		OBJ_kisa,1L,5L
+
+#define SN_seed_ofb128		"SEED-OFB"
+#define LN_seed_ofb128		"seed-ofb"
+#define NID_seed_ofb128		841
+#define OBJ_seed_ofb128		OBJ_kisa,1L,6L
+
 #define SN_hmac		"HMAC"
 #define LN_hmac		"hmac"
 #define NID_hmac		836
diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 3ca42fe84a..5386af062e 100644
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -834,3 +834,8 @@ dsa_with_SHA224		833
 dsa_with_SHA256		834
 gost89_cnt		835
 hmac		836
+kisa		837
+seed_ecb		838
+seed_cbc		839
+seed_cfb128		840
+seed_ofb128		841
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 8bd9653db9..628ec2886e 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1189,6 +1189,16 @@ camellia 44		: CAMELLIA-256-CFB		: camellia-256-cfb
 			: CAMELLIA-192-CFB8		: camellia-192-cfb8
 			: CAMELLIA-256-CFB8		: camellia-256-cfb8
 
+# Definitions for SEED cipher - ECB, CBC, OFB mode
+
+member-body 410 200004  : KISA          : kisa
+kisa 1 3                : SEED-ECB      : seed-ecb
+kisa 1 4                : SEED-CBC      : seed-cbc
+!Cname seed-cfb128
+kisa 1 5                : SEED-CFB      : seed-cfb
+!Cname seed-ofb128
+kisa 1 6                : SEED-OFB      : seed-ofb
+
 # There is no OID that just denotes "HMAC" oddly enough...
 
 			: HMAC				: hmac