Attachment 451 Details for Bug 675 – Try to fix old OpenSSL problems

[patch] Try to fix old OpenSSL problems

cipher.diff (text/plain), 2.25 KB, created by Damien Miller on 2003-09-23 12:54:57 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2003-09-23 12:54:57 AEST

Size: 2.25 KB

patch

obsolete

>Index: cipher-3des1.c
>===================================================================
>RCS file: /var/cvs/openssh/cipher-3des1.c,v
>retrieving revision 1.1
>diff -u -r1.1 cipher-3des1.c
>--- cipher-3des1.c	15 May 2003 03:37:20 -0000	1.1
>+++ cipher-3des1.c	23 Sep 2003 02:39:32 -0000
>@@ -29,6 +29,10 @@
> #include "xmalloc.h"
> #include "log.h"
> 
>+#if OPENSSL_VERSION_NUMBER < 0x00906000L
>+#define SSH_OLD_EVP
>+#endif
>+
> /*
>  * This is used by SSH1:
>  *
>Index: cipher-aes.c
>===================================================================
>RCS file: /var/cvs/openssh/cipher-aes.c,v
>retrieving revision 1.2
>diff -u -r1.2 cipher-aes.c
>--- cipher-aes.c	2 Jun 2003 08:57:59 -0000	1.2
>+++ cipher-aes.c	23 Sep 2003 02:39:16 -0000
>@@ -31,6 +31,10 @@
> #include "xmalloc.h"
> #include "log.h"
> 
>+#if OPENSSL_VERSION_NUMBER < 0x00906000L
>+#define SSH_OLD_EVP
>+#endif
>+
> #define RIJNDAEL_BLOCKSIZE 16
> struct ssh_rijndael_ctx
> {
>Index: cipher-bf1.c
>===================================================================
>RCS file: /var/cvs/openssh/cipher-bf1.c,v
>retrieving revision 1.1
>diff -u -r1.1 cipher-bf1.c
>--- cipher-bf1.c	15 May 2003 03:37:20 -0000	1.1
>+++ cipher-bf1.c	23 Sep 2003 02:39:54 -0000
>@@ -28,6 +28,11 @@
> #include <openssl/evp.h>
> #include "xmalloc.h"
> #include "log.h"
>+
>+#if OPENSSL_VERSION_NUMBER < 0x00906000L
>+#define SSH_OLD_EVP
>+#endif
>+
> /*
>  * SSH1 uses a variation on Blowfish, all bytes must be swapped before
>  * and after encryption/decryption. Thus the swap_bytes stuff (yuk).
>Index: cipher-ctr.c
>===================================================================
>RCS file: /var/cvs/openssh/cipher-ctr.c,v
>retrieving revision 1.2
>diff -u -r1.2 cipher-ctr.c
>--- cipher-ctr.c	18 Jun 2003 10:29:35 -0000	1.2
>+++ cipher-ctr.c	23 Sep 2003 02:51:19 -0000
>@@ -21,6 +21,10 @@
> #include "log.h"
> #include "xmalloc.h"
> 
>+#if OPENSSL_VERSION_NUMBER < 0x00906000L
>+#define SSH_OLD_EVP
>+#endif
>+
> #if OPENSSL_VERSION_NUMBER < 0x00907000L
> #include "rijndael.h"
> #define AES_KEY rijndael_ctx
>@@ -135,7 +139,9 @@
> 	aes_ctr.init = ssh_aes_ctr_init;
> 	aes_ctr.cleanup = ssh_aes_ctr_cleanup;
> 	aes_ctr.do_cipher = ssh_aes_ctr;
>+#ifndef SSH_OLD_EVP
> 	aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH |
> 	    EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
>+#endif
> 	return (&aes_ctr);
> }

Actions: View | Diff

Attachments on bug 675: 451 | 452 | 453