Attachment 1392 Details for Bug 1340 – Update of the previeous patch.

[patch] Update of the previeous patch.

openssh.diff (text/plain), 1.39 KB, created by Yoshisato YANAGISAWA on 2007-12-10 20:41:46 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yoshisato YANAGISAWA

Created: 2007-12-10 20:41:46 AEDT

Size: 1.39 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	Mon Dec 10 17:31:56 2007
>@@ -87,6 +87,11 @@
> #ifdef USE_CIPHER_ACSS
> 	{ "acss@openssh.org",	SSH_CIPHER_SSH2, 16, 5, 0, EVP_acss },
> #endif
>+#ifdef USE_CIPHER_CAMELLIA
>+	{ "camellia128-cbc@openssh.org", SSH_CIPHER_SSH2, 16, 16, 0, EVP_camellia_128_cbc },
>+	{ "camellia192-cbc@openssh.org", SSH_CIPHER_SSH2, 16, 24, 0, EVP_camellia_192_cbc },
>+	{ "camellia256-cbc@openssh.org", SSH_CIPHER_SSH2, 16, 32, 0, EVP_camellia_256_cbc },
>+#endif
> 	{ NULL,			SSH_CIPHER_INVALID, 0, 0, 0, NULL }
> };
> 
>diff -ruN openssh.bak/configure.ac openssh/configure.ac
>--- openssh.bak/configure.ac	Mon Dec 10 17:12:07 2007
>+++ openssh/configure.ac	Mon Dec 10 17:39:19 2007
>@@ -1979,6 +1979,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