diff options
author | Darren Tucker <dtucker@zip.com.au> | 2006-02-20 20:17:35 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2006-02-20 20:17:35 +1100 |
commit | fabdb6c29022846ed10fde235db0a7c53f21a6b1 (patch) | |
tree | f73d0bfe7c01f7071b89103c80981090ae77c2cd /openbsd-compat/openssl-compat.h | |
parent | 4881c371cef5e3c1065d7dfa314fffc3a5ab0256 (diff) |
- (dtucker) [INSTALL configure.ac openbsd-compat/openssl-compat.{c,h}]
Add optional enabling of OpenSSL's (hardware) Engine support, via
configure --with-ssl-engine. Based in part on a diff by michal at
logix.cz.
Diffstat (limited to 'openbsd-compat/openssl-compat.h')
-rw-r--r-- | openbsd-compat/openssl-compat.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 8a015ec43..1196d71ea 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.h,v 1.3 2005/12/19 06:40:40 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.h,v 1.4 2006/02/20 09:17:36 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> |
@@ -54,21 +54,22 @@ extern const EVP_CIPHER *evp_acss(void); | |||
54 | * define SSH_DONT_OVERLOAD_OPENSSL_FUNCS before including this file and | 54 | * define SSH_DONT_OVERLOAD_OPENSSL_FUNCS before including this file and |
55 | * implement the ssh_* equivalents. | 55 | * implement the ssh_* equivalents. |
56 | */ | 56 | */ |
57 | #ifdef SSH_OLD_EVP | 57 | #ifndef SSH_DONT_OVERLOAD_OPENSSL_FUNCS |
58 | |||
59 | # ifndef SSH_DONT_REDEF_EVP | ||
60 | 58 | ||
59 | # ifdef SSH_OLD_EVP | ||
61 | # ifdef EVP_Cipher | 60 | # ifdef EVP_Cipher |
62 | # undef EVP_Cipher | 61 | # undef EVP_Cipher |
63 | # endif | 62 | # endif |
64 | |||
65 | # define EVP_CipherInit(a,b,c,d,e) ssh_EVP_CipherInit((a),(b),(c),(d),(e)) | 63 | # define EVP_CipherInit(a,b,c,d,e) ssh_EVP_CipherInit((a),(b),(c),(d),(e)) |
66 | # define EVP_Cipher(a,b,c,d) ssh_EVP_Cipher((a),(b),(c),(d)) | 64 | # define EVP_Cipher(a,b,c,d) ssh_EVP_Cipher((a),(b),(c),(d)) |
67 | # define EVP_CIPHER_CTX_cleanup(a) ssh_EVP_CIPHER_CTX_cleanup((a)) | 65 | # define EVP_CIPHER_CTX_cleanup(a) ssh_EVP_CIPHER_CTX_cleanup((a)) |
68 | # endif | 66 | # endif /* SSH_OLD_EVP */ |
67 | |||
68 | # define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms() | ||
69 | void ssh_SSLeay_add_all_algorithms(void); | ||
69 | 70 | ||
70 | int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, | 71 | int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, |
71 | unsigned char *, int); | 72 | unsigned char *, int); |
72 | int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int); | 73 | int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int); |
73 | int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); | 74 | int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); |
74 | #endif | 75 | #endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ |