diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-02-08 15:31:35 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-02-08 15:31:35 +0000 |
| commit | c8ef656df28d1d21e5168191f959764da3a97122 (patch) | |
| tree | 955dd210121291dce9fa757d10aa3c0774606e14 /crypto/objects | |
| parent | 8c968e0355151e1e5033b6793b61320ff400c88a (diff) | |
| download | openssl-c8ef656df28d1d21e5168191f959764da3a97122.tar.gz | |
Make CMAC API similar to HMAC API. Add methods for CMAC.
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_dat.h | 9 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.h | 4 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.num | 1 | ||||
| -rw-r--r-- | crypto/objects/objects.txt | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index cbccf5afd6..258ad81489 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 894 -#define NUM_SN 887 -#define NUM_LN 887 +#define NUM_NID 895 +#define NUM_SN 888 +#define NUM_LN 888 #define NUM_OBJ 841 static const unsigned char lvalues[5835]={ @@ -2354,6 +2354,7 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={ {"dmdName","dmdName",NID_dmdName,3,&(lvalues[5820]),0}, {"id-alg-PWRI-KEK","id-alg-PWRI-KEK",NID_id_alg_PWRI_KEK,11, &(lvalues[5823]),0}, +{"CMAC","cmac",NID_cmac,0,NULL,0}, }; static const unsigned int sn_objs[NUM_SN]={ @@ -2403,6 +2404,7 @@ static const unsigned int sn_objs[NUM_SN]={ 110, /* "CAST5-CFB" */ 109, /* "CAST5-ECB" */ 111, /* "CAST5-OFB" */ +894, /* "CMAC" */ 13, /* "CN" */ 141, /* "CRLReason" */ 417, /* "CSPName" */ @@ -3471,6 +3473,7 @@ static const unsigned int ln_objs[NUM_LN]={ 407, /* "characteristic-two-field" */ 395, /* "clearance" */ 633, /* "cleartext track 2" */ +894, /* "cmac" */ 13, /* "commonName" */ 513, /* "content types" */ 50, /* "contentType" */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index a4326633cd..f6683405df 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -3916,3 +3916,7 @@ #define LN_hmac "hmac" #define NID_hmac 855 +#define SN_cmac "CMAC" +#define LN_cmac "cmac" +#define NID_cmac 894 + diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 65ca66fff2..24f881688b 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -891,3 +891,4 @@ supportedAlgorithms 890 deltaRevocationList 891 dmdName 892 id_alg_PWRI_KEK 893 +cmac 894 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 97be877906..848a6d9a39 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1258,3 +1258,5 @@ kisa 1 6 : SEED-OFB : seed-ofb # There is no OID that just denotes "HMAC" oddly enough... : HMAC : hmac +# Nor CMAC either + : CMAC : cmac |