Added 'fake' OIDs for oid-less objects. Unfortunately, it seems to be impossible...

diff --git a/gost_obj.txt b/gost_obj.txt
index b33ae031c1a5d747ec72000073f9aa10f1dff7ff..0e5e41bfc5adf33e92d38941c871246360dc1e13 100644 (file)
--- a/gost_obj.txt
+++ b/gost_obj.txt
@@ -15,12 +15,12 @@
 1.2.643.7.1.2.1.2.2: id-tc26-gost-3410-2012-512-paramSetB: GOST R 34.10-2012 (512 bit) ParamSet B
 1.2.643.7.1.2.5.1.1:id-tc26-gost-28147-param-Z : GOST 28147-89 TC26 parameter set
 # Additional GOST 28147-89 cipher modes 
-:gost89-cbc:
-:gost89-ecb:
-:gost89-ofb:
-:gost89-cnt:
-:gost89-cnt-12:
-:gost-mac-12:
+1.2.643.2.2.21.2:gost89-cbc:
+1.2.643.2.2.21.3:gost89-ecb:
+1.2.643.2.2.21.4:gost89-ofb:
+1.2.643.2.2.21.5:gost89-cnt:
+1.2.643.2.2.21.6:gost89-cnt-12:
+1.2.643.2.2.22.2:gost-mac-12:
 # Russia-specific DN fields and X.509v3 extensions
 1.2.643.3.131.1.1:INN:Individual Fiscal Number
 1.2.643.100.1:OGRN:Main state registration number

diff --git a/obj_create.c b/obj_create.c
index c1c039c285521d075ebd7c3e140282deb05e3cad..1f80238245eb382af72c3963b7cdcf0540c10fcb 100644 (file)
--- a/obj_create.c
+++ b/obj_create.c
@@ -5,8 +5,6 @@
 int gost_add_obj(const char *oid, const char *sn, const char *ln)
 {
        int nid;
-       char *oidtemp=NULL,*sntemp=NULL,*lntemp=NULL;
-       
        if (oid) {
                nid = OBJ_txt2nid(oid);
        } else {
@@ -15,20 +13,6 @@ int gost_add_obj(const char *oid, const char *sn, const char *ln)
        if (nid != NID_undef) {
                return nid;
        }
-       if (oid) {
-               oidtemp=OPENSSL_malloc(strlen(oid) + 2);
-               strcpy(oidtemp, oid);
-       }
-
-       if (sn) {
-               sntemp=OPENSSL_malloc(strlen(sn) + 2);
-               strcpy(sntemp, sn);
-       }
-
-       if (ln) {
-               lntemp=OPENSSL_malloc(strlen(ln) + 2);
-               strcpy(lntemp, ln);
-       }
        return OBJ_create(oid,sn,ln);
 }