You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
1011 B
38 lines
1011 B
diff -up openssl-1.0.1e/ssl/t1_lib.c.no-md5-tls openssl-1.0.1e/ssl/t1_lib.c |
|
--- openssl-1.0.1e/ssl/t1_lib.c.no-md5-tls 2015-12-04 09:51:39.000000000 +0100 |
|
+++ openssl-1.0.1e/ssl/t1_lib.c 2015-12-21 14:09:35.239084727 +0100 |
|
@@ -390,19 +390,11 @@ static unsigned char tls12_sigalgs[] = { |
|
#ifndef OPENSSL_NO_SHA |
|
tlsext_sigalg(TLSEXT_hash_sha1) |
|
#endif |
|
-#ifndef OPENSSL_NO_MD5 |
|
- tlsext_sigalg_rsa(TLSEXT_hash_md5) |
|
-#endif |
|
}; |
|
|
|
int tls12_get_req_sig_algs(SSL *s, unsigned char *p) |
|
{ |
|
size_t slen = sizeof(tls12_sigalgs); |
|
-#ifdef OPENSSL_FIPS |
|
- /* If FIPS mode don't include MD5 which is last */ |
|
- if (FIPS_mode()) |
|
- slen -= 2; |
|
-#endif |
|
if (p) |
|
memcpy(p, tls12_sigalgs, slen); |
|
return (int)slen; |
|
@@ -2413,14 +2405,6 @@ const EVP_MD *tls12_get_hash(unsigned ch |
|
{ |
|
switch(hash_alg) |
|
{ |
|
-#ifndef OPENSSL_NO_MD5 |
|
- case TLSEXT_hash_md5: |
|
-#ifdef OPENSSL_FIPS |
|
- if (FIPS_mode()) |
|
- return NULL; |
|
-#endif |
|
- return EVP_md5(); |
|
-#endif |
|
#ifndef OPENSSL_NO_SHA |
|
case TLSEXT_hash_sha1: |
|
return EVP_sha1();
|
|
|