- (djm) [openbsd-compat/openssl-compat.h] add include guard
diff --git a/ChangeLog b/ChangeLog
index d59acab..2c36965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
- (djm) [openbsd-compat/openssl-compat.h] add
OPENSSL_[RD]SA_MAX_MODULUS_BITS defines for OpenSSL that lacks them
- (djm) [misc.c] Missing newline between functions
+ - (djm) [openbsd-compat/openssl-compat.h] add include guard
20140827
- (djm) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c]
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index d0c3307..3695d41 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -1,4 +1,4 @@
-/* $Id: openssl-compat.h,v 1.30 2014/08/29 16:30:30 djm Exp $ */
+/* $Id: openssl-compat.h,v 1.31 2014/08/29 18:18:29 djm Exp $ */
/*
* Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -16,6 +16,9 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifndef _OPENSSL_COMPAT_H
+#define _OPENSSL_COMPAT_H
+
#include "includes.h"
#include <openssl/opensslv.h>
#include <openssl/evp.h>
@@ -25,7 +28,7 @@
int ssh_compatible_openssl(long, long);
#if (OPENSSL_VERSION_NUMBER <= 0x0090805fL)
-#error OpenSSL 0.9.8f or greater is required
+# error OpenSSL 0.9.8f or greater is required
#endif
#if OPENSSL_VERSION_NUMBER < 0x10000001L
@@ -42,9 +45,9 @@
#endif
#ifndef OPENSSL_HAVE_EVPCTR
-#define EVP_aes_128_ctr evp_aes_128_ctr
-#define EVP_aes_192_ctr evp_aes_128_ctr
-#define EVP_aes_256_ctr evp_aes_128_ctr
+# define EVP_aes_128_ctr evp_aes_128_ctr
+# define EVP_aes_192_ctr evp_aes_128_ctr
+# define EVP_aes_256_ctr evp_aes_128_ctr
const EVP_CIPHER *evp_aes_128_ctr(void);
void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t);
#endif
@@ -87,3 +90,4 @@
#endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */
+#endif /* _OPENSSL_COMPAT_H */