Enable the build of GOST routines in libcrypto. Riding upon the Cammelia

libcrypto minor bump.

3 files changed, 6 insertions, 8 deletions

diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile
index da53155a7a..7895dbddd8 100644
--- a/src/lib/libcrypto/crypto/Makefile
+++ b/src/lib/libcrypto/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2014/11/17 20:31:20 miod Exp $
+# $OpenBSD: Makefile,v 1.49 2014/11/18 05:31:47 miod Exp $
 
 LIB=    crypto
 
@@ -154,13 +154,13 @@ SRCS+= evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c
 SRCS+= e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c
 SRCS+= e_aes_cbc_hmac_sha1.c e_rc4_hmac_md5.c
 SRCS+= e_chacha.c evp_aead.c e_chacha20poly1305.c
-#SRCS+= e_gost2814789.c m_gost2814789.c m_gostr341194.c m_streebog.c
+SRCS+= e_gost2814789.c m_gost2814789.c m_gostr341194.c m_streebog.c
 
 # gost/
-#SRCS+= gost2814789.c gost89_keywrap.c gost89_params.c gost89imit_ameth.c
-#SRCS+= gost89imit_pmeth.c gost_asn1.c gost_err.c gostr341001.c
-#SRCS+= gostr341001_ameth.c gostr341001_key.c gostr341001_params.c
-#SRCS+= gostr341001_pmeth.c gostr341194.c streebog.c
+SRCS+= gost2814789.c gost89_keywrap.c gost89_params.c gost89imit_ameth.c
+SRCS+= gost89imit_pmeth.c gost_asn1.c gost_err.c gostr341001.c
+SRCS+= gostr341001_ameth.c gostr341001_key.c gostr341001_params.c
+SRCS+= gostr341001_pmeth.c gostr341194.c streebog.c
 
 # hmac/
 SRCS+= hmac.c hm_ameth.c hm_pmeth.c
diff --git a/src/lib/libcrypto/opensslfeatures.h b/src/lib/libcrypto/opensslfeatures.h
index 6e81fa3013..54d3d4fb9a 100644
--- a/src/lib/libcrypto/opensslfeatures.h
+++ b/src/lib/libcrypto/opensslfeatures.h
@@ -2,7 +2,6 @@
 # define OPENSSL_NO_CMS
 # define OPENSSL_NO_COMP
 # define OPENSSL_NO_GMP
-# define OPENSSL_NO_GOST
 # define OPENSSL_NO_JPAKE
 # define OPENSSL_NO_KRB5
 # define OPENSSL_NO_MD2
diff --git a/src/lib/libssl/src/crypto/opensslfeatures.h b/src/lib/libssl/src/crypto/opensslfeatures.h
index 6e81fa3013..54d3d4fb9a 100644
--- a/src/lib/libssl/src/crypto/opensslfeatures.h
+++ b/src/lib/libssl/src/crypto/opensslfeatures.h
@@ -2,7 +2,6 @@
 # define OPENSSL_NO_CMS
 # define OPENSSL_NO_COMP
 # define OPENSSL_NO_GMP
-# define OPENSSL_NO_GOST
 # define OPENSSL_NO_JPAKE
 # define OPENSSL_NO_KRB5
 # define OPENSSL_NO_MD2