diff options
author | jsing <> | 2017-02-28 14:15:37 +0000 |
---|---|---|
committer | jsing <> | 2017-02-28 14:15:37 +0000 |
commit | ca28e541c86936857a23a70090980a8bb952e842 (patch) | |
tree | 2539caf54ac751f30ddb7c36d52b988a41e9b202 /src/lib/libcrypto/evp/evp.h | |
parent | 38da1a984b117a519fe2a498ead2bd71e9597591 (diff) | |
download | openbsd-ca28e541c86936857a23a70090980a8bb952e842.tar.gz openbsd-ca28e541c86936857a23a70090980a8bb952e842.tar.bz2 openbsd-ca28e541c86936857a23a70090980a8bb952e842.zip |
Add an EVP interface that provides concatenated MD5+SHA1 hashes, which are
used in various parts of TLS 1.0/1.1.
This will allow for code simplification in libssl.
The same interface exists in OpenSSL 1.1.
ok beck@ deraadt@ inoguchi@ millert@
Diffstat (limited to 'src/lib/libcrypto/evp/evp.h')
-rw-r--r-- | src/lib/libcrypto/evp/evp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index 75798dae8c..68e1049587 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp.h,v 1.51 2016/05/30 13:42:54 beck Exp $ */ | 1 | /* $OpenBSD: evp.h,v 1.52 2017/02/28 14:15:37 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 | * |
@@ -659,6 +659,7 @@ const EVP_MD *EVP_md4(void); | |||
659 | #endif | 659 | #endif |
660 | #ifndef OPENSSL_NO_MD5 | 660 | #ifndef OPENSSL_NO_MD5 |
661 | const EVP_MD *EVP_md5(void); | 661 | const EVP_MD *EVP_md5(void); |
662 | const EVP_MD *EVP_md5_sha1(void); | ||
662 | #endif | 663 | #endif |
663 | #ifndef OPENSSL_NO_SHA | 664 | #ifndef OPENSSL_NO_SHA |
664 | const EVP_MD *EVP_sha1(void); | 665 | const EVP_MD *EVP_sha1(void); |