tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix newline escaping for unsupported_algorithms

Browse Source 
The hmac-ripemd160 was incorrect and could lead to broken
Makefiles on systems that lacked support for it, but I made
all the others consistent too.
This commit is contained in:
Damien Miller 2016-07-15 13:44:38 +10:00
parent ed877ef653
commit 679ce88ec2
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configure.ac
View File

@ -2643,7 +2643,8 @@ if test "x$openssl" = "xyes" ; then
[ [
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
unsupported_algorithms="$unsupported_cipers \ unsupported_algorithms="$unsupported_cipers \
aes128-gcm@openssh.com aes256-gcm@openssh.com" aes128-gcm@openssh.com \
aes256-gcm@openssh.com"
] ]
) )
@ -2686,16 +2687,18 @@ if test "x$openssl" = "xyes" ; then
# Search for SHA256 support in libc and/or OpenSSL # Search for SHA256 support in libc and/or OpenSSL
AC_CHECK_FUNCS([SHA256_Update EVP_sha256], , AC_CHECK_FUNCS([SHA256_Update EVP_sha256], ,
[unsupported_algorithms="$unsupported_algorithms \ [unsupported_algorithms="$unsupported_algorithms \
hmac-sha2-256 hmac-sha2-512 \ hmac-sha2-256 \
hmac-sha2-512 \
diffie-hellman-group-exchange-sha256 \ diffie-hellman-group-exchange-sha256 \
hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com" hmac-sha2-256-etm@openssh.com \
hmac-sha2-512-etm@openssh.com"
] ]
) )
# Search for RIPE-MD support in OpenSSL # Search for RIPE-MD support in OpenSSL
AC_CHECK_FUNCS([EVP_ripemd160], , AC_CHECK_FUNCS([EVP_ripemd160], ,
[unsupported_algorithms="$unsupported_algorithms \ [unsupported_algorithms="$unsupported_algorithms \
hmac-ripemd160 hmac-ripemd160 \
hmac-ripemd160@openssh.com hmac-ripemd160@openssh.com \
hmac-ripemd160-etm@openssh.com" hmac-ripemd160-etm@openssh.com"
] ]
) )
@ -2796,24 +2799,30 @@ if test "x$openssl" = "xyes" ; then
TEST_SSH_ECC=yes TEST_SSH_ECC=yes
COMMENT_OUT_ECC="" COMMENT_OUT_ECC=""
else else
unsupported_algorithms="$unsupported_algorithms ecdsa-sha2-nistp256 \ unsupported_algorithms="$unsupported_algorithms \
ecdh-sha2-nistp256 ecdsa-sha2-nistp256-cert-v01@openssh.com" ecdsa-sha2-nistp256 \
ecdh-sha2-nistp256 \
ecdsa-sha2-nistp256-cert-v01@openssh.com"
fi fi
if test x$enable_nistp384 = x1; then if test x$enable_nistp384 = x1; then
AC_DEFINE([OPENSSL_HAS_NISTP384], [1], [libcrypto has NID_secp384r1]) AC_DEFINE([OPENSSL_HAS_NISTP384], [1], [libcrypto has NID_secp384r1])
TEST_SSH_ECC=yes TEST_SSH_ECC=yes
COMMENT_OUT_ECC="" COMMENT_OUT_ECC=""
else else
unsupported_algorithms="$unsupported_algorithms ecdsa-sha2-nistp384 \ unsupported_algorithms="$unsupported_algorithms \
ecdh-sha2-nistp384 ecdsa-sha2-nistp384-cert-v01@openssh.com" ecdsa-sha2-nistp384 \
ecdh-sha2-nistp384 \
ecdsa-sha2-nistp384-cert-v01@openssh.com"
fi fi
if test x$enable_nistp521 = x1; then if test x$enable_nistp521 = x1; then
AC_DEFINE([OPENSSL_HAS_NISTP521], [1], [libcrypto has NID_secp521r1]) AC_DEFINE([OPENSSL_HAS_NISTP521], [1], [libcrypto has NID_secp521r1])
TEST_SSH_ECC=yes TEST_SSH_ECC=yes
COMMENT_OUT_ECC="" COMMENT_OUT_ECC=""
else else
unsupported_algorithms="$unsupported_algorithms ecdh-sha2-nistp521 \ unsupported_algorithms="$unsupported_algorithms \
ecdsa-sha2-nistp521 ecdsa-sha2-nistp521-cert-v01@openssh.com" ecdh-sha2-nistp521 \
ecdsa-sha2-nistp521 \
ecdsa-sha2-nistp521-cert-v01@openssh.com"
fi fi
AC_SUBST([TEST_SSH_ECC]) AC_SUBST([TEST_SSH_ECC])