don't add digest alias if signature algorithm is undefined

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

diff --git a/crypto/evp/names.c b/crypto/evp/names.c
index 6bf37100de5964e9e95fbee2dd91c50a5be96532..f2869f5c7853bdf1f63f6bfa3b78a6ad25dfabf3 100644 (file)
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -58,65 +58,144 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 
-int EVP_add_cipher(c)
-EVP_CIPHER *c;
+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(md)
-EVP_MD *md;
+
+int EVP_add_digest(const EVP_MD *md)
        {
        int r;
-       char *name;
+       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)
+       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);
                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);
                }
        return(r);
        }
 
-EVP_CIPHER *EVP_get_cipherbyname(name)
-char *name;
+const EVP_CIPHER *EVP_get_cipherbyname(const char *name)
        {
-       EVP_CIPHER *cp;
+       const EVP_CIPHER *cp;
 
-       cp=(EVP_CIPHER *)OBJ_NAME_get(name,OBJ_NAME_TYPE_CIPHER_METH);
+       cp=(const EVP_CIPHER *)OBJ_NAME_get(name,OBJ_NAME_TYPE_CIPHER_METH);
        return(cp);
        }
 
-EVP_MD *EVP_get_digestbyname(name)
-char *name;
+const EVP_MD *EVP_get_digestbyname(const char *name)
        {
-       EVP_MD *cp;
+       const EVP_MD *cp;
 
-       cp=(EVP_MD *)OBJ_NAME_get(name,OBJ_NAME_TYPE_MD_METH);
+       cp=(const EVP_MD *)OBJ_NAME_get(name,OBJ_NAME_TYPE_MD_METH);
        return(cp);
        }
 
-void EVP_cleanup()
+void EVP_cleanup(void)
        {
        OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH);
        OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH);
+       /* The above calls will only clean out the contents of the name
+          hash table, but not the hash table itself.  The following line
+          does that part.  -- Richard Levitte */
+       OBJ_NAME_cleanup(-1);
+
        EVP_PBE_cleanup();
+       if (obj_cleanup_defer == 2)
+               {
+               obj_cleanup_defer = 0;
+               OBJ_cleanup();
+               }
+       OBJ_sigid_free();
+       }
+
+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, nm->name, 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, nm->name, 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);
        }