#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);
+
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);
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 (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,
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,