summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-08-30 04:18:28 +1000
committerDamien Miller <djm@mindrot.org>2014-08-30 04:18:28 +1000
commitd7c81e216a7bd9eed6e239c970d9261bb1651947 (patch)
tree3f336c5509eb846cc1084cd9bc092561083ccdc6 /openbsd-compat
parent4687802dda57365b984b897fc3c8e2867ea09b22 (diff)
- (djm) [openbsd-compat/openssl-compat.h] add include guard
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/openssl-compat.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index d0c3307d0..3695d412b 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openssl-compat.h,v 1.30 2014/08/29 16:30:30 djm Exp $ */ 1/* $Id: openssl-compat.h,v 1.31 2014/08/29 18:18:29 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> 4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -16,6 +16,9 @@
16 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 16 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 */ 17 */
18 18
19#ifndef _OPENSSL_COMPAT_H
20#define _OPENSSL_COMPAT_H
21
19#include "includes.h" 22#include "includes.h"
20#include <openssl/opensslv.h> 23#include <openssl/opensslv.h>
21#include <openssl/evp.h> 24#include <openssl/evp.h>
@@ -25,7 +28,7 @@
25int ssh_compatible_openssl(long, long); 28int ssh_compatible_openssl(long, long);
26 29
27#if (OPENSSL_VERSION_NUMBER <= 0x0090805fL) 30#if (OPENSSL_VERSION_NUMBER <= 0x0090805fL)
28#error OpenSSL 0.9.8f or greater is required 31# error OpenSSL 0.9.8f or greater is required
29#endif 32#endif
30 33
31#if OPENSSL_VERSION_NUMBER < 0x10000001L 34#if OPENSSL_VERSION_NUMBER < 0x10000001L
@@ -42,9 +45,9 @@ int ssh_compatible_openssl(long, long);
42#endif 45#endif
43 46
44#ifndef OPENSSL_HAVE_EVPCTR 47#ifndef OPENSSL_HAVE_EVPCTR
45#define EVP_aes_128_ctr evp_aes_128_ctr 48# define EVP_aes_128_ctr evp_aes_128_ctr
46#define EVP_aes_192_ctr evp_aes_128_ctr 49# define EVP_aes_192_ctr evp_aes_128_ctr
47#define EVP_aes_256_ctr evp_aes_128_ctr 50# define EVP_aes_256_ctr evp_aes_128_ctr
48const EVP_CIPHER *evp_aes_128_ctr(void); 51const EVP_CIPHER *evp_aes_128_ctr(void);
49void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t); 52void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t);
50#endif 53#endif
@@ -87,3 +90,4 @@ void ssh_OpenSSL_add_all_algorithms(void);
87 90
88#endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ 91#endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */
89 92
93#endif /* _OPENSSL_COMPAT_H */