OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
31-Mar-2006 12:57:32
Branch: HEAD Handle:
2006033111573101
Modified files:
openssl/crypto/objects obj_dat.h obj_mac.h obj_mac.num
objects.txt
Log:
Fix gost OIDs.
Summary:
Revision Changes Path
1.85 +8 -9 openssl/crypto/objects/obj_dat.h
1.51 +8 -8 openssl/crypto/objects/obj_mac.h
1.42 +2 -2
openssl/crypto/objects/obj_mac.num
1.54 +4 -2
openssl/crypto/objects/objects.txt
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/crypto/objects/obj_dat.h
============================================================
================
$ cvs diff -u -r1.84 -r1.85 obj_dat.h
--- openssl/crypto/objects/obj_dat.h 29 Mar 2006 13:02:18
-0000 1.84
+++ openssl/crypto/objects/obj_dat.h 31 Mar 2006 10:57:31
-0000 1.85
-782,8 +782,8
0x2A,0x85,0x03,0x02,0x02, /* [5010]
OBJ_cryptopro */
0x2A,0x85,0x03,0x02,0x02,0x03, /* [5015]
OBJ_id_GostR3411_94_with_GostR3410_2001 */
0x2A,0x85,0x03,0x02,0x02,0x04, /* [5021]
OBJ_id_GostR3411_94_with_GostR3410_94 */
-0x2A,0x85,0x03,0x02,0x02,0x13, /* [5027]
OBJ_id_GostR3411_2001 */
-0x2A,0x85,0x03,0x02,0x02,0x14, /* [5033]
OBJ_id_GostR3411_94 */
+0x2A,0x85,0x03,0x02,0x02,0x13, /* [5027]
OBJ_id_GostR3410_2001 */
+0x2A,0x85,0x03,0x02,0x02,0x14, /* [5033]
OBJ_id_GostR3410_94 */
};
static ASN1_OBJECT nid_objs[NUM_NID]={
-1962,10 +1962,9
{"id-GostR3411-94-with-GostR3410-94",
"GOST R 34.11-94 with GOST R 34.10-94",
NID_id_GostR3411_94_with_GostR3410_94,6,&(lvalues[5021]
),0},
-{"id-GostR3411-2001","GOST R
34.10-2001",NID_id_GostR3411_2001,6,
+{"gost2001","GOST R
34.10-2001",NID_id_GostR3410_2001,6,
&(lvalues[5027]),0},
-{"id-GostR3411-94","GOST R
34.10-94",NID_id_GostR3411_94,6,
- &(lvalues[5033]),0},
+{"gost94","GOST R
34.10-94",NID_id_GostR3410_94,6,&(lvalues[5033]),0
},
};
static ASN1_OBJECT *sn_objs[NUM_SN]={
-2210,6 +2209,8
&(nid_objs[490]),/* "friendlyCountryName"
*/
&(nid_objs[156]),/* "friendlyName" */
&(nid_objs[509]),/* "generationQualifier"
*/
+&(nid_objs[756]),/* "gost2001" */
+&(nid_objs[757]),/* "gost94" */
&(nid_objs[163]),/* "hmacWithSHA1" */
&(nid_objs[432]),/*
"holdInstructionCallIssuer" */
&(nid_objs[430]),/* "holdInstructionCode"
*/
-2219,8 +2220,6
&(nid_objs[473]),/* "homeTelephoneNumber"
*/
&(nid_objs[466]),/* "host" */
&(nid_objs[442]),/* "iA5StringSyntax" */
-&(nid_objs[756]),/* "id-GostR3411-2001"
*/
-&(nid_objs[757]),/* "id-GostR3411-94" */
&(nid_objs[754]),/*
"id-GostR3411-94-with-GostR3410-2001" */
&(nid_objs[755]),/*
"id-GostR3411-94-with-GostR3410-94" */
&(nid_objs[266]),/* "id-aca" */
-3755,8 +3754,8
&(nid_objs[125]),/* OBJ_zlib_compression
1 1 1 1 666 2 */
&(nid_objs[754]),/*
OBJ_id_GostR3411_94_with_GostR3410_2001 1 2 643 2 2 3 */
&(nid_objs[755]),/*
OBJ_id_GostR3411_94_with_GostR3410_94 1 2 643 2 2 4 */
-&(nid_objs[756]),/* OBJ_id_GostR3411_2001
1 2 643 2 2 19 */
-&(nid_objs[757]),/* OBJ_id_GostR3411_94
1 2 643 2 2 20 */
+&(nid_objs[756]),/* OBJ_id_GostR3410_2001
1 2 643 2 2 19 */
+&(nid_objs[757]),/* OBJ_id_GostR3410_94
1 2 643 2 2 20 */
&(nid_objs[ 1]),/* OBJ_rsadsi 1
2 840 113549 */
&(nid_objs[185]),/* OBJ_X9cm
1 2 840 10040 4 */
&(nid_objs[127]),/* OBJ_id_pkix
1 3 6 1 5 5 7 */
.
patch -p0 <<' .'
Index: openssl/crypto/objects/obj_mac.h
============================================================
================
$ cvs diff -u -r1.50 -r1.51 obj_mac.h
--- openssl/crypto/objects/obj_mac.h 29 Mar 2006 13:02:21
-0000 1.50
+++ openssl/crypto/objects/obj_mac.h 31 Mar 2006 10:57:31
-0000 1.51
-3326,13 +3326,13
#define NID_id_GostR3411_94_with_GostR3410_94 755
#define
OBJ_id_GostR3411_94_with_GostR3410_94 OBJ_cryptopro,4L
-#define
SN_id_GostR3411_2001 "id-GostR3411-2001"
-#define LN_id_GostR3411_2001 "GOST R
34.10-2001"
-#define NID_id_GostR3411_2001 756
-#define OBJ_id_GostR3411_2001 OBJ_cryptopro,19L
+#define SN_id_GostR3410_2001 "gost2001"
+#define LN_id_GostR3410_2001 "GOST R
34.10-2001"
+#define NID_id_GostR3410_2001 756
+#define OBJ_id_GostR3410_2001 OBJ_cryptopro,19L
-#define SN_id_GostR3411_94 "id-GostR3411-94"
-#define LN_id_GostR3411_94 "GOST R 34.10-94"
-#define NID_id_GostR3411_94 757
-#define OBJ_id_GostR3411_94 OBJ_cryptopro,20L
+#define SN_id_GostR3410_94 "gost94"
+#define LN_id_GostR3410_94 "GOST R 34.10-94"
+#define NID_id_GostR3410_94 757
+#define OBJ_id_GostR3410_94 OBJ_cryptopro,20L
.
patch -p0 <<' .'
Index: openssl/crypto/objects/obj_mac.num
============================================================
================
$ cvs diff -u -r1.41 -r1.42 obj_mac.num
--- openssl/crypto/objects/obj_mac.num 29 Mar 2006
13:02:21 -0000 1.41
+++ openssl/crypto/objects/obj_mac.num 31 Mar 2006
10:57:31 -0000 1.42
-753,5 +753,5
cryptopro 753
id_GostR3411_94_with_GostR3410_2001 754
id_GostR3411_94_with_GostR3410_94 755
-id_GostR3411_2001 756
-id_GostR3411_94 757
+id_GostR3410_2001 756
+id_GostR3410_94 757
.
patch -p0 <<' .'
Index: openssl/crypto/objects/objects.txt
============================================================
================
$ cvs diff -u -r1.53 -r1.54 objects.txt
--- openssl/crypto/objects/objects.txt 29 Mar 2006
13:02:21 -0000 1.53
+++ openssl/crypto/objects/objects.txt 31 Mar 2006
10:57:32 -0000 1.54
-1057,5 +1057,7
member-body 643 2 2 : cryptopro
cryptopro 3 : id-GostR3411-94-with-GostR3410-2001 : GOST
R 34.11-94 with GOST R 34.10-2001
cryptopro 4 : id-GostR3411-94-with-GostR3410-94 : GOST R
34.11-94 with GOST R 34.10-94
-cryptopro 19 : id-GostR3411-2001 : GOST R 34.10-2001
-cryptopro 20 : id-GostR3411-94 : GOST R 34.10-94
+!Cname id-GostR3410-2001
+cryptopro 19 : gost2001 : GOST R 34.10-2001
+!Cname id-GostR3410-94
+cryptopro 20 : gost94 : GOST R 34.10-94
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|