diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
commit | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (patch) | |
tree | d12ff16d94cffc5d84dba0193eaaa616967c9c2c /openbsd-compat/openssl-compat.h | |
parent | cadac134eda6ed97478afdc528a68dd33f31dbc5 (diff) | |
parent | 1e4cfeee6c17b02af09418c5afe4a4d71aaaf0c8 (diff) |
import openssh-5.3p1-gsskex-all-20100124.patch
Diffstat (limited to 'openbsd-compat/openssl-compat.h')
-rw-r--r-- | openbsd-compat/openssl-compat.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 6a1bed5b2..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.12 2008/02/28 08:22:04 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> |
@@ -80,6 +80,10 @@ extern const EVP_CIPHER *evp_acss(void); | |||
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 | # endif /* SSH_OLD_EVP */ | 81 | # endif /* SSH_OLD_EVP */ |
82 | 82 | ||
83 | # ifdef OPENSSL_EVP_DIGESTUPDATE_VOID | ||
84 | # define EVP_DigestUpdate(a,b,c) ssh_EVP_DigestUpdate((a),(b),(c)) | ||
85 | # endif | ||
86 | |||
83 | # ifdef USE_OPENSSL_ENGINE | 87 | # ifdef USE_OPENSSL_ENGINE |
84 | # ifdef SSLeay_add_all_algorithms | 88 | # ifdef SSLeay_add_all_algorithms |
85 | # undef SSLeay_add_all_algorithms | 89 | # undef SSLeay_add_all_algorithms |