Attachment #1392 for bug #1340

Lines 87-92 Link Here

(-)openssh.bak/cipher.c (+5 lines)
87	#ifdef USE_CIPHER_ACSS	87	#ifdef USE_CIPHER_ACSS
88	{ "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, 0, EVP_acss },	88	{ "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, 0, EVP_acss },
89	#endif	89	#endif
		90	#ifdef USE_CIPHER_CAMELLIA
		91	{ "camellia128-cbc@openssh.org", SSH_CIPHER_SSH2, 16, 16, 0, EVP_camellia_128_cbc },
		92	{ "camellia192-cbc@openssh.org", SSH_CIPHER_SSH2, 16, 24, 0, EVP_camellia_192_cbc },
		93	{ "camellia256-cbc@openssh.org", SSH_CIPHER_SSH2, 16, 32, 0, EVP_camellia_256_cbc },
		94	#endif
90	{ NULL, SSH_CIPHER_INVALID, 0, 0, 0, NULL }	95	{ NULL, SSH_CIPHER_INVALID, 0, 0, 0, NULL }
91	};	96	};
92		97




	  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(

Return to bug 1340

Lines 1979-1984 Link Here

(-)openssh.bak/configure.ac (+20 lines)
1979	fi ]	1979	fi ]
1980	)	1980	)
1981		1981
		1982	# Check for OpenSSL without EVP_camellia_{128,192,256}_cbc
		1983	AC_MSG_CHECKING([whether OpenSSL has Camellia support])
		1984	AC_LINK_IFELSE(
		1985	[AC_LANG_SOURCE([[
		1986	#include <string.h>
		1987	#include <openssl/evp.h>
		1988	int main(void) { exit(EVP_camellia_128_cbc() == NULL
		1989	\|\| EVP_camellia_192_cbc() == NULL
		1990	\|\| EVP_camellia_256_cbc() == NULL);}
		1991	]])],
		1992	[
		1993	AC_MSG_RESULT(yes)
		1994	AC_DEFINE(USE_CIPHER_CAMELLIA, 1,
		1995	[libcrypto has Camellia functions])
		1996	],
		1997	[
		1998	AC_MSG_RESULT(no)
		1999	]
		2000	)
		2001
1982	# Check for OpenSSL without EVP_aes_{192,256}_cbc	2002	# Check for OpenSSL without EVP_aes_{192,256}_cbc
1983	AC_MSG_CHECKING([whether OpenSSL has crippled AES support])	2003	AC_MSG_CHECKING([whether OpenSSL has crippled AES support])
1984	AC_LINK_IFELSE(	2004	AC_LINK_IFELSE(