Attachment 1640 Details for Bug 1340 – Update of past patches to follow current CVS tree.

[patch] Update of past patches to follow current CVS tree.

openssh.patch (text/plain), 5.55 KB, created by Yoshisato YANAGISAWA on 2009-05-23 13:59:48 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Yoshisato YANAGISAWA

Created: 2009-05-23 13:59:48 AEST

Size: 5.55 KB

patch

obsolete

>diff -ruN openssh.orig/cipher-ctr.c openssh/cipher-ctr.c
>--- openssh.orig/cipher-ctr.c	2007-06-14 22:21:33.000000000 +0900
>+++ openssh/cipher-ctr.c	2009-05-23 12:45:24.000000000 +0900
>@@ -42,6 +42,18 @@
> 	u_char		aes_counter[AES_BLOCK_SIZE];
> };
> 
>+#ifdef	USE_CIPHER_CAMELLIA
>+#include <openssl/camellia.h>
>+const EVP_CIPHER *evp_camellia_128_ctr(void);
>+void ssh_camellia_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
>+
>+struct ssh_camellia_ctr_ctx
>+{
>+	CAMELLIA_KEY	camellia_ctx;
>+	u_char		camellia_counter[CAMELLIA_BLOCK_SIZE];
>+};
>+#endif
>+
> /*
>  * increment counter 'ctr',
>  * the counter is of size 'len' bytes and stored in network-byte-order.
>@@ -144,3 +156,94 @@
> #endif
> 	return (&aes_ctr);
> }
>+
>+#ifdef	USE_CIPHER_CAMELLIA
>+static int
>+ssh_camellia_ctr(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src,
>+    u_int len)
>+{
>+	struct ssh_camellia_ctr_ctx *c;
>+	u_int n = 0;
>+	u_char buf[CAMELLIA_BLOCK_SIZE];
>+
>+	if (len == 0)
>+		return (1);
>+	if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL)
>+		return (0);
>+
>+	while ((len--) > 0) {
>+		if (n == 0) {
>+			Camellia_encrypt(c->camellia_counter, buf, &c->camellia_ctx);
>+			ssh_ctr_inc(c->camellia_counter, CAMELLIA_BLOCK_SIZE);
>+		}
>+		*(dest++) = *(src++) ^ buf[n];
>+		n = (n + 1) % CAMELLIA_BLOCK_SIZE;
>+	}
>+	return (1);
>+}
>+
>+static int
>+ssh_camellia_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
>+    int enc)
>+{
>+	struct ssh_camellia_ctr_ctx *c;
>+
>+	if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL) {
>+		c = xmalloc(sizeof(*c));
>+		EVP_CIPHER_CTX_set_app_data(ctx, c);
>+	}
>+	if (key != NULL)
>+		Camellia_set_key(key,
>+		    EVP_CIPHER_CTX_key_length(ctx) * 8,
>+		    &c->camellia_ctx);
>+	if (iv != NULL)
>+		memcpy(c->camellia_counter, iv, CAMELLIA_BLOCK_SIZE);
>+	return (1);
>+}
>+
>+static int
>+ssh_camellia_ctr_cleanup(EVP_CIPHER_CTX *ctx)
>+{
>+	struct ssh_camellia_ctr_ctx *c;
>+
>+	if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) {
>+		memset(c, 0, sizeof(*c));
>+		xfree(c);
>+		EVP_CIPHER_CTX_set_app_data(ctx, NULL);
>+	}
>+	return (1);
>+}
>+
>+void
>+ssh_camellia_ctr_iv(EVP_CIPHER_CTX *evp, int doset, u_char * iv, u_int len)
>+{
>+	struct ssh_camellia_ctr_ctx *c;
>+
>+	if ((c = EVP_CIPHER_CTX_get_app_data(evp)) == NULL)
>+		fatal("ssh_camellia_ctr_iv: no context");
>+	if (doset)
>+		memcpy(c->camellia_counter, iv, len);
>+	else
>+		memcpy(iv, c->camellia_counter, len);
>+}
>+
>+const EVP_CIPHER *
>+evp_camellia_128_ctr(void)
>+{
>+	static EVP_CIPHER camellia_ctr;
>+
>+	memset(&camellia_ctr, 0, sizeof(EVP_CIPHER));
>+	camellia_ctr.nid = NID_undef;
>+	camellia_ctr.block_size = CAMELLIA_BLOCK_SIZE;
>+	camellia_ctr.iv_len = CAMELLIA_BLOCK_SIZE;
>+	camellia_ctr.key_len = 16;
>+	camellia_ctr.init = ssh_camellia_ctr_init;
>+	camellia_ctr.cleanup = ssh_camellia_ctr_cleanup;
>+	camellia_ctr.do_cipher = ssh_camellia_ctr;
>+#ifndef SSH_OLD_EVP
>+	camellia_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH |
>+	    EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
>+#endif
>+	return (&camellia_ctr);
>+}
>+#endif
>diff -ruN openssh.orig/cipher.c openssh/cipher.c
>--- openssh.orig/cipher.c	2009-01-28 14:38:41.000000000 +0900
>+++ openssh/cipher.c	2009-05-23 12:46:49.000000000 +0900
>@@ -55,6 +55,9 @@
> extern const EVP_CIPHER *evp_ssh1_3des(void);
> extern void ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int);
> extern const EVP_CIPHER *evp_aes_128_ctr(void);
>+#ifdef	USE_CIPHER_CAMELLIA
>+extern const EVP_CIPHER *evp_camellia_128_ctr(void);
>+#endif
> extern void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
> 
> struct Cipher {
>@@ -88,6 +91,14 @@
> #ifdef USE_CIPHER_ACSS
> 	{ "acss@openssh.org",	SSH_CIPHER_SSH2, 16, 5, 0, 0, EVP_acss },
> #endif
>+#ifdef USE_CIPHER_CAMELLIA
>+	{ "camellia128-cbc@openssh.org", SSH_CIPHER_SSH2, 16, 16, 0, 1, EVP_camellia_128_cbc },
>+	{ "camellia192-cbc@openssh.org", SSH_CIPHER_SSH2, 16, 24, 0, 1, EVP_camellia_192_cbc },
>+	{ "camellia256-cbc@openssh.org", SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_camellia_256_cbc },
>+	{ "camellia128-ctr@openssh.org", SSH_CIPHER_SSH2, 16, 16, 0, 0, evp_camellia_128_ctr },
>+	{ "camellia192-ctr@openssh.org", SSH_CIPHER_SSH2, 16, 24, 0, 0, evp_camellia_128_ctr },
>+	{ "camellia256-ctr@openssh.org", SSH_CIPHER_SSH2, 16, 32, 0, 0, evp_camellia_128_ctr },
>+#endif
> 	{ NULL,			SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL }
> };
> 
>@@ -353,6 +364,10 @@
> #endif
> 		if (c->evptype == evp_aes_128_ctr)
> 			ssh_aes_ctr_iv(&cc->evp, 0, iv, len);
>+#ifdef	USE_CIPHER_CAMELLIA
>+		else if (c->evptype == evp_camellia_128_ctr)
>+			ssh_camellia_ctr_iv(&cc->evp, 0, iv, len);
>+#endif
> 		else
> 			memcpy(iv, cc->evp.iv, len);
> 		break;
>@@ -384,6 +399,10 @@
> #endif
> 		if (c->evptype == evp_aes_128_ctr)
> 			ssh_aes_ctr_iv(&cc->evp, 1, iv, evplen);
>+#ifdef	USE_CIPHER_CAMELLIA
>+		else if (c->evptype == evp_camellia_128_ctr)
>+			ssh_camellia_ctr_iv(&cc->evp, 1, iv, evplen);
>+#endif
> 		else
> 			memcpy(cc->evp.iv, iv, evplen);
> 		break;
>diff -ruN openssh.orig/configure.ac openssh/configure.ac
>--- openssh.orig/configure.ac	2009-03-19 03:25:02.000000000 +0900
>+++ openssh/configure.ac	2009-05-23 12:45:24.000000000 +0900
>@@ -2057,6 +2057,26 @@
> 	  fi ]
> )
> 
>+# Check for OpenSSL without EVP_camellia_{128,192,256}_cbc
>+AC_MSG_CHECKING([whether OpenSSL has Camellia support])
>+AC_LINK_IFELSE(
>+	[AC_LANG_SOURCE([[
>+#include <string.h>
>+#include <openssl/evp.h>
>+int main(void) { exit(EVP_camellia_128_cbc() == NULL
>+	|| EVP_camellia_192_cbc() == NULL
>+	|| EVP_camellia_256_cbc() == NULL);}
>+	]])],
>+	[
>+		AC_MSG_RESULT(yes)
>+		AC_DEFINE(USE_CIPHER_CAMELLIA, 1,
>+		    [libcrypto has Camellia functions])
>+	],
>+	[
>+		AC_MSG_RESULT(no)
>+	]
>+)
>+
> # Check for OpenSSL without EVP_aes_{192,256}_cbc
> AC_MSG_CHECKING([whether OpenSSL has crippled AES support])
> AC_LINK_IFELSE(

Actions: View | Diff

Attachments on bug 1340: 1327 | 1392 | 1397 | 1640 | 1878 | 1879 | 1902