diff options
author | Darren Tucker <dtucker@zip.com.au> | 2014-01-17 17:32:30 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2014-01-17 17:32:30 +1100 |
commit | d23a91ffb289d3553a58b7a60cec39fba9f0f506 (patch) | |
tree | 458da6bcc5e923cb1976f3d882061185548ed935 /openbsd-compat/openssl-compat.h | |
parent | 868ea1ea1c1bfdbee5dbad78f81999c5983ecf31 (diff) |
- (dtucker) [configure.ac digest.c openbsd-compat/openssl-compat.c
openbsd-compat/openssl-compat.h] Add compatibility layer for older
openssl versions. ok djm@
Diffstat (limited to 'openbsd-compat/openssl-compat.h')
-rw-r--r-- | openbsd-compat/openssl-compat.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index e7439b4e7..021ea98f5 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.h,v 1.24 2013/02/12 00:00:40 djm Exp $ */ | 1 | /* $Id: openssl-compat.h,v 1.25 2014/01/17 06:32:31 dtucker 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> |
@@ -148,6 +148,14 @@ int DSA_generate_parameters_ex(DSA *, int, const unsigned char *, int, int *, | |||
148 | int RSA_generate_key_ex(RSA *, int, BIGNUM *, void *); | 148 | int RSA_generate_key_ex(RSA *, int, BIGNUM *, void *); |
149 | # endif | 149 | # endif |
150 | 150 | ||
151 | # ifndef HAVE_EVP_DIGESTINIT_EX | ||
152 | int EVP_DigestInit_ex(EVP_MD_CTX *, const EVP_MD *, void *); | ||
153 | # endif | ||
154 | |||
155 | # ifndef HAVE_EVP_DISESTFINAL_EX | ||
156 | int EVP_DigestFinal_ex(EVP_MD_CTX *, unsigned char *, unsigned int *); | ||
157 | # endif | ||
158 | |||
151 | int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, | 159 | int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, |
152 | unsigned char *, int); | 160 | unsigned char *, int); |
153 | int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int); | 161 | int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int); |
@@ -158,5 +166,13 @@ void ssh_OpenSSL_add_all_algorithms(void); | |||
158 | # define HMAC_CTX_init(a) | 166 | # define HMAC_CTX_init(a) |
159 | # endif | 167 | # endif |
160 | 168 | ||
169 | # ifndef HAVE_EVP_MD_CTX_INIT | ||
170 | # define EVP_MD_CTX_init(a) | ||
171 | # endif | ||
172 | |||
173 | # ifndef HAVE_EVP_MD_CTX_CLEANUP | ||
174 | # define EVP_MD_CTX_cleanup(a) | ||
175 | # endif | ||
176 | |||
161 | #endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ | 177 | #endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ |
162 | 178 | ||