diff options
| author |   miod <miod@openbsd.org> | 2014-11-18 05:31:47 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-11-18 05:31:47 +0000 |
| commit | 382147b327c74d49e3c696ea9b4ab500c323d441 (patch) | |
| tree | 9695e633dee1b388abcd9dd5b51b5f295aa98fcf | |
| parent | More missing error checks I forgot to commit last week, part of the large (diff) | |
| download | wireguard-openbsd-382147b327c74d49e3c696ea9b4ab500c323d441.tar.xz wireguard-openbsd-382147b327c74d49e3c696ea9b4ab500c323d441.zip | |
Enable the build of GOST routines in libcrypto. Riding upon the Cammelia
libcrypto minor bump.
| -rw-r--r-- | lib/libcrypto/crypto/Makefile | 12 | ||||
| -rw-r--r-- | lib/libcrypto/opensslfeatures.h | 1 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/opensslfeatures.h | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/lib/libcrypto/crypto/Makefile b/lib/libcrypto/crypto/Makefile index da53155a7a0..7895dbddd82 100644 --- a/lib/libcrypto/crypto/Makefile +++ b/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/lib/libcrypto/opensslfeatures.h b/lib/libcrypto/opensslfeatures.h index 6e81fa3013e..54d3d4fb9a0 100644 --- a/lib/libcrypto/opensslfeatures.h +++ b/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/lib/libssl/src/crypto/opensslfeatures.h b/lib/libssl/src/crypto/opensslfeatures.h index 6e81fa3013e..54d3d4fb9a0 100644 --- a/lib/libssl/src/crypto/opensslfeatures.h +++ b/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 |