diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2014-07-21 02:24:59 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2014-07-21 02:24:59 +1000 |
| commit | 5573171352ea23df2dc6d2fe0324d023b7ba697c (patch) | |
| tree | 083b7a1b3fc548ce2f440702dafcedb1391a3fe1 /openbsd-compat/openssl-compat.h | |
| parent | 74e28682711d005026c7c8f15f96aea9d3c8b5a3 (diff) | |
- (dtucker) [cipher.c openbsd-compat/openssl-compat.h] Restore the bits
needed to build AES CTR mode against OpenSSL 0.9.8f and above. ok djm
Diffstat (limited to 'openbsd-compat/openssl-compat.h')
| -rw-r--r-- | openbsd-compat/openssl-compat.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index d088d296..21002107 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h @@ -1,4 +1,4 @@ -/* $Id: openssl-compat.h,v 1.28 2014/07/02 05:28:07 djm Exp $ */ +/* $Id: openssl-compat.h,v 1.29 2014/07/20 16:24:59 dtucker Exp $ */ /* * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> @@ -34,6 +34,14 @@ int ssh_compatible_openssl(long, long); # define LIBCRYPTO_EVP_INL_TYPE size_t #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 +const EVP_CIPHER *evp_aes_128_ctr(void); +void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t); +#endif + /* Avoid some #ifdef. Code that uses these is unreachable without GCM */ #if !defined(OPENSSL_HAVE_EVPGCM) && !defined(EVP_CTRL_GCM_SET_IV_FIXED) # define EVP_CTRL_GCM_SET_IV_FIXED -1 |