diff options
| author | Lutz Jänicke <jaenicke@openssl.org> | 2002-03-26 17:18:48 +0000 |
|---|---|---|
| committer | Lutz Jänicke <jaenicke@openssl.org> | 2002-03-26 17:18:48 +0000 |
| commit | ffbe98b7630d604263cfb1118c67ca2617a8e222 (patch) | |
| tree | 3806c74234d8a3d9d5be809c07e540486fe47896 /crypto/objects | |
| parent | d7a9bb0a2a9ef5999bbe70be3db2937a293a331c (diff) | |
Make short names of objects RFC2256-compliant.
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_dat.h | 8 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.h | 3 | ||||
| -rw-r--r-- | crypto/objects/objects.txt | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 1fe83801ff..c749abe340 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -749,14 +749,14 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ {"RC4-40","rc4-40",NID_rc4_40,0,NULL}, {"RC2-40-CBC","rc2-40-cbc",NID_rc2_40_cbc,0,NULL}, {"G","givenName",NID_givenName,3,&(lvalues[535]),0}, -{"S","surname",NID_surname,3,&(lvalues[538]),0}, +{"SN","surname",NID_surname,3,&(lvalues[538]),0}, {"I","initials",NID_initials,3,&(lvalues[541]),0}, {"uniqueIdentifier","uniqueIdentifier",NID_uniqueIdentifier,3, &(lvalues[544]),0}, {"crlDistributionPoints","X509v3 CRL Distribution Points", NID_crl_distribution_points,3,&(lvalues[547]),0}, {"RSA-NP-MD5","md5WithRSA",NID_md5WithRSA,5,&(lvalues[550]),0}, -{"SN","serialNumber",NID_serialNumber,3,&(lvalues[555]),0}, +{"serialNumber","serialNumber",NID_serialNumber,3,&(lvalues[555]),0}, {"T","title",NID_title,3,&(lvalues[558]),0}, {"D","description",NID_description,3,&(lvalues[561]),0}, {"CAST5-CBC","cast5-cbc",NID_cast5_cbc,9,&(lvalues[564]),0}, @@ -1567,12 +1567,11 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[42]),/* "RSA-SHA" */ &(nid_objs[65]),/* "RSA-SHA1" */ &(nid_objs[115]),/* "RSA-SHA1-2" */ -&(nid_objs[100]),/* "S" */ &(nid_objs[41]),/* "SHA" */ &(nid_objs[64]),/* "SHA1" */ &(nid_objs[188]),/* "SMIME" */ &(nid_objs[167]),/* "SMIME-CAPS" */ -&(nid_objs[105]),/* "SN" */ +&(nid_objs[100]),/* "SN" */ &(nid_objs[16]),/* "ST" */ &(nid_objs[143]),/* "SXNetID" */ &(nid_objs[106]),/* "T" */ @@ -1989,6 +1988,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[561]),/* "sect571r1" */ &(nid_objs[386]),/* "security" */ &(nid_objs[394]),/* "selected-attribute-types" */ +&(nid_objs[105]),/* "serialNumber" */ &(nid_objs[129]),/* "serverAuth" */ &(nid_objs[371]),/* "serviceLocator" */ &(nid_objs[52]),/* "signingTime" */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index 8c761734ff..46b2b9bf66 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -1850,12 +1850,11 @@ #define NID_commonName 13 #define OBJ_commonName OBJ_X509,3L -#define SN_surname "S" +#define SN_surname "SN" #define LN_surname "surname" #define NID_surname 100 #define OBJ_surname OBJ_X509,4L -#define SN_serialNumber "SN" #define LN_serialNumber "serialNumber" #define NID_serialNumber 105 #define OBJ_serialNumber OBJ_X509,5L diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index a26147728a..1fdc934fc5 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -601,8 +601,8 @@ algorithm 29 : RSA-SHA1-2 : sha1WithRSA X500 4 : X509 X509 3 : CN : commonName -X509 4 : S : surname -X509 5 : SN : serialNumber +X509 4 : SN : surname +X509 5 : : serialNumber X509 6 : C : countryName X509 7 : L : localityName X509 8 : ST : stateOrProvinceName |