Attachment 1327 Details for Bug 1340 – A patch for supporting Camellia to OpenSSH-portable.

[patch] A patch for supporting Camellia to OpenSSH-portable.

openssh.diff (text/plain), 4.01 KB, created by Yoshisato YANAGISAWA on 2007-07-14 21:24:49 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Yoshisato YANAGISAWA

Created: 2007-07-14 21:24:49 AEST

Size: 4.01 KB

patch

obsolete

>diff -ruN openssh.bak/cipher.c openssh/cipher.c
>--- openssh.bak/cipher.c	Sat Aug  5 11:39:39 2006
>+++ openssh/cipher.c	Sat Jul 14 16:03:01 2007
>@@ -87,6 +87,9 @@
> #ifdef USE_CIPHER_ACSS
> 	{ "acss@openssh.org",	SSH_CIPHER_SSH2, 16, 5, 0, EVP_acss },
> #endif
>+	{ "camellia128-cbc",	SSH_CIPHER_SSH2, 16, 16, 0, EVP_camellia_128_cbc },
>+	{ "camellia192-cbc",	SSH_CIPHER_SSH2, 16, 24, 0, EVP_camellia_192_cbc },
>+	{ "camellia256-cbc",	SSH_CIPHER_SSH2, 16, 32, 0, EVP_camellia_256_cbc },
> 	{ NULL,			SSH_CIPHER_INVALID, 0, 0, 0, NULL }
> };
> 
>diff -ruN openssh.bak/configure.ac openssh/configure.ac
>--- openssh.bak/configure.ac	Mon Jun 25 21:15:12 2007
>+++ openssh/configure.ac	Sat Jul 14 16:03:10 2007
>@@ -1981,6 +1981,23 @@
> 	]
> )
> 
>+# 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_MSG_ERROR(libcrypto is missing Camellia functions)
>+	]
>+)
>+
> # Some systems want crypt() from libcrypt, *not* the version in OpenSSL,
> # because the system crypt() is more featureful.
> if test "x$check_for_libcrypt_before" = "x1"; then
>diff -ruN openssh.bak/myproposal.h openssh/myproposal.h
>--- openssh.bak/myproposal.h	Mon Jun 11 13:01:42 2007
>+++ openssh/myproposal.h	Sat Jul 14 16:05:59 2007
>@@ -42,8 +42,10 @@
> 
> #define	KEX_DEFAULT_PK_ALG	"ssh-rsa,ssh-dss"
> #define	KEX_DEFAULT_ENCRYPT \
>+	"camellia128-cbc," \
> 	"aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \
> 	"arcfour128,arcfour256,arcfour," \
>+	"camellia192-cbc,camellia256-cbc," \
> 	"aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \
> 	"aes128-ctr,aes192-ctr,aes256-ctr"
> #define	KEX_DEFAULT_MAC \
>diff -ruN openssh.bak/ssh.1 openssh/ssh.1
>--- openssh.bak/ssh.1	Tue Jun 12 23:00:59 2007
>+++ openssh/ssh.1	Sat Jul 14 16:09:00 2007
>@@ -203,13 +203,16 @@
> arcfour256,
> arcfour,
> blowfish-cbc,
>+camellia128-cbc,
>+camellia192-cbc,
>+camellia256-cbc,
> and
> cast128-cbc.
> The default is:
> .Bd -literal -offset indent
>-aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,
>-arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,
>-aes192-ctr,aes256-ctr
>+camellia128-cbc,aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,
>+arcfour128,arcfour256,arcfour,camellia192-cbc,camellia256-cbc,
>+aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr
> .Ed
> .It Fl D Xo
> .Sm off
>diff -ruN openssh.bak/ssh_config.5 openssh/ssh_config.5
>--- openssh.bak/ssh_config.5	Mon Jun 11 13:06:32 2007
>+++ openssh/ssh_config.5	Sat Jul 14 16:07:04 2007
>@@ -199,13 +199,16 @@
> .Dq arcfour256 ,
> .Dq arcfour ,
> .Dq blowfish-cbc ,
>+.Dq camellia128-cbc ,
>+.Dq camellia192-cbc ,
>+.Dq camellia256-cbc ,
> and
> .Dq cast128-cbc .
> The default is:
> .Bd -literal -offset 3n
>-aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,
>-arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,
>-aes192-ctr,aes256-ctr
>+camellia128-cbc,aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,
>+arcfour128,arcfour256,arcfour,camellia192-cbc,camellia256-cbc,
>+aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr
> .Ed
> .It Cm ClearAllForwardings
> Specifies that all local, remote, and dynamic port forwardings
>diff -ruN openssh.bak/sshd_config.5 openssh/sshd_config.5
>--- openssh.bak/sshd_config.5	Mon Jun 11 13:07:13 2007
>+++ openssh/sshd_config.5	Sat Jul 14 16:09:48 2007
>@@ -187,13 +187,16 @@
> .Dq arcfour256 ,
> .Dq arcfour ,
> .Dq blowfish-cbc ,
>+.Dq camellia128-cbc ,
>+.Dq camellia192-cbc ,
>+.Dq camellia256-cbc ,
> and
> .Dq cast128-cbc .
> The default is:
> .Bd -literal -offset 3n
>-aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,
>-arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,
>-aes192-ctr,aes256-ctr
>+camellia128-cbc,aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,
>+arcfour128,arcfour256,arcfour,camellia192-cbc,camellia256-cbc,
>+aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr
> .Ed
> .It Cm ClientAliveCountMax
> Sets the number of client alive messages (see below) which may be

Actions: View | Diff

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