PR: 2588

[openssl.git] / crypto / evp / names.c

diff --git a/crypto/evp/names.c b/crypto/evp/names.c
index 7fd67fa87012470b272cca1358e171d8ce060482..6311ad7cfb77aed5bd4ce239fea46ea3ae290e01 100644 (file)
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -62,13 +62,14 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
-extern int obj_cleanup_defer;
-extern void check_defer(int nid);
-
 int EVP_add_cipher(const EVP_CIPHER *c)
        {
        int r;
 
+       if (c == NULL) return 0;
+
+       OPENSSL_init();
+
        r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c);
        if (r == 0) return(0);
        check_defer(c->nid);
@@ -81,6 +82,7 @@ int EVP_add_digest(const EVP_MD *md)
        {
        int r;
        const char *name;
+       OPENSSL_init();
 
        name=OBJ_nid2sn(md->type);
        r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(const char *)md);
@@ -89,7 +91,7 @@ int EVP_add_digest(const EVP_MD *md)
        r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(const char *)md);
        if (r == 0) return(0);
 
-       if (md->type != md->pkey_type)
+       if (md->pkey_type && md->type != md->pkey_type)
                {
                r=OBJ_NAME_add(OBJ_nid2sn(md->pkey_type),
                        OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name);
@@ -132,6 +134,7 @@ void EVP_cleanup(void)
                obj_cleanup_defer = 0;
                OBJ_cleanup();
                }
+       OBJ_sigid_free();
        }
 
 struct doall_cipher
@@ -147,7 +150,7 @@ static void do_all_cipher_fn(const OBJ_NAME *nm, void *arg)
        if (nm->alias)
                dc->fn(NULL, nm->name, nm->data, dc->arg);
        else
-               dc->fn((const EVP_CIPHER *)nm->data, NULL, NULL, dc->arg);
+               dc->fn((const EVP_CIPHER *)nm->data, nm->name, NULL, dc->arg);
        }
 
 void EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph,
@@ -181,7 +184,7 @@ static void do_all_md_fn(const OBJ_NAME *nm, void *arg)
        if (nm->alias)
                dc->fn(NULL, nm->name, nm->data, dc->arg);
        else
-               dc->fn((const EVP_MD *)nm->data, NULL, NULL, dc->arg);
+               dc->fn((const EVP_MD *)nm->data, nm->name, NULL, dc->arg);
        }
 
 void EVP_MD_do_all(void (*fn)(const EVP_MD *md,