diff options
author | jsing <> | 2017-02-28 14:08:50 +0000 |
---|---|---|
committer | jsing <> | 2017-02-28 14:08:50 +0000 |
commit | abdc360910496483afa44b9ca075e21b248a491d (patch) | |
tree | c43008fd64414dbc69067d59ebd7d29731f5def4 /src/lib/libssl/ssl_lib.c | |
parent | c2b74811611cc1f5ffe9e6543476548a8a9bba0a (diff) | |
download | openbsd-abdc360910496483afa44b9ca075e21b248a491d.tar.gz openbsd-abdc360910496483afa44b9ca075e21b248a491d.tar.bz2 openbsd-abdc360910496483afa44b9ca075e21b248a491d.zip |
Stop pretending that MD5 and SHA1 might not exist - rather than locating
"ssl3-md5" and "ssl-sha1", call the EVP_md5() and EVP_sha1() functions
directly.
ok beck@ inoguchi@
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 65b26209b8..3f458d8b10 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.157 2017/02/15 14:56:42 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.158 2017/02/28 14:08:49 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1865,15 +1865,6 @@ SSL_CTX_new(const SSL_METHOD *meth) | |||
1865 | if (!ret->param) | 1865 | if (!ret->param) |
1866 | goto err; | 1866 | goto err; |
1867 | 1867 | ||
1868 | if ((ret->internal->md5 = EVP_get_digestbyname("ssl3-md5")) == NULL) { | ||
1869 | SSLerrorx(SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES); | ||
1870 | goto err2; | ||
1871 | } | ||
1872 | if ((ret->internal->sha1 = EVP_get_digestbyname("ssl3-sha1")) == NULL) { | ||
1873 | SSLerrorx(SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES); | ||
1874 | goto err2; | ||
1875 | } | ||
1876 | |||
1877 | if ((ret->internal->client_CA = sk_X509_NAME_new_null()) == NULL) | 1868 | if ((ret->internal->client_CA = sk_X509_NAME_new_null()) == NULL) |
1878 | goto err; | 1869 | goto err; |
1879 | 1870 | ||