diff options
author | simon <simon@FreeBSD.org> | 2010-04-01 12:25:40 +0000 |
---|---|---|
committer | simon <simon@FreeBSD.org> | 2010-04-01 12:25:40 +0000 |
commit | d92ad4708f8e42fced6b82ddee1930a3e4f6e342 (patch) | |
tree | ea91d9b180fa36b1886b046a286630c089f57475 /crypto/evp/names.c | |
parent | cdb6eef1f013e22a10ab5f5829dcdc3b5e32d385 (diff) | |
download | FreeBSD-src-d92ad4708f8e42fced6b82ddee1930a3e4f6e342.zip FreeBSD-src-d92ad4708f8e42fced6b82ddee1930a3e4f6e342.tar.gz |
Import OpenSSL 0.9.8n.
Diffstat (limited to 'crypto/evp/names.c')
-rw-r--r-- | crypto/evp/names.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |