Skip to contentSkip to conversation

Fix --disable-ssl builds, were broken by cleanup in 63dc03d.

PATCH In review Steffan Karger 2 participants 2 messages Jun 2, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix --disable-ssl builds, were broken by cleanup in 63dc03d.

Wrap ssl_verify.h in "#if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)" to make it empty for --disable-ssl builds.

---
 src/openvpn/ssl_verify.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
src/openvpn/ssl_verify.h +4 -1
index 601d863..84554f8 100644
@@ -30,6 +30,8 @@
 #ifndef SSL_VERIFY_H_
 #define SSL_VERIFY_H_
 
+#if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)
+
 #include "syshead.h"
 #include "misc.h"
 #include "ssl_common.h"
@@ -234,5 +236,6 @@ tls_client_reason (struct tls_multi *multi)
 #endif
 }
 
-#endif /* SSL_VERIFY_H_ */
+#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_SSL) */
 
+#endif /* SSL_VERIFY_H_ */
Signature · 1 line
1.9.1
#1 lore raw

Your patch has been applied to the master branch.

commit d0154a3a8a73fa656ba7ce2c15087db85c8ece92

Author: Steffan Karger
Date:   Mon Jun 2 21:23:39 2014 +0200
     Fix --disable-ssl builds, were broken by cleanup in 63dc03d.

     Signed-off-by: Steffan Karger <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/8763
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering