Update from 1.0.0-stable.

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

diff --git a/crypto/evp/names.c b/crypto/evp/names.c
index 7fd67fa87012470b272cca1358e171d8ce060482..7e4d742a666892f31b550057708efc146a1e7dcf 100644 (file)
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -62,9 +62,6 @@
 #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;
@@ -132,6 +129,7 @@ void EVP_cleanup(void)
                obj_cleanup_defer = 0;
                OBJ_cleanup();
                }
+       OBJ_sigid_free();
        }
 
 struct doall_cipher
@@ -147,7 +145,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 +179,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,