Attachment 838955 Details for Bug 1044586 – backported larger keys patch

[patch] backported larger keys patch

sftp-larger-keys-bug4001.patch (text/plain), 2.23 KB, created by Till Maas on 2013-12-19 12:16:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Till Maas

Created: 2013-12-19 12:16:35 UTC

Size: 2.23 KB

patch

obsolete

>diff -up proftpd-1.3.3g/contrib/mod_sftp/cipher.c.sftp-larger-keys-bug4001 proftpd-1.3.3g/contrib/mod_sftp/cipher.c
>--- proftpd-1.3.3g/contrib/mod_sftp/cipher.c.sftp-larger-keys-bug4001	2009-10-29 16:24:04.000000000 +0100
>+++ proftpd-1.3.3g/contrib/mod_sftp/cipher.c	2013-12-19 12:56:15.402825835 +0100
>@@ -70,6 +70,9 @@ static size_t cipher_blockszs[2] = {
>   SFTP_CIPHER_DEFAULT_BLOCK_SZ,
> };
> 
>+/* Buffer size for reading/writing keys */
>+#define SFTP_CIPHER_BUFSZ			1536
>+
> static unsigned int read_cipher_idx = 0;
> static unsigned int write_cipher_idx = 0;
> 
>@@ -355,7 +358,7 @@ int sftp_cipher_set_read_key(pool *p, co
>    */
>   EVP_CIPHER_CTX_init(cipher_ctx);
> 
>-  bufsz = buflen = 1024;
>+  bufsz = buflen = SFTP_CIPHER_BUFSZ;
>   ptr = buf = sftp_msg_getbuf(p, bufsz);
> 
>   /* Need to use SSH2-style format of K for the IV and key. */
>@@ -517,7 +520,7 @@ int sftp_cipher_set_write_key(pool *p, c
>    */
>   EVP_CIPHER_CTX_init(cipher_ctx);
> 
>-  bufsz = buflen = 1024;
>+  bufsz = buflen = SFTP_CIPHER_BUFSZ;
>   ptr = buf = sftp_msg_getbuf(p, bufsz);
> 
>   /* Need to use SSH2-style format of K for the IV and key. */
>diff -up proftpd-1.3.3g/contrib/mod_sftp/mac.c.sftp-larger-keys-bug4001 proftpd-1.3.3g/contrib/mod_sftp/mac.c
>--- proftpd-1.3.3g/contrib/mod_sftp/mac.c.sftp-larger-keys-bug4001	2010-04-06 01:13:44.000000000 +0200
>+++ proftpd-1.3.3g/contrib/mod_sftp/mac.c	2013-12-19 12:57:25.359951251 +0100
>@@ -69,6 +69,9 @@ static HMAC_CTX write_ctxs[2];
> 
> static size_t mac_blockszs[2] = { 0, 0 };
> 
>+/* Buffer size for reading/writing keys */
>+#define SFTP_MAC_BUFSZ				1536
>+
> static unsigned int read_mac_idx = 0;
> static unsigned int write_mac_idx = 0;
> 
>@@ -367,7 +370,7 @@ int sftp_mac_set_read_key(pool *p, const
>   mac = &(read_macs[read_mac_idx]);
>   mac_ctx = &(read_ctxs[read_mac_idx]);
> 
>-  bufsz = buflen = 1024;
>+  bufsz = buflen = SFTP_MAC_BUFSZ;
>   ptr = buf = sftp_msg_getbuf(p, bufsz);
> 
>   /* Need to use SSH2-style format of K for the key. */
>@@ -527,7 +530,7 @@ int sftp_mac_set_write_key(pool *p, cons
>   mac = &(write_macs[write_mac_idx]);
>   mac_ctx = &(write_ctxs[write_mac_idx]);
> 
>-  bufsz = buflen = 1024;
>+  bufsz = buflen = SFTP_MAC_BUFSZ;
>   ptr = buf = sftp_msg_getbuf(p, bufsz);
> 
>   /* Need to use SSH2-style format of K for the key. */

Actions: View | Diff

Attachments on bug 1044586: 838955 | 838958