From d92ad4708f8e42fced6b82ddee1930a3e4f6e342 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 1 Apr 2010 12:25:40 +0000 Subject: Import OpenSSL 0.9.8n. --- crypto/evp/names.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crypto/evp/names.c') diff --git a/crypto/evp/names.c b/crypto/evp/names.c index e2e04c3..945879d 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -90,7 +90,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); -- cgit v1.1