Attachment 1458 Details for Bug 1437 – refix openssl engine support

[patch] refix openssl engine support

openssh-ssl-engine.patch (text/plain), 4.27 KB, created by Darren Tucker on 2008-02-28 18:20:09 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2008-02-28 18:20:09 AEDT

Size: 4.27 KB

patch

obsolete

>Index: includes.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/includes.h,v
>retrieving revision 1.128
>diff -u -p -r1.128 includes.h
>--- includes.h	25 Feb 2008 10:13:47 -0000	1.128
>+++ includes.h	28 Feb 2008 05:19:43 -0000
>@@ -166,7 +166,6 @@
> #include "platform.h"
> #include "openbsd-compat/openbsd-compat.h"
> #include "openbsd-compat/bsd-nextstep.h"
>-#include "openbsd-compat/openssl-compat.h"
> 
> #include "entropy.h"
> 
>Index: ssh-add.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/ssh-add.c,v
>retrieving revision 1.98
>diff -u -p -r1.98 ssh-add.c
>--- ssh-add.c	17 Sep 2007 06:05:50 -0000	1.98
>+++ ssh-add.c	28 Feb 2008 06:59:38 -0000
>@@ -42,6 +42,7 @@
> #include <sys/param.h>
> 
> #include <openssl/evp.h>
>+#include "openbsd-compat/openssl-compat.h"
> 
> #include <fcntl.h>
> #include <pwd.h>
>Index: ssh-agent.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/ssh-agent.c,v
>retrieving revision 1.173
>diff -u -p -r1.173 ssh-agent.c
>--- ssh-agent.c	26 Oct 2007 04:25:32 -0000	1.173
>+++ ssh-agent.c	28 Feb 2008 07:00:05 -0000
>@@ -51,6 +51,7 @@
> 
> #include <openssl/evp.h>
> #include <openssl/md5.h>
>+#include "openbsd-compat/openssl-compat.h"
> 
> #include <errno.h>
> #include <fcntl.h>
>Index: ssh-keygen.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/ssh-keygen.c,v
>retrieving revision 1.177
>diff -u -p -r1.177 ssh-keygen.c
>--- ssh-keygen.c	10 Feb 2008 11:24:56 -0000	1.177
>+++ ssh-keygen.c	28 Feb 2008 07:00:22 -0000
>@@ -21,6 +21,7 @@
> 
> #include <openssl/evp.h>
> #include <openssl/pem.h>
>+#include "openbsd-compat/openssl-compat.h"
> 
> #include <errno.h>
> #include <fcntl.h>
>Index: ssh.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/ssh.c,v
>retrieving revision 1.300
>diff -u -p -r1.300 ssh.c
>--- ssh.c	10 Feb 2008 11:23:18 -0000	1.300
>+++ ssh.c	28 Feb 2008 06:59:48 -0000
>@@ -72,6 +72,7 @@
> 
> #include <openssl/evp.h>
> #include <openssl/err.h>
>+#include "openbsd-compat/openssl-compat.h"
> 
> #include "xmalloc.h"
> #include "ssh.h"
>Index: sshd.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/sshd.c,v
>retrieving revision 1.367
>diff -u -p -r1.367 sshd.c
>--- sshd.c	19 Jan 2008 21:56:00 -0000	1.367
>+++ sshd.c	28 Feb 2008 07:00:37 -0000
>@@ -75,6 +75,8 @@
> #include <openssl/bn.h>
> #include <openssl/md5.h>
> #include <openssl/rand.h>
>+#include "openbsd-compat/openssl-compat.h"
>+
> #ifdef HAVE_SECUREWARE
> #include <sys/security.h>
> #include <prot.h>
>Index: openbsd-compat/openssl-compat.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/openbsd-compat/openssl-compat.c,v
>retrieving revision 1.5
>diff -u -p -r1.5 openssl-compat.c
>--- openbsd-compat/openssl-compat.c	25 Feb 2008 10:13:47 -0000	1.5
>+++ openbsd-compat/openssl-compat.c	28 Feb 2008 07:10:12 -0000
>@@ -16,13 +16,15 @@
>  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>  */
> 
>-#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
> #include "includes.h"
> 
> #ifdef USE_OPENSSL_ENGINE
> # include <openssl/engine.h>
> #endif
> 
>+#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
>+#include "openssl-compat.h"
>+
> #ifdef SSH_OLD_EVP
> int
> ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type,
>Index: openbsd-compat/openssl-compat.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/openbsd-compat/openssl-compat.h,v
>retrieving revision 1.10
>diff -u -p -r1.10 openssl-compat.h
>--- openbsd-compat/openssl-compat.h	14 Jun 2007 13:47:31 -0000	1.10
>+++ openbsd-compat/openssl-compat.h	28 Feb 2008 07:06:36 -0000
>@@ -79,8 +79,8 @@ extern const EVP_CIPHER *evp_acss(void);
> #  ifdef SSLeay_add_all_algorithms
> #   undef SSLeay_add_all_algorithms
> #  endif
>-#  define SSLeay_add_all_algorithms()	ssh_SSLeay_add_all_algorithms()
>-#endif
>+#  define SSLeay_add_all_algorithms()  ssh_SSLeay_add_all_algorithms()
>+# endif
> 
> int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *,
>     unsigned char *, int);

Actions: View | Diff

Attachments on bug 1437: 1451 | 1458