diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-08-29 23:11:05 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-11-24 20:18:44 +0100 |
| commit | d18d31a16f91dc5042344e207390322170458025 (patch) | |
| tree | 9f4d6667cd0e6b5f632b3588a29fd4c0c82d8861 /ssl | |
| parent | Add MD5+SHA1 (diff) | |
| download | openssl-d18d31a16f91dc5042344e207390322170458025.tar.xz openssl-d18d31a16f91dc5042344e207390322170458025.zip | |
Use MD5+SHA1 for default digest if appropriate.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/t1_lib.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 2ba76e3835..3375494b8a 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -2712,8 +2712,11 @@ static void ssl_set_default_md(SSL *s) pmd[SSL_PKEY_DSA_SIGN] = EVP_sha1(); #endif #ifndef OPENSSL_NO_RSA - pmd[SSL_PKEY_RSA_SIGN] = EVP_sha1(); - pmd[SSL_PKEY_RSA_ENC] = EVP_sha1(); + if (SSL_USE_SIGALGS(s)) + pmd[SSL_PKEY_RSA_SIGN] = EVP_sha1(); + else + pmd[SSL_PKEY_RSA_SIGN] = EVP_md5_sha1(); + pmd[SSL_PKEY_RSA_ENC] = pmd[SSL_PKEY_RSA_SIGN]; #endif #ifndef OPENSSL_NO_EC pmd[SSL_PKEY_ECC] = EVP_sha1(); |