diff options
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/openssl-compat.c | 4 | ||||
-rw-r--r-- | openbsd-compat/openssl-compat.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c index f5435784b..dd326c00f 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.c,v 1.7 2009/03/07 01:01:47 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.c,v 1.8 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> |
@@ -47,7 +47,9 @@ ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *evp) | |||
47 | EVP_CIPHER_CTX_cleanup(evp); | 47 | EVP_CIPHER_CTX_cleanup(evp); |
48 | return 1; | 48 | return 1; |
49 | } | 49 | } |
50 | #endif | ||
50 | 51 | ||
52 | #ifdef OPENSSL_EVP_DIGESTUPDATE_VOID | ||
51 | int | 53 | int |
52 | ssh_EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d, unsigned int cnt) | 54 | ssh_EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d, unsigned int cnt) |
53 | { | 55 | { |
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 |