Rijdael CBC mode and partial undebugged SSL support.

4 files changed, 90 insertions, 3 deletions

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index b10da2d9b6..5c5b5aaf14 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -61,9 +61,9 @@
  * perl obj_dat.pl objects.h obj_dat.h
  */
 
-#define NUM_NID 405
-#define NUM_SN 401
-#define NUM_LN 401
+#define NUM_NID 417
+#define NUM_SN 410
+#define NUM_LN 410
 #define NUM_OBJ 366
 
 static unsigned char lvalues[2896]={
@@ -1066,6 +1066,18 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 	NID_rijndael_ecb_k192_b256,0,NULL},
 {"RIJNDAEL-ECB-K256-B256","rijndael-ecb-k256-b256",
 	NID_rijndael_ecb_k256_b256,0,NULL},
+{NULL,NULL,NID_undef,0,NULL},
+{NULL,NULL,NID_undef,0,NULL},
+{NULL,NULL,NID_undef,0,NULL},
+{"RD128-CBC-B128","rd128-cbc-b128",NID_rd128_cbc_b128,0,NULL},
+{"RD192-CBC-B128","rd192-cbc-b128",NID_rd192_cbc_b128,0,NULL},
+{"RD256-CBC-B128","rd256-cbc-b128",NID_rd256_cbc_b128,0,NULL},
+{"RD128-CBC-B192","rd128-cbc-b192",NID_rd128_cbc_b192,0,NULL},
+{"RD192-CBC-B192","rd192-cbc-b192",NID_rd192_cbc_b192,0,NULL},
+{"RD256-CBC-B192","rd256-cbc-b192",NID_rd256_cbc_b192,0,NULL},
+{"RD128-CBC-B256","rd128-cbc-b256",NID_rd128_cbc_b256,0,NULL},
+{"RD192-CBC-B256","rd192-cbc-b256",NID_rd192_cbc_b256,0,NULL},
+{"RD256-CBC-B256","rd256-cbc-b256",NID_rd256_cbc_b256,0,NULL},
 };
 
 static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -1155,6 +1167,15 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[122]),/* "RC5-CFB" */
 &(nid_objs[121]),/* "RC5-ECB" */
 &(nid_objs[123]),/* "RC5-OFB" */
+&(nid_objs[408]),/* "RD128-CBC-B128" */
+&(nid_objs[411]),/* "RD128-CBC-B192" */
+&(nid_objs[414]),/* "RD128-CBC-B256" */
+&(nid_objs[409]),/* "RD192-CBC-B128" */
+&(nid_objs[412]),/* "RD192-CBC-B192" */
+&(nid_objs[415]),/* "RD192-CBC-B256" */
+&(nid_objs[410]),/* "RD256-CBC-B128" */
+&(nid_objs[413]),/* "RD256-CBC-B192" */
+&(nid_objs[416]),/* "RD256-CBC-B256" */
 &(nid_objs[396]),/* "RIJNDAEL-ECB-K128-B128" */
 &(nid_objs[399]),/* "RIJNDAEL-ECB-K128-B192" */
 &(nid_objs[402]),/* "RIJNDAEL-ECB-K128-B256" */
@@ -1834,6 +1855,15 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[122]),/* "rc5-cfb" */
 &(nid_objs[121]),/* "rc5-ecb" */
 &(nid_objs[123]),/* "rc5-ofb" */
+&(nid_objs[408]),/* "rd128-cbc-b128" */
+&(nid_objs[411]),/* "rd128-cbc-b192" */
+&(nid_objs[414]),/* "rd128-cbc-b256" */
+&(nid_objs[409]),/* "rd192-cbc-b128" */
+&(nid_objs[412]),/* "rd192-cbc-b192" */
+&(nid_objs[415]),/* "rd192-cbc-b256" */
+&(nid_objs[410]),/* "rd256-cbc-b128" */
+&(nid_objs[413]),/* "rd256-cbc-b192" */
+&(nid_objs[416]),/* "rd256-cbc-b256" */
 &(nid_objs[396]),/* "rijndael-ecb-k128-b128" */
 &(nid_objs[399]),/* "rijndael-ecb-k128-b192" */
 &(nid_objs[402]),/* "rijndael-ecb-k128-b256" */
diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 308528f9cc..ccfea00d8c 100644
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -1833,3 +1833,39 @@
 #define LN_rijndael_ecb_k256_b256		"rijndael-ecb-k256-b256"
 #define NID_rijndael_ecb_k256_b256		404
 
+#define SN_rd128_cbc_b128		"RD128-CBC-B128"
+#define LN_rd128_cbc_b128		"rd128-cbc-b128"
+#define NID_rd128_cbc_b128		408
+
+#define SN_rd192_cbc_b128		"RD192-CBC-B128"
+#define LN_rd192_cbc_b128		"rd192-cbc-b128"
+#define NID_rd192_cbc_b128		409
+
+#define SN_rd256_cbc_b128		"RD256-CBC-B128"
+#define LN_rd256_cbc_b128		"rd256-cbc-b128"
+#define NID_rd256_cbc_b128		410
+
+#define SN_rd128_cbc_b192		"RD128-CBC-B192"
+#define LN_rd128_cbc_b192		"rd128-cbc-b192"
+#define NID_rd128_cbc_b192		411
+
+#define SN_rd192_cbc_b192		"RD192-CBC-B192"
+#define LN_rd192_cbc_b192		"rd192-cbc-b192"
+#define NID_rd192_cbc_b192		412
+
+#define SN_rd256_cbc_b192		"RD256-CBC-B192"
+#define LN_rd256_cbc_b192		"rd256-cbc-b192"
+#define NID_rd256_cbc_b192		413
+
+#define SN_rd128_cbc_b256		"RD128-CBC-B256"
+#define LN_rd128_cbc_b256		"rd128-cbc-b256"
+#define NID_rd128_cbc_b256		414
+
+#define SN_rd192_cbc_b256		"RD192-CBC-B256"
+#define LN_rd192_cbc_b256		"rd192-cbc-b256"
+#define NID_rd192_cbc_b256		415
+
+#define SN_rd256_cbc_b256		"RD256-CBC-B256"
+#define LN_rd256_cbc_b256		"rd256-cbc-b256"
+#define NID_rd256_cbc_b256		416
+
diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 94e13b44eb..9196462b14 100644
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -402,3 +402,15 @@ rijndael_ecb_k256_b192		401
 rijndael_ecb_k128_b256		402
 rijndael_ecb_k192_b256		403
 rijndael_ecb_k256_b256		404
+rd128_cbc		405
+rd192_cbc		406
+rd256_cbc		407
+rd128_cbc_b128		408
+rd192_cbc_b128		409
+rd256_cbc_b128		410
+rd128_cbc_b192		411
+rd192_cbc_b192		412
+rd256_cbc_b192		413
+rd128_cbc_b256		414
+rd192_cbc_b256		415
+rd256_cbc_b256		416
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index d4ee20db37..d110ad6c65 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -601,3 +601,12 @@ enterprises 1466 344	: dcobject		: dcObject
 			: RIJNDAEL-ECB-K128-B256: rijndael-ecb-k128-b256
 			: RIJNDAEL-ECB-K192-B256: rijndael-ecb-k192-b256
 			: RIJNDAEL-ECB-K256-B256: rijndael-ecb-k256-b256
+			: RD128-CBC-B128	: rd128-cbc-b128
+			: RD192-CBC-B128	: rd192-cbc-b128
+			: RD256-CBC-B128	: rd256-cbc-b128
+			: RD128-CBC-B192	: rd128-cbc-b192
+			: RD192-CBC-B192	: rd192-cbc-b192
+			: RD256-CBC-B192	: rd256-cbc-b192
+			: RD128-CBC-B256	: rd128-cbc-b256
+			: RD192-CBC-B256	: rd192-cbc-b256
+			: RD256-CBC-B256	: rd256-cbc-b256