When OPENSSL_LOAD_CONF was added it ended up with more #if 0 code,

more #ifdefs and a new source file that contains a single function.

Nuke the #if 0 code that is now a macro and move the single function in
evp_acnf.c to c_all.c, which is where the other code lives. While here,
tidy evp.h slightly, remove an unnecessary #ifdef __OpenBSD__ and nuke
a comment that is now a lie.

ok miod@

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile
index 78261e6ef6..258f998fbc 100644
--- a/src/lib/libcrypto/crypto/Makefile
+++ b/src/lib/libcrypto/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2014/05/15 15:09:01 jsing Exp $
+# $OpenBSD: Makefile,v 1.36 2014/05/16 14:24:36 jsing Exp $
 
 LIB=    crypto
 
@@ -140,7 +140,7 @@ SRCS+= eng_rsax.c eng_rdrand.c
 SRCS+= err.c err_all.c err_prn.c
 
 # evp/
-SRCS+= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c
+SRCS+= encode.c digest.c evp_enc.c evp_key.c
 SRCS+= e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c
 SRCS+= e_rc4.c e_aes.c names.c
 SRCS+= e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c