From 74633553a912519a6e73a9d830132e58f420a6c9 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Wed, 11 Apr 2007 12:33:06 +0000
Subject: Experimental HMAC support via EVP_PKEY_METHOD.

---
 crypto/objects/obj_dat.h   | 9 ++++++---
 crypto/objects/obj_mac.h   | 4 ++++
 crypto/objects/obj_mac.num | 1 +
 crypto/objects/objects.txt | 4 ++++
 4 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'crypto/objects')

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 8dad99c0dc..5108a3b20d 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -62,9 +62,9 @@
  * [including the GNU Public Licence.]
  */
 
-#define NUM_NID 836
-#define NUM_SN 832
-#define NUM_LN 832
+#define NUM_NID 837
+#define NUM_SN 833
+#define NUM_LN 833
 #define NUM_OBJ 787
 
 static unsigned char lvalues[5560]={
@@ -2209,6 +2209,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"dsa_with_SHA256","dsa_with_SHA256",NID_dsa_with_SHA256,9,
 	&(lvalues[5550]),0},
 {"gost89-cnt","gost89-cnt",NID_gost89_cnt,0,NULL,0},
+{"HMAC","hmac",NID_hmac,0,NULL,0},
 };
 
 static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -2289,6 +2290,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[67]),/* "DSA-old" */
 &(nid_objs[297]),/* "DVCS" */
 &(nid_objs[99]),/* "GN" */
+&(nid_objs[836]),/* "HMAC" */
 &(nid_objs[381]),/* "IANA" */
 &(nid_objs[34]),/* "IDEA-CBC" */
 &(nid_objs[35]),/* "IDEA-CFB" */
@@ -3336,6 +3338,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[601]),/* "generic cryptogram" */
 &(nid_objs[99]),/* "givenName" */
 &(nid_objs[835]),/* "gost89-cnt" */
+&(nid_objs[836]),/* "hmac" */
 &(nid_objs[772]),/* "hmacWithMD5" */
 &(nid_objs[163]),/* "hmacWithSHA1" */
 &(nid_objs[773]),/* "hmacWithSHA224" */
diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 131199a633..6461c3453b 100644
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -3680,3 +3680,7 @@
 #define LN_camellia_256_cfb8		"camellia-256-cfb8"
 #define NID_camellia_256_cfb8		765
 
+#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 b9d34d26d5..3ca42fe84a 100644
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -833,3 +833,4 @@ ecdsa_with_SHA512		832
 dsa_with_SHA224		833
 dsa_with_SHA256		834
 gost89_cnt		835
+hmac		836
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 1f48abfc24..8bd9653db9 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1188,3 +1188,7 @@ camellia 44		: CAMELLIA-256-CFB		: camellia-256-cfb
 			: CAMELLIA-128-CFB8		: camellia-128-cfb8
 			: CAMELLIA-192-CFB8		: camellia-192-cfb8
 			: CAMELLIA-256-CFB8		: camellia-256-cfb8
+
+# There is no OID that just denotes "HMAC" oddly enough...
+
+			: HMAC				: hmac
-- 
cgit v1.2.3