From 08094f7429da744acb8c2bde71b0b053844f592a Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Fri, 11 Jul 2014 15:28:27 +0000
Subject: OPENSSL_ALGORITHM_DEFINES has been removed from conf.h, no need for
 it now

---
 src/lib/libcrypto/evp/evp.h         | 10 ++--------
 src/lib/libssl/src/crypto/evp/evp.h | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index 41b0259402..9de7c3f9ef 100644
--- a/src/lib/libcrypto/evp/evp.h
+++ b/src/lib/libcrypto/evp/evp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp.h,v 1.38 2014/06/24 19:31:50 miod Exp $ */
+/* $OpenBSD: evp.h,v 1.39 2014/07/11 15:28:27 tedu Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -59,13 +59,7 @@
 #ifndef HEADER_ENVELOPE_H
 #define HEADER_ENVELOPE_H
 
-#ifdef OPENSSL_ALGORITHM_DEFINES
-# include <openssl/opensslconf.h>
-#else
-# define OPENSSL_ALGORITHM_DEFINES
-# include <openssl/opensslconf.h>
-# undef OPENSSL_ALGORITHM_DEFINES
-#endif
+#include <openssl/opensslconf.h>
 
 #include <openssl/ossl_typ.h>
 
diff --git a/src/lib/libssl/src/crypto/evp/evp.h b/src/lib/libssl/src/crypto/evp/evp.h
index 41b0259402..9de7c3f9ef 100644
--- a/src/lib/libssl/src/crypto/evp/evp.h
+++ b/src/lib/libssl/src/crypto/evp/evp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp.h,v 1.38 2014/06/24 19:31:50 miod Exp $ */
+/* $OpenBSD: evp.h,v 1.39 2014/07/11 15:28:27 tedu Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -59,13 +59,7 @@
 #ifndef HEADER_ENVELOPE_H
 #define HEADER_ENVELOPE_H
 
-#ifdef OPENSSL_ALGORITHM_DEFINES
-# include <openssl/opensslconf.h>
-#else
-# define OPENSSL_ALGORITHM_DEFINES
-# include <openssl/opensslconf.h>
-# undef OPENSSL_ALGORITHM_DEFINES
-#endif
+#include <openssl/opensslconf.h>
 
 #include <openssl/ossl_typ.h>
 
-- 
cgit v1.2.3-55-g6feb