Hi, On 07-07-17 12:22, Antonio Quartulli wrote: > From: Antonio Quartulli <anto...@openvpn.net> > > 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 <anto...@openvpn.net> > --- > > - also checked via travis-ci.org > > src/openvpn/tls_crypt.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/src/openvpn/tls_crypt.h b/src/openvpn/tls_crypt.h > index e8080df9..4071ac94 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 */ >
ACK (This is quite similar to the fix I have in my tls-crypt-v2 tree: https://github.com/syzzer/openvpn/commit/ba30a88e, so can't agree more ;-) ) -Steffan ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
