diff options
| author | tedu <> | 2014-04-17 20:34:24 +0000 |
|---|---|---|
| committer | tedu <> | 2014-04-17 20:34:24 +0000 |
| commit | a4f43d51afbf888cc2bf61305fe1c333efcfb14a (patch) | |
| tree | 43eb7871ab96b298855c37d0802ec9dcdd62876a /src/lib/libssl/ssl_locl.h | |
| parent | 1b03720fa707bbc690799cfe699e0d8714e8f6ef (diff) | |
| download | openbsd-a4f43d51afbf888cc2bf61305fe1c333efcfb14a.tar.gz openbsd-a4f43d51afbf888cc2bf61305fe1c333efcfb14a.tar.bz2 openbsd-a4f43d51afbf888cc2bf61305fe1c333efcfb14a.zip | |
quick pass at removing ability to disable sha256 and sha512. ok miod
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index c539b1229d..483723736a 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
| @@ -1061,11 +1061,7 @@ int ssl_check_clienthello_tlsext_early(SSL *s); | |||
| 1061 | int ssl_check_clienthello_tlsext_late(SSL *s); | 1061 | int ssl_check_clienthello_tlsext_late(SSL *s); |
| 1062 | int ssl_check_serverhello_tlsext(SSL *s); | 1062 | int ssl_check_serverhello_tlsext(SSL *s); |
| 1063 | 1063 | ||
| 1064 | #ifdef OPENSSL_NO_SHA256 | ||
| 1065 | #define tlsext_tick_md EVP_sha1 | ||
| 1066 | #else | ||
| 1067 | #define tlsext_tick_md EVP_sha256 | 1064 | #define tlsext_tick_md EVP_sha256 |
| 1068 | #endif | ||
| 1069 | int tls1_process_ticket(SSL *s, unsigned char *session_id, int len, | 1065 | int tls1_process_ticket(SSL *s, unsigned char *session_id, int len, |
| 1070 | const unsigned char *limit, SSL_SESSION **ret); | 1066 | const unsigned char *limit, SSL_SESSION **ret); |
| 1071 | 1067 | ||
