summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_algs.c
diff options
context:
space:
mode:
authorjsing <>2019-04-04 16:44:24 +0000
committerjsing <>2019-04-04 16:44:24 +0000
commit4ee3e34310a4dd1cee5a12b0e0b222cbea806322 (patch)
tree183461b00fc0b82a96b5d144624116543c5cd88a /src/lib/libssl/ssl_algs.c
parent71b5f161c982b24df543400bbfc808f5b8c4937b (diff)
downloadopenbsd-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_algs.c')
-rw-r--r--src/lib/libssl/ssl_algs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_algs.c b/src/lib/libssl/ssl_algs.c
index b63f36b3f1..bb736c5de9 100644
--- a/src/lib/libssl/ssl_algs.c
+++ b/src/lib/libssl/ssl_algs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_algs.c,v 1.27 2017/08/12 02:55:22 jsing Exp $ */ 1/* $OpenBSD: ssl_algs.c,v 1.28 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 *
@@ -119,8 +119,7 @@ SSL_library_init(void)
119 EVP_add_digest(EVP_streebog256()); 119 EVP_add_digest(EVP_streebog256());
120 EVP_add_digest(EVP_streebog512()); 120 EVP_add_digest(EVP_streebog512());
121#endif 121#endif
122 /* initialize cipher/digest methods table */ 122
123 ssl_load_ciphers();
124 return (1); 123 return (1);
125} 124}
126 125