Attachment 2041 Details for Bug 1882 – switch from SSLeay_add_all_algorithms to OpenSSL_add_all_algoritms for compat hook

[patch] switch from SSLeay_add_all_algorithms to OpenSSL_add_all_algoritms for compat hook

openssh-ssl-engine-fix.patch (text/plain), 1.81 KB, created by Darren Tucker on 2011-05-06 12:12:49 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2011-05-06 12:12:49 AEST

Size: 1.81 KB

patch

obsolete

>Index: openbsd-compat/openssl-compat.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/openbsd-compat/openssl-compat.c,v
>retrieving revision 1.13
>diff -u -p -r1.13 openssl-compat.c
>--- openbsd-compat/openssl-compat.c	21 Jan 2011 22:37:06 -0000	1.13
>+++ openbsd-compat/openssl-compat.c	6 May 2011 02:04:48 -0000
>@@ -134,9 +134,9 @@ RSA_get_default_method(void)
> 
> #ifdef	USE_OPENSSL_ENGINE
> void
>-ssh_SSLeay_add_all_algorithms(void)
>+ssh_OpenSSL_add_all_algorithms(void)
> {
>-	SSLeay_add_all_algorithms();
>+	OpenSSL_add_all_algorithms();
> 
> 	/* Enable use of crypto hardware */
> 	ENGINE_load_builtin_engines();
>Index: openbsd-compat/openssl-compat.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/openbsd-compat/openssl-compat.h,v
>retrieving revision 1.18
>diff -u -p -r1.18 openssl-compat.h
>--- openbsd-compat/openssl-compat.h	21 Jan 2011 22:37:06 -0000	1.18
>+++ openbsd-compat/openssl-compat.h	6 May 2011 02:04:48 -0000
>@@ -106,10 +106,10 @@ RSA_METHOD *RSA_get_default_method(void)
> #  endif
> 
> # ifdef USE_OPENSSL_ENGINE
>-#  ifdef SSLeay_add_all_algorithms
>-#   undef SSLeay_add_all_algorithms
>+#  ifdef OpenSSL_add_all_algorithms
>+#   undef OpenSSL_add_all_algorithms
> #  endif
>-#  define SSLeay_add_all_algorithms()  ssh_SSLeay_add_all_algorithms()
>+#  define OpenSSL_add_all_algorithms()  ssh_OpenSSL_add_all_algorithms()
> # endif
> 
> # ifndef HAVE_BN_IS_PRIME_EX
>@@ -129,6 +129,6 @@ int ssh_EVP_CipherInit(EVP_CIPHER_CTX *,
>     unsigned char *, int);
> int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int);
> int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *);
>-void ssh_SSLeay_add_all_algorithms(void);
>+void ssh_OpenSSL_add_all_algorithms(void);
> #endif	/* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */
>

Flags:

djm: ok+

Actions: View | Diff

Attachments on bug 1882: 2022 | 2023 | 2041