[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/11] kex: disable blowfish, DES ciphers for BoringSSL
[Thread Prev] | [Thread Next]
- Subject: [PATCH 10/11] kex: disable blowfish, DES ciphers for BoringSSL
- From: Jon Simons <jon@xxxxxxxxxxxxx>
- Reply-to: libssh@xxxxxxxxxx
- Date: Sat, 9 Sep 2017 20:12:53 -0700
- To: libssh@xxxxxxxxxx
- Cc: Jon Simons <jon@xxxxxxxxxxxxx>
Signed-off-by: Jon Simons <jon@xxxxxxxxxxxxx> --- src/kex.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/kex.c b/src/kex.c index 21523fa9..40159d85 100644 --- a/src/kex.c +++ b/src/kex.c @@ -45,11 +45,11 @@ #elif defined(HAVE_LIBCRYPTO) -# ifdef HAVE_OPENSSL_BLOWFISH_H +# if defined(HAVE_OPENSSL_BLOWFISH_H) && !defined(OPENSSL_IS_BORINGSSL) # define BLOWFISH "blowfish-cbc," -# else /* HAVE_OPENSSL_BLOWFISH_H */ +# else /* HAVE_OPENSSL_BLOWFISH_H && !defined(OPENSSL_IS_BORINGSSL) */ # define BLOWFISH "" -# endif /* HAVE_OPENSSL_BLOWFISH_H */ +# endif /* HAVE_OPENSSL_BLOWFISH_H && !defined(OPENSSL_IS_BORINGSSL) */ # ifdef HAVE_OPENSSL_AES_H # ifdef BROKEN_AES_CTR @@ -61,8 +61,14 @@ # define AES "" # endif /* HAVE_OPENSSL_AES_H */ +# if !defined(OPENSSL_IS_BORINGSSL) # define DES "3des-cbc" # define DES_SUPPORTED "3des-cbc,des-cbc-ssh1" +# else /* !defined(OPENSSL_IS_BORINGSSL) */ +# define DES "" +# define DES_SUPPORTED "" +# endif /* !defined(OPENSSL_IS_BORINGSSL) */ + #endif /* HAVE_LIBCRYPTO */ #ifdef WITH_ZLIB -- 2.14.1
[PATCH 00/11] libssh: enable building with BoringSSL | Jon Simons <jon@xxxxxxxxxxxxx> |