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_clnt.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_clnt.c')
-rw-r--r-- | src/lib/libssl/ssl_clnt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c index 7f4d6582da..da4b966bc6 100644 --- a/src/lib/libssl/ssl_clnt.c +++ b/src/lib/libssl/ssl_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_clnt.c,v 1.5 2017/02/07 02:08:38 beck Exp $ */ | 1 | /* $OpenBSD: ssl_clnt.c,v 1.6 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 | * |
@@ -1478,8 +1478,8 @@ ssl3_get_server_key_exchange(SSL *s) | |||
1478 | q = md_buf; | 1478 | q = md_buf; |
1479 | for (num = 2; num > 0; num--) { | 1479 | for (num = 2; num > 0; num--) { |
1480 | if (!EVP_DigestInit_ex(&md_ctx, | 1480 | if (!EVP_DigestInit_ex(&md_ctx, |
1481 | (num == 2) ? s->ctx->internal->md5 : | 1481 | (num == 2) ? EVP_md5() : EVP_sha1(), |
1482 | s->ctx->internal->sha1, NULL)) { | 1482 | NULL)) { |
1483 | al = SSL_AD_INTERNAL_ERROR; | 1483 | al = SSL_AD_INTERNAL_ERROR; |
1484 | goto f_err; | 1484 | goto f_err; |
1485 | } | 1485 | } |