diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-04-05 11:29:31 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-04-05 11:29:31 +0000 |
| commit | 5e0e9fce5d70e26555c9dca41d4c8c5616286b2a (patch) | |
| tree | 6afc08f7933e357477db44a18b2b238898dc32f5 /crypto/objects | |
| parent | 53ec8809cf2566c7b5c39e9ce58867ffdbd120be (diff) | |
Minor object name edit.
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_dat.h | 5 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.h | 2 | ||||
| -rw-r--r-- | crypto/objects/objects.txt | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 84507d453b..6e0c0e2542 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -2084,8 +2084,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ {"cryptocom","cryptocom",NID_cryptocom,5,&(lvalues[5207]),0}, {"id-HMACGostR3411-94","HMAC GOST 34.11-94",NID_id_HMACGostR3411_94,6, &(lvalues[5212]),0}, -{"id-Gost28147-89","GOST 28147-89",NID_id_Gost28147_89,6, - &(lvalues[5218]),0}, +{"gost89","GOST 28147-89",NID_id_Gost28147_89,6,&(lvalues[5218]),0}, {"id-Gost28147-89-MAC","GOST 28147-89 MAC",NID_id_Gost28147_89_MAC,6, &(lvalues[5224]),0}, {"id-GostR3410-2001DH","GOST R 34.10-2001 DH",NID_id_GostR3410_2001DH, @@ -2370,6 +2369,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[509]),/* "generationQualifier" */ &(nid_objs[756]),/* "gost2001" */ &(nid_objs[796]),/* "gost2001cc" */ +&(nid_objs[784]),/* "gost89" */ &(nid_objs[757]),/* "gost94" */ &(nid_objs[795]),/* "gost94cc" */ &(nid_objs[163]),/* "hmacWithSHA1" */ @@ -2381,7 +2381,6 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[473]),/* "homeTelephoneNumber" */ &(nid_objs[466]),/* "host" */ &(nid_objs[442]),/* "iA5StringSyntax" */ -&(nid_objs[784]),/* "id-Gost28147-89" */ &(nid_objs[761]),/* "id-Gost28147-89-CryptoPro-A-ParamSet" */ &(nid_objs[762]),/* "id-Gost28147-89-CryptoPro-B-ParamSet" */ &(nid_objs[763]),/* "id-Gost28147-89-CryptoPro-C-ParamSet" */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index 54835b06e8..f96716b36e 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -3350,7 +3350,7 @@ #define NID_id_GostR3410_94 757 #define OBJ_id_GostR3410_94 OBJ_cryptopro,20L -#define SN_id_Gost28147_89 "id-Gost28147-89" +#define SN_id_Gost28147_89 "gost89" #define LN_id_Gost28147_89 "GOST 28147-89" #define NID_id_Gost28147_89 784 #define OBJ_id_Gost28147_89 OBJ_cryptopro,21L diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 2b756cbb32..3f6f732688 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1066,7 +1066,8 @@ cryptopro 10 : id-HMACGostR3411-94 : HMAC GOST 34.11-94 cryptopro 19 : gost2001 : GOST R 34.10-2001 !Cname id-GostR3410-94 cryptopro 20 : gost94 : GOST R 34.10-94 -cryptopro 21 : id-Gost28147-89 : GOST 28147-89 +!Cname id-Gost28147-89 +cryptopro 21 : gost89 : GOST 28147-89 cryptopro 22 : id-Gost28147-89-MAC : GOST 28147-89 MAC !Cname id-GostR3411-94-prf cryptopro 23 : prf-gostr3411-94 : GOST R 34.11-94 PRF |