From: Antonio Quartulli <antonio@openvpn.net>
Date: Fri, 7 Jul 2017 10:22:38 +0000 (+0800)
Subject: tls-crypt: avoid warnings when --disable-crypto is used
X-Git-Tag: v2.4.4~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8295f62f84be3dbc5203b9695d99a4f74fcb7295;p=thirdparty%2Fopenvpn.git

tls-crypt: avoid warnings when --disable-crypto is used

Avoid including the content of tls_crypt.h when --disable-crypto
is used, as it will trigger some warnings due to missing
structures declarations.

Signed-off-by: Antonio Quartulli <antonio@openvpn.net>
Acked-by: Steffan Karger <steffan@karger.me>
Acked-by: David Sommerseth <davids@openvpn.net>
Message-Id: <20170707102238.8781-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15014.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
(cherry picked from commit 2dfbf62b6ace1eb39f1ae7126bc5530a541bed58)
---

diff --git a/src/openvpn/tls_crypt.h b/src/openvpn/tls_crypt.h
index e8080df90..4071ac94c 100644
--- a/src/openvpn/tls_crypt.h
+++ b/src/openvpn/tls_crypt.h
@@ -74,6 +74,8 @@
 #ifndef TLSCRYPT_H
 #define TLSCRYPT_H
 
+#ifdef ENABLE_CRYPTO
+
 #include "buffer.h"
 #include "crypto.h"
 #include "session_id.h"
@@ -140,4 +142,6 @@ bool tls_crypt_unwrap(const struct buffer *src, struct buffer *dst,
 
 /** @} */
 
+#endif /* ENABLE_CRYPTO */
+
 #endif /* TLSCRYPT_H */