New functions to enumerate digests and ciphers.

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

diff --git a/crypto/evp/names.c b/crypto/evp/names.c
index 620f43feaadebb6945c6cfa6c0ca13d324db3b87..7fd67fa87012470b272cca1358e171d8ce060482 100644 (file)
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -62,25 +62,31 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
-int EVP_add_cipher(EVP_CIPHER *c)
+extern int obj_cleanup_defer;
+extern void check_defer(int nid);
+
+int EVP_add_cipher(const EVP_CIPHER *c)
        {
        int r;
 
-       r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c);
+       r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c);
        if (r == 0) return(0);
-       r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c);
+       check_defer(c->nid);
+       r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c);
        return(r);
        }
 
-int EVP_add_digest(EVP_MD *md)
+
+int EVP_add_digest(const EVP_MD *md)
        {
        int r;
        const char *name;
 
        name=OBJ_nid2sn(md->type);
-       r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(char *)md);
+       r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(const char *)md);
        if (r == 0) return(0);
-       r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(char *)md);
+       check_defer(md->type);
+       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)
@@ -88,6 +94,7 @@ int EVP_add_digest(EVP_MD *md)
                r=OBJ_NAME_add(OBJ_nid2sn(md->pkey_type),
                        OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name);
                if (r == 0) return(0);
+               check_defer(md->pkey_type);
                r=OBJ_NAME_add(OBJ_nid2ln(md->pkey_type),
                        OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name);
                }
@@ -120,4 +127,77 @@ void EVP_cleanup(void)
        OBJ_NAME_cleanup(-1);
 
        EVP_PBE_cleanup();
+       if (obj_cleanup_defer == 2)
+               {
+               obj_cleanup_defer = 0;
+               OBJ_cleanup();
+               }
+       }
+
+struct doall_cipher
+       {
+       void *arg;
+       void (*fn)(const EVP_CIPHER *ciph,
+                       const char *from, const char *to, void *arg);
+       };
+
+static void do_all_cipher_fn(const OBJ_NAME *nm, void *arg)
+       {
+       struct doall_cipher *dc = 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);
+       }
+
+void EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph,
+               const char *from, const char *to, void *x), void *arg)
+       {
+       struct doall_cipher dc;
+       dc.fn = fn;
+       dc.arg = arg;
+       OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc);
+       }
+
+void EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph,
+               const char *from, const char *to, void *x), void *arg)
+       {
+       struct doall_cipher dc;
+       dc.fn = fn;
+       dc.arg = arg;
+       OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn,&dc);
+       }
+
+struct doall_md
+       {
+       void *arg;
+       void (*fn)(const EVP_MD *ciph,
+                       const char *from, const char *to, void *arg);
+       };
+
+static void do_all_md_fn(const OBJ_NAME *nm, void *arg)
+       {
+       struct doall_md *dc = 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);
+       }
+
+void EVP_MD_do_all(void (*fn)(const EVP_MD *md,
+               const char *from, const char *to, void *x), void *arg)
+       {
+       struct doall_md dc;
+       dc.fn = fn;
+       dc.arg = arg;
+       OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
+       }
+
+void EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md,
+               const char *from, const char *to, void *x), void *arg)
+       {
+       struct doall_md dc;
+       dc.fn = fn;
+       dc.arg = arg;
+       OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
        }