Attachment 1451 Details for Bug 1437 – Patch to include the compatibility definition in all files

[patch] Patch to include the compatibility definition in all files

openssh-engine.patch (text/plain), 1.06 KB, created by Ian Lister on 2008-02-04 22:51:25 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Lister

Created: 2008-02-04 22:51:25 AEDT

Size: 1.06 KB

patch

obsolete

>diff -ur openssh-4.7p1/includes.h openssh-4.7p1-patched/includes.h
>--- openssh-4.7p1/includes.h	2007-06-11 14:44:03.000000000 +1000
>+++ openssh-4.7p1-patched/includes.h	2008-02-03 14:34:01.000000000 +1000
>@@ -166,6 +166,7 @@
> #include "platform.h"
> #include "openbsd-compat/openbsd-compat.h"
> #include "openbsd-compat/bsd-nextstep.h"
>+#include "openbsd-compat/openssl-compat.h"
> 
> #include "entropy.h"
> 
>diff -ur openssh-4.7p1/openbsd-compat/openssl-compat.c openssh-4.7p1-patched/openbsd-compat/openssl-compat.c
>--- openssh-4.7p1/openbsd-compat/openssl-compat.c	2006-02-22 21:24:47.000000000 +1000
>+++ openssh-4.7p1-patched/openbsd-compat/openssl-compat.c	2008-02-03 15:03:35.000000000 +1000
>@@ -16,15 +16,13 @@
>  * 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,

Actions: View | Diff

Attachments on bug 1437: 1451 | 1458