summaryrefslogtreecommitdiff
path: root/lib/libssl/ssl_algs.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libssl/ssl_algs.c')
-rw-r--r--lib/libssl/ssl_algs.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/libssl/ssl_algs.c b/lib/libssl/ssl_algs.c
index 842d50a7623..558d51ce7a0 100644
--- a/lib/libssl/ssl_algs.c
+++ b/lib/libssl/ssl_algs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_algs.c,v 1.20 2014/11/16 14:12:47 jsing Exp $ */
+/* $OpenBSD: ssl_algs.c,v 1.21 2014/11/18 05:33:43 miod Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -98,6 +98,10 @@ SSL_library_init(void)
EVP_add_cipher(EVP_camellia_128_cbc());
EVP_add_cipher(EVP_camellia_256_cbc());
#endif
+#ifndef OPENSSL_NO_GOST
+ EVP_add_cipher(EVP_gost2814789_cfb64());
+ EVP_add_cipher(EVP_gost2814789_cnt());
+#endif
EVP_add_digest(EVP_md5());
EVP_add_digest_alias(SN_md5, "ssl2-md5");
@@ -114,6 +118,12 @@ SSL_library_init(void)
EVP_add_digest_alias(SN_dsaWithSHA1, "DSS1");
EVP_add_digest_alias(SN_dsaWithSHA1, "dss1");
EVP_add_digest(EVP_ecdsa());
+#ifndef OPENSSL_NO_GOST
+ EVP_add_digest(EVP_gostr341194());
+ EVP_add_digest(EVP_gost2814789imit());
+ EVP_add_digest(EVP_streebog256());
+ EVP_add_digest(EVP_streebog512());
+#endif
/* initialize cipher/digest methods table */
ssl_load_ciphers();
return (1);