diff options
author | jsing <> | 2019-04-04 16:44:24 +0000 |
---|---|---|
committer | jsing <> | 2019-04-04 16:44:24 +0000 |
commit | 4ee3e34310a4dd1cee5a12b0e0b222cbea806322 (patch) | |
tree | 183461b00fc0b82a96b5d144624116543c5cd88a /src/lib/libssl/ssl_locl.h | |
parent | 71b5f161c982b24df543400bbfc808f5b8c4937b (diff) | |
download | openbsd-4ee3e34310a4dd1cee5a12b0e0b222cbea806322.tar.gz openbsd-4ee3e34310a4dd1cee5a12b0e0b222cbea806322.tar.bz2 openbsd-4ee3e34310a4dd1cee5a12b0e0b222cbea806322.zip |
Clean up the cipher/digest table mess.
The original implementation allows for libcrypto to be compiled without a
given algorithm and libssl then detects that ciphers or digests are
unavailable so that it can disable the associated cipher suites.
This is unnecessary since we do not compile out algorithms.
ok beck@, tb@ (a while back)
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 2dae72309c..31f3e60893 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.244 2019/03/25 17:33:26 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.245 2019/04/04 16:44:24 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 | * |
@@ -1127,7 +1127,6 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher); | |||
1127 | STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); | 1127 | STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); |
1128 | int ssl_has_ecc_ciphers(SSL *s); | 1128 | int ssl_has_ecc_ciphers(SSL *s); |
1129 | int ssl_verify_alarm_type(long type); | 1129 | int ssl_verify_alarm_type(long type); |
1130 | void ssl_load_ciphers(void); | ||
1131 | 1130 | ||
1132 | int SSL_SESSION_ticket(SSL_SESSION *ss, unsigned char **out, size_t *out_len); | 1131 | int SSL_SESSION_ticket(SSL_SESSION *ss, unsigned char **out, size_t *out_len); |
1133 | 1132 | ||