tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [openbsd-compat/openssl-compat.h] add include guard

This commit is contained in:
Damien Miller 2014-08-30 04:18:28 +10:00
parent 4687802dda
commit d7c81e216a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
- (djm) [openbsd-compat/openssl-compat.h] add - (djm) [openbsd-compat/openssl-compat.h] add
OPENSSL_[RD]SA_MAX_MODULUS_BITS defines for OpenSSL that lacks them OPENSSL_[RD]SA_MAX_MODULUS_BITS defines for OpenSSL that lacks them
- (djm) [misc.c] Missing newline between functions - (djm) [misc.c] Missing newline between functions
- (djm) [openbsd-compat/openssl-compat.h] add include guard
20140827 20140827
- (djm) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c] - (djm) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c]

14
openbsd-compat/openssl-compat.h
View File

@ -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> * 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. * 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 "includes.h"
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#include <openssl/evp.h> #include <openssl/evp.h>
@ -25,7 +28,7 @@
int ssh_compatible_openssl(long, long); int ssh_compatible_openssl(long, long);
#if (OPENSSL_VERSION_NUMBER <= 0x0090805fL) #if (OPENSSL_VERSION_NUMBER <= 0x0090805fL)
#error OpenSSL 0.9.8f or greater is required # error OpenSSL 0.9.8f or greater is required
#endif #endif
#if OPENSSL_VERSION_NUMBER < 0x10000001L #if OPENSSL_VERSION_NUMBER < 0x10000001L
@ -42,9 +45,9 @@ int ssh_compatible_openssl(long, long);
#endif #endif
#ifndef OPENSSL_HAVE_EVPCTR #ifndef OPENSSL_HAVE_EVPCTR
#define EVP_aes_128_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_192_ctr evp_aes_128_ctr
#define EVP_aes_256_ctr evp_aes_128_ctr # define EVP_aes_256_ctr evp_aes_128_ctr
const EVP_CIPHER *evp_aes_128_ctr(void); const EVP_CIPHER *evp_aes_128_ctr(void);
void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t); void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t);
#endif #endif
@ -87,3 +90,4 @@ void ssh_OpenSSL_add_all_algorithms(void);
#endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ #endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */
#endif /* _OPENSSL_COMPAT_H */