summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--openbsd-compat/openssl-compat.c6
-rw-r--r--openbsd-compat/openssl-compat.h4
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 43d09104f..f942c2453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12006022
2 - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Minor tidy up: only
3 compile in compat code if required.
4
120060221 520060221
2 - (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about 6 - (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about
3 redefinition of SSLeay_add_all_algorithms. 7 redefinition of SSLeay_add_all_algorithms.
@@ -3873,4 +3877,4 @@
3873 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3877 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3874 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3878 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3875 3879
3876$Id: ChangeLog,v 1.4132 2006/02/21 13:00:27 dtucker Exp $ 3880$Id: ChangeLog,v 1.4133 2006/02/22 11:24:47 dtucker Exp $
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index 763f84734..45ebd3f66 100644
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -1,4 +1,4 @@
1/* $Id: openssl-compat.c,v 1.3 2006/02/20 09:17:36 dtucker Exp $ */ 1/* $Id: openssl-compat.c,v 1.4 2006/02/22 11:24:47 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>
@@ -49,14 +49,14 @@ ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *evp)
49} 49}
50#endif 50#endif
51 51
52#ifdef USE_OPENSSL_ENGINE
52void 53void
53ssh_SSLeay_add_all_algorithms(void) 54ssh_SSLeay_add_all_algorithms(void)
54{ 55{
55 SSLeay_add_all_algorithms(); 56 SSLeay_add_all_algorithms();
56 57
57#ifdef USE_OPENSSL_ENGINE
58 /* Enable use of crypto hardware */ 58 /* Enable use of crypto hardware */
59 ENGINE_load_builtin_engines(); 59 ENGINE_load_builtin_engines();
60 ENGINE_register_all_complete(); 60 ENGINE_register_all_complete();
61#endif
62} 61}
62#endif
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 01fc41e3a..c582cd269 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openssl-compat.h,v 1.5 2006/02/21 13:00:28 dtucker Exp $ */ 1/* $Id: openssl-compat.h,v 1.6 2006/02/22 11:24:47 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>
@@ -70,11 +70,11 @@ extern const EVP_CIPHER *evp_acss(void);
70# undef SSLeay_add_all_algorithms 70# undef SSLeay_add_all_algorithms
71# endif 71# endif
72# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms() 72# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms()
73void ssh_SSLeay_add_all_algorithms(void);
74#endif 73#endif
75 74
76int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, 75int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *,
77 unsigned char *, int); 76 unsigned char *, int);
78int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int); 77int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int);
79int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); 78int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *);
79void ssh_SSLeay_add_all_algorithms(void);
80#endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ 80#endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */