summaryrefslogtreecommitdiff
path: root/openbsd-compat/openssl-compat.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-03-07 22:22:35 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-03-07 22:22:35 +1100
commit3e7e15f1bdc2ddd8fe4a389212c6b8db58e2b511 (patch)
treef8ad1aaf09d130d416d8b345f9e2ddc4d8f28c58 /openbsd-compat/openssl-compat.h
parent30ed668de0f7755934971f2e7e80b62073091624 (diff)
- (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}]
EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg in openssl 0.9.6) so add an explicit test for it.
Diffstat (limited to 'openbsd-compat/openssl-compat.h')
-rw-r--r--openbsd-compat/openssl-compat.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 945a7a300..fcc762867 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openssl-compat.h,v 1.13 2009/03/07 01:01:47 dtucker Exp $ */ 1/* $Id: openssl-compat.h,v 1.14 2009/03/07 11:22:35 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>
@@ -78,9 +78,12 @@ extern const EVP_CIPHER *evp_acss(void);
78# define EVP_CipherInit(a,b,c,d,e) ssh_EVP_CipherInit((a),(b),(c),(d),(e)) 78# define EVP_CipherInit(a,b,c,d,e) ssh_EVP_CipherInit((a),(b),(c),(d),(e))
79# define EVP_Cipher(a,b,c,d) ssh_EVP_Cipher((a),(b),(c),(d)) 79# define EVP_Cipher(a,b,c,d) ssh_EVP_Cipher((a),(b),(c),(d))
80# define EVP_CIPHER_CTX_cleanup(a) ssh_EVP_CIPHER_CTX_cleanup((a)) 80# define EVP_CIPHER_CTX_cleanup(a) ssh_EVP_CIPHER_CTX_cleanup((a))
81# define EVP_DigestUpdate(a,b,c) ssh_EVP_DigestUpdate((a),(b),(c))
82# endif /* SSH_OLD_EVP */ 81# endif /* SSH_OLD_EVP */
83 82
83# ifdef OPENSSL_EVP_DIGESTUPDATE_VOID
84# define EVP_DigestUpdate(a,b,c) ssh_EVP_DigestUpdate((a),(b),(c))
85# endif
86
84# ifdef USE_OPENSSL_ENGINE 87# ifdef USE_OPENSSL_ENGINE
85# ifdef SSLeay_add_all_algorithms 88# ifdef SSLeay_add_all_algorithms
86# undef SSLeay_add_all_algorithms 89# undef SSLeay_add_all_algorithms