Hello community, here is the log from the commit of package libssh.11821 for openSUSE:Leap:15.1:Update checked in at 2020-01-25 14:13:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.1:Update/libssh.11821 (Old) and /work/SRC/openSUSE:Leap:15.1:Update/.libssh.11821.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libssh.11821" Sat Jan 25 14:13:42 2020 rev:1 rq:765761 version:0.8.7 Changes: -------- New Changes file: --- /dev/null 2019-12-19 10:12:34.003146842 +0100 +++ /work/SRC/openSUSE:Leap:15.1:Update/.libssh.11821.new.26092/libssh.changes 2020-01-25 14:13:43.497106441 +0100 @@ -0,0 +1,764 @@ +------------------------------------------------------------------- +Mon Jan 13 15:37:28 UTC 2020 - James McDonough <jmcdono...@suse.com> + +- Update to latest version of patch for CVE-2019-14889; (bsc#1158095) + * Update CVE-2019-14889.patch + +------------------------------------------------------------------- +Tue Dec 03 14:03:12 UTC 2019 - James McDonough <jmcdono...@suse.com> + +- Fix CVE-2019-14889: arbitrary command execution; (bsc#1158095) + * Add CVE-2019-14889.patch + +------------------------------------------------------------------- +Wed May 29 12:56:05 UTC 2019 - Ismail Dönmez <idon...@suse.com> + +- Fix the typo in Obsoletes for -devel-doc subpackage +- Actually remove the description for -devel-doc subpackage + +------------------------------------------------------------------- +Thu May 23 15:32:07 UTC 2019 - James McDonough <jmcdono...@suse.com> + +- Add support for new AES-GCM encryption types; (bsc#1134193) + * Add 0001-libcrypto-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch + * Add 0001-libgcrypt-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch + * Add 0001-tests-Add-aes-gcm-ciphers-tests.patch + +------------------------------------------------------------------- +Thu Feb 28 07:17:52 UTC 2019 - Stephan Kulow <co...@suse.com> + +- Avoid build cycle between curl and libssh by using obs hint to + prefer curl-mini + +------------------------------------------------------------------- +Mon Feb 25 09:28:34 UTC 2019 - Andreas Schneider <a...@cryptomilk.org> + +- Update to version 0.8.7 + * Fixed handling extension flags in the server implementation + * Fixed exporting ed25519 private keys + * Fixed corner cases for rsa-sha2 signatures + * Fixed some issues with connector + +------------------------------------------------------------------- +Mon Feb 11 12:24:43 UTC 2019 - Tomáš Chvátal <tchva...@suse.com> + +- Drop doxygen from dependencies to avoid buildcycle + * the documentation is available online anyway for anyone to + consume and consult http://api.libssh.org + +------------------------------------------------------------------- +Tue Jan 8 13:14:24 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonza...@suse.com> + +- Added the tests in a multiple build description file *test* to + break the cycle for cmocka, curl, doxygen and libssh. + +------------------------------------------------------------------- +Sun Dec 30 16:15:23 UTC 2018 - Andreas Schneider <a...@cryptomilk.org> + +- Update to version 0.8.6 + * Fixed compilation issues with different OpenSSL versions + * Fixed StrictHostKeyChecking in new knownhosts API + * Fixed ssh_send_keepalive() with packet filter + * Fixed possible crash with knownhosts options + * Fixed issus with rekeying + * Fixed strong ECDSA keys + * Fixed some issues with rsa-sha2 extentions + * Fixed access violation in ssh_init() (static linking) + * Fixed ssh_channel_close() handling + +------------------------------------------------------------------- +Mon Oct 29 10:36:40 UTC 2018 - Andreas Schneider <a...@cryptomilk.org> + +- Update to version 0.8.5 + * Added support to get known_hosts locations with ssh_options_get() + * Fixed preferred algorithm for known hosts negotiations + * Fixed KEX with some server implementations (e.g. Cisco) + * Fixed issues with MSVC + * Fixed keyboard-interactive auth in server mode + (regression from CVE-2018-10933) + * Fixed gssapi auth in server mode (regression from CVE-2018-10933) + * Fixed socket fd handling with proxy command + * Fixed a memory leak with OpenSSL + +------------------------------------------------------------------- +Tue Oct 16 12:07:50 UTC 2018 - Andreas Schneider <a...@cryptomilk.org> + +- Update to version 0.8.4 + * Fixed CVE-2018-10933; (bsc#1108020) + * Fixed building without globbing support + * Fixed possible memory leaks + * Avoid SIGPIPE on sockets + +------------------------------------------------------------------- +Fri Sep 21 08:32:56 UTC 2018 - Andreas Schneider <a...@cryptomilk.org> + +- Update to version 0.8.3 + * Added support for rsa-sha2 + * Added support to parse private keys in openssh container format + (other than ed25519) + * Added support for diffie-hellman-group18-sha512 and + diffie-hellman-group16-sha512 + * Added ssh_get_fingerprint_hash() + * Added ssh_pki_export_privkey_base64() + * Added support for Match keyword in config file + * Improved performance and reduced memory footprint for sftp + * Fixed ecdsa publickey auth + * Fixed reading a closed channel + * Added support to announce posix-ren...@openssh.com and + hardl...@openssh.com in the sftp server +- Removed patch: 0001-poll-Fix-size-types-in-ssh_event_free.patch + +------------------------------------------------------------------- +Thu Aug 30 06:00:24 UTC 2018 - Andreas Schneider <a...@cryptomilk.org> + +- Update to version 0.8.2 + * Added sha256 fingerprints for pubkeys + * Improved compiler flag detection + * Fixed race condition in reading sftp messages + * Fixed doxygen generation and added modern style + * Fixed library initialization on Windows + * Fixed __bounded__ attribute detection + * Fixed a bug in the options parser + * Fixed documentation for new knwon_hosts API +- Added patch: 0001-poll-Fix-size-types-in-ssh_event_free.patch + * Fix compiler warning on SLE12 + +------------------------------------------------------------------- +Mon Aug 27 09:25:49 UTC 2018 - vci...@suse.com + +- Add missing zlib-devel dependency which was previously pulled in + by libopenssl-devel + +------------------------------------------------------------------- +Tue Aug 14 13:34:19 UTC 2018 - a...@cryptomilk.org + +- Remove the libssh_threads.so symlink + +------------------------------------------------------------------- +Mon Aug 13 20:26:03 UTC 2018 - a...@cryptomilk.org + +- Update to version 0.8.1 + * Fixed version number in the header + * Fixed version number in pkg-config and cmake config + * Fixed library initialization + * Fixed attribute detection + +------------------------------------------------------------------- +Fri Aug 10 12:01:17 UTC 2018 - a...@cryptomilk.org + +- Update to version 0.8.0 + * Removed support for deprecated SSHv1 protocol + * Added new connector API for clients + * Added new known_hosts parsing API + * Added support for OpenSSL 1.1 + * Added support for chacha20-poly1305 cipher + * Added crypto backend for mbedtls crypto library + * Added ECDSA support with gcrypt backend + * Added advanced client and server testing using cwrap.org + * Added support for curve25519-sha256 alias + * Added support for global known_hosts file + * Added support for symbol versioning + * Improved ssh_config parsing + * Improved threading support +- Removed 0001-libcrypto-Remove-AES_ctr128_encrypt.patch +- Removed 0001-libcrypto-Introduce-a-libcrypto-compat-file.patch +- Removed 0001-libcrypto-Use-newer-API-for-HMAC.patch +- Removed 0001-libcrypto-Use-a-pointer-for-EVP_MD_CTX.patch +- Removed 0001-libcrypto-Use-a-pointer-for-EVP_CIPHER_CTX.patch +- Removed 0001-pki_crypto-Use-getters-and-setters-for-opaque-keys-a.patch +- Removed 0001-threads-Use-new-API-call-for-OpenSSL-CRYPTO-THREADID.patch +- Removed 0001-cmake-Use-configure-check-for-CRYPTO_ctr128_encrypt.patch +- Removed 0001-config-Bugfix-Dont-skip-unseen-opcodes.patch + +------------------------------------------------------------------- +Fri Mar 9 14:12:28 UTC 2018 - jmcdono...@suse.com + +- Disable timeout testing on slow build systems (bsc#1084713) + * 0001-disable-timeout-test-on-slow-buildsystems.patch + +------------------------------------------------------------------- +Sun Dec 24 14:41:46 UTC 2017 - fab...@ritter-vogt.de + +- Add patch to fix parsing of config files (boo#1067782): + * 0001-config-Bugfix-Dont-skip-unseen-opcodes.patch + +------------------------------------------------------------------- +Fri Sep 15 08:31:32 UTC 2017 - vci...@suse.com + +- add support for building with OpenSSL 1.1 (bsc#1055266) + * added patches: + * 0001-cmake-Use-configure-check-for-CRYPTO_ctr128_encrypt.patch + * 0001-libcrypto-Introduce-a-libcrypto-compat-file.patch + * 0001-libcrypto-Remove-AES_ctr128_encrypt.patch + * 0001-libcrypto-Use-a-pointer-for-EVP_MD_CTX.patch + * 0001-libcrypto-Use-a-pointer-for-EVP_CIPHER_CTX.patch + * 0001-libcrypto-Use-newer-API-for-HMAC.patch + * 0001-pki_crypto-Use-getters-and-setters-for-opaque-keys-a.patch + * 0001-threads-Use-new-API-call-for-OpenSSL-CRYPTO-THREADID.patch ++++ 567 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Leap:15.1:Update/.libssh.11821.new.26092/libssh.changes New: ---- 0001-disable-timeout-test-on-slow-buildsystems.patch 0001-libcrypto-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch 0001-libgcrypt-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch 0001-tests-Add-aes-gcm-ciphers-tests.patch CVE-2019-14889.patch _multibuild baselibs.conf libssh-0.8.7.tar.xz libssh-0.8.7.tar.xz.asc libssh.changes libssh.keyring libssh.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libssh.spec ++++++ # # spec file for package libssh # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define suffix -test %bcond_without test %else %define suffix %{nil} %bcond_with test %endif Name: libssh%{suffix} Version: 0.8.7 Release: 0 Summary: The SSH library License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ URL: https://www.libssh.org Source0: https://www.libssh.org/files/0.8/libssh-%{version}.tar.xz Source1: https://www.libssh.org/files/0.8/libssh-%{version}.tar.xz.asc Source2: https://cryptomilk.org/gpgkey-8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D.gpg#/libssh.keyring Source99: baselibs.conf Patch0: 0001-disable-timeout-test-on-slow-buildsystems.patch Patch1: 0001-libcrypto-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch Patch2: 0001-libgcrypt-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch Patch3: 0001-tests-Add-aes-gcm-ciphers-tests.patch Patch4: CVE-2019-14889.patch # cmake pulls curl, but libssh is a dependency of it, so avoid cycles by using curl-mini #!BuildRequires: libcurl4-mini BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: krb5-devel BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: xz BuildRequires: zlib-devel # doxygen generated documentation used to be in subpkg Obsoletes: %{name}-devel-doc <= 0.8.6 %if %{with test} BuildRequires: libcmocka-devel %endif %description An SSH implementation in the form of a library. With libssh, you can remotely execute programs, transfer files, use a secure and transparent tunnel for your remote programs. It supports SFTP as well. This package provides libssh from https://www.libssh.org that should not be confused with libssh2 available from https://www.libssh2.org (libssh2 package) %package -n libssh4 Summary: SSH library Group: System/Libraries %description -n libssh4 An SSH implementation in the form of a library. With libssh, you can remotely execute programs, transfer files, use a secure and transparent tunnel for your remote programs. It supports SFTP as well. This package provides libssh from https://www.libssh.org that should not be confused with libssh2 available from https://www.libssh2.org (libssh2 package) %package devel Summary: SSH library development headers Group: Development/Libraries/C and C++ Requires: cmake Requires: libssh4 = %{version} %description devel Development headers for the SSH library. %prep %autosetup -p1 -n libssh-%{version} %build %if %{with test} %ifarch s390 s390x ppc64le %define slow_test_system "ON" %else %define slow_test_system "OFF" %endif %endif %cmake \ -DCMAKE_C_FLAGS:STRING="%{optflags} -DOPENSSL_LOAD_CONF" \ %if %{with test} -DUNIT_TESTING="ON" \ -DSLOW_TEST_SYSTEM=%{slow_test_system} \ %endif -DWITH_GSSAPI=ON \ -DWITH_EXAMPLES="OFF" make %{?_smp_mflags} %install %if !%{with test} %cmake_install %endif %check %if %{with test} %ctest %endif %if !%{with test} %post -n libssh4 -p /sbin/ldconfig %postun -n libssh4 -p /sbin/ldconfig %files -n libssh4 %doc AUTHORS README ChangeLog %{_libdir}/libssh.so.* %files devel %{_includedir}/libssh %{_libdir}/libssh.so %{_libdir}/pkgconfig/libssh.pc %dir %{_libdir}/cmake/libssh %{_libdir}/cmake/libssh/libssh-config.cmake %{_libdir}/cmake/libssh/libssh-config-version.cmake %endif %changelog ++++++ 0001-disable-timeout-test-on-slow-buildsystems.patch ++++++ Index: libssh-0.8.2/tests/unittests/torture_misc.c =================================================================== --- libssh-0.8.2.orig/tests/unittests/torture_misc.c 2018-08-30 08:12:50.355846083 +0200 +++ libssh-0.8.2/tests/unittests/torture_misc.c 2018-08-30 08:12:54.831889573 +0200 @@ -197,11 +197,13 @@ static void torture_timeout_elapsed(void (void) state; ssh_timestamp_init(&ts); usleep(50000); +#ifndef SLOW_TEST_SYSTEM assert_true(ssh_timeout_elapsed(&ts,25)); assert_false(ssh_timeout_elapsed(&ts,30000)); assert_false(ssh_timeout_elapsed(&ts,75)); assert_true(ssh_timeout_elapsed(&ts,0)); assert_false(ssh_timeout_elapsed(&ts,-1)); +#endif /* SLOW_TEST_SYSTEM */ } static void torture_timeout_update(void **state){ @@ -209,11 +211,13 @@ static void torture_timeout_update(void (void) state; ssh_timestamp_init(&ts); usleep(50000); +#ifndef SLOW_TEST_SYSTEM assert_int_equal(ssh_timeout_update(&ts,25), 0); assert_in_range(ssh_timeout_update(&ts,30000),29000,29960); assert_in_range(ssh_timeout_update(&ts,75),1,40); assert_int_equal(ssh_timeout_update(&ts,0),0); assert_int_equal(ssh_timeout_update(&ts,-1),-1); +#endif /* SLOW_TEST_SYSTEM */ } static void torture_ssh_analyze_banner(void **state) { Index: libssh-0.8.2/DefineOptions.cmake =================================================================== --- libssh-0.8.2.orig/DefineOptions.cmake 2018-08-30 08:12:50.355846083 +0200 +++ libssh-0.8.2/DefineOptions.cmake 2018-08-30 08:13:25.020182668 +0200 @@ -20,6 +20,7 @@ option(WITH_SYMBOL_VERSIONING "Build wit option(WITH_ABI_BREAK "Allow ABI break" OFF) option(FUZZ_TESTING "Build with fuzzer for the server" OFF) option(PICKY_DEVELOPER "Build with picky developer flags" OFF) +option(SLOW_TEST_SYSTEM "Disable tests that fail on slow systems" OFF) if (WITH_ZLIB) set(WITH_LIBZ ON) @@ -46,3 +47,8 @@ endif (WITH_NACL) if (WITH_ABI_BREAK) set(WITH_SYMBOL_VERSIONING ON) endif (WITH_ABI_BREAK) + +if (SLOW_TEST_SYSTEM) + set (SLOW_TEST_SYSTEM ON) + add_definitions(-DSLOW_TEST_SYSTEM) +endif (SLOW_TEST_SYSTEM) ++++++ 0001-libcrypto-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch ++++++ >From 46090facbae8c8292d2775546082ccbd5e56fbd1 Mon Sep 17 00:00:00 2001 From: Jakub Jelen <jje...@redhat.com> Date: Mon, 8 Oct 2018 13:24:49 +0200 Subject: [PATCH] libcrypto: Implement OpenSSH-compatible AES-GCM ciphers using OpenSSL The commit also propares the internals throughout the code base for the inclusion of a new AEAD cipher, because previously, the source code counted only with chacha20-poly1305 cipher, which is very specific in many cases. The SSH_HMAC_AEAD_GCM mac algorithm is not actually used, but the name needed to be defined so we can match in the algorithms selection per OpenSSH specification (MACs are ignored in case GCM is select as a cipher [1]). If the provided OpenSSL does not provide EVP_aes_128_gcm() function, the AES-GCM ciphers will not be compiled in. [1] https://cvsweb.openbsd.org/src/usr.bin/ssh/PROTOCOL.chacha20poly1305?annotate=HEAD Signed-off-by: Jakub Jelen <jje...@redhat.com> Reviewed-by: Andreas Schneider <a...@cryptomilk.org> --- ConfigureChecks.cmake | 4 + config.h.cmake | 3 + include/libssh/crypto.h | 8 +- include/libssh/wrapper.h | 3 +- src/chachapoly.c | 1 + src/kex.c | 9 +- src/libcrypto.c | 247 +++++++++++++++++++++++++++++++++++++++ src/packet_crypt.c | 5 +- src/wrapper.c | 27 ++++- 9 files changed, 297 insertions(+), 10 deletions(-) Index: libssh-0.8.7/ConfigureChecks.cmake =================================================================== --- libssh-0.8.7.orig/ConfigureChecks.cmake +++ libssh-0.8.7/ConfigureChecks.cmake @@ -110,6 +110,10 @@ if (OPENSSL_FOUND) set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY}) + check_function_exists(EVP_aes_128_gcm HAVE_OPENSSL_EVP_AES_GCM) + + set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY}) check_function_exists(CRYPTO_THREADID_set_callback HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK) set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) Index: libssh-0.8.7/config.h.cmake =================================================================== --- libssh-0.8.7.orig/config.h.cmake +++ libssh-0.8.7/config.h.cmake @@ -100,6 +100,9 @@ /* Define to 1 if you have the `EVP_aes128_cbc' function. */ #cmakedefine HAVE_OPENSSL_EVP_AES_CBC 1 +/* Define to 1 if you have the `EVP_aes128_gcm' function. */ +#cmakedefine HAVE_OPENSSL_EVP_AES_GCM 1 + /* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ #cmakedefine HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK 1 Index: libssh-0.8.7/include/libssh/crypto.h =================================================================== --- libssh-0.8.7.orig/include/libssh/crypto.h +++ libssh-0.8.7/include/libssh/crypto.h @@ -48,6 +48,9 @@ #define DIGEST_MAX_LEN 64 +#define AES_GCM_TAGLEN 16 +#define AES_GCM_IVLEN 12 + enum ssh_key_exchange_e { /* diffie-hellman-group1-sha1 */ SSH_KEX_DH_GROUP1_SHA1=1, @@ -78,7 +81,10 @@ enum ssh_cipher_e { SSH_AES256_CBC, SSH_AES128_CTR, SSH_AES192_CTR, - SSH_AES256_CTR + SSH_AES256_CTR, + SSH_AEAD_AES128_GCM, + SSH_AEAD_AES256_GCM, + SSH_AEAD_CHACHA20_POLY1305 }; struct ssh_crypto_struct { Index: libssh-0.8.7/include/libssh/wrapper.h =================================================================== --- libssh-0.8.7.orig/include/libssh/wrapper.h +++ libssh-0.8.7/include/libssh/wrapper.h @@ -46,7 +46,8 @@ enum ssh_hmac_e { SSH_HMAC_SHA256, SSH_HMAC_SHA512, SSH_HMAC_MD5, - SSH_HMAC_AEAD_POLY1305 + SSH_HMAC_AEAD_POLY1305, + SSH_HMAC_AEAD_GCM }; enum ssh_des_e { Index: libssh-0.8.7/src/chachapoly.c =================================================================== --- libssh-0.8.7.orig/src/chachapoly.c +++ libssh-0.8.7/src/chachapoly.c @@ -192,6 +192,7 @@ static void chacha20_cleanup(struct ssh_ } const struct ssh_cipher_struct chacha20poly1305_cipher = { + .ciphertype = SSH_AEAD_CHACHA20_POLY1305, .name = "chacha20-poly1...@openssh.com", .blocksize = 8, .lenfield_blocksize = 4, Index: libssh-0.8.7/src/kex.c =================================================================== --- libssh-0.8.7.orig/src/kex.c +++ libssh-0.8.7/src/kex.c @@ -61,10 +61,15 @@ # endif /* HAVE_OPENSSL_BLOWFISH_H */ # ifdef HAVE_OPENSSL_AES_H +# ifdef HAVE_OPENSSL_EVP_AES_GCM +# define GCM "aes256-...@openssh.com,aes128-...@openssh.com," +# else +# define GCM "" +# endif /* HAVE_OPENSSL_EVP_AES_GCM */ # ifdef BROKEN_AES_CTR -# define AES "aes256-cbc,aes192-cbc,aes128-cbc," +# define AES GCM "aes256-cbc,aes192-cbc,aes128-cbc," # else /* BROKEN_AES_CTR */ -# define AES "aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc," +# define AES GCM "aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc," # endif /* BROKEN_AES_CTR */ # else /* HAVE_OPENSSL_AES_H */ # define AES "" Index: libssh-0.8.7/src/libcrypto.c =================================================================== --- libssh-0.8.7.orig/src/libcrypto.c +++ libssh-0.8.7/src/libcrypto.c @@ -491,6 +491,19 @@ static void evp_cipher_init(struct ssh_c SSH_LOG(SSH_LOG_WARNING, "This cipher is not available in evp_cipher_init"); break; #endif +#ifdef HAVE_OPENSSL_EVP_AES_GCM + case SSH_AEAD_AES128_GCM: + cipher->cipher = EVP_aes_128_gcm(); + break; + case SSH_AEAD_AES256_GCM: + cipher->cipher = EVP_aes_256_gcm(); + break; +#else + case SSH_AEAD_AES128_GCM: + case SSH_AEAD_AES256_GCM: + SSH_LOG(SSH_LOG_WARNING, "This cipher is not available in evp_cipher_init"); + break; +#endif /* HAVE_OPENSSL_EVP_AES_GCM */ case SSH_3DES_CBC: cipher->cipher = EVP_des_ede3_cbc(); break; @@ -498,6 +511,9 @@ static void evp_cipher_init(struct ssh_c cipher->cipher = EVP_bf_cbc(); break; /* ciphers not using EVP */ + case SSH_AEAD_CHACHA20_POLY1305: + SSH_LOG(SSH_LOG_WARNING, "The ChaCha cipher can not be handled here"); + break; case SSH_NO_CIPHER: SSH_LOG(SSH_LOG_WARNING, "No valid ciphertype found"); break; @@ -517,6 +533,22 @@ static int evp_cipher_set_encrypt_key(st SSH_LOG(SSH_LOG_WARNING, "EVP_EncryptInit_ex failed"); return SSH_ERROR; } + +#ifdef HAVE_OPENSSL_EVP_AES_GCM + /* For AES-GCM we need to set IV in specific way */ + if (cipher->ciphertype == SSH_AEAD_AES128_GCM || + cipher->ciphertype == SSH_AEAD_AES256_GCM) { + rc = EVP_CIPHER_CTX_ctrl(cipher->ctx, + EVP_CTRL_GCM_SET_IV_FIXED, + -1, + (u_char *)IV); + if (rc != 1) { + SSH_LOG(SSH_LOG_WARNING, "EVP_CTRL_GCM_SET_IV_FIXED failed"); + return SSH_ERROR; + } + } +#endif /* HAVE_OPENSSL_EVP_AES_GCM */ + EVP_CIPHER_CTX_set_padding(cipher->ctx, 0); return SSH_OK; @@ -534,6 +566,22 @@ static int evp_cipher_set_decrypt_key(st SSH_LOG(SSH_LOG_WARNING, "EVP_DecryptInit_ex failed"); return SSH_ERROR; } + +#ifdef HAVE_OPENSSL_EVP_AES_GCM + /* For AES-GCM we need to set IV in specific way */ + if (cipher->ciphertype == SSH_AEAD_AES128_GCM || + cipher->ciphertype == SSH_AEAD_AES256_GCM) { + rc = EVP_CIPHER_CTX_ctrl(cipher->ctx, + EVP_CTRL_GCM_SET_IV_FIXED, + -1, + (u_char *)IV); + if (rc != 1) { + SSH_LOG(SSH_LOG_WARNING, "EVP_CTRL_GCM_SET_IV_FIXED failed"); + return SSH_ERROR; + } + } +#endif /* HAVE_OPENSSL_EVP_AES_GCM */ + EVP_CIPHER_CTX_set_padding(cipher->ctx, 0); return SSH_OK; @@ -642,6 +690,175 @@ static void aes_ctr_cleanup(struct ssh_c #endif /* HAVE_OPENSSL_EVP_AES_CTR */ +#ifdef HAVE_OPENSSL_EVP_AES_GCM +static int +evp_cipher_aead_get_length(struct ssh_cipher_struct *cipher, + void *in, + uint8_t *out, + size_t len, + uint64_t seq) +{ + (void)seq; + + /* The length is not encrypted: Copy it to the result buffer */ + memcpy(out, in, len); + + return SSH_OK; +} + +static void +evp_cipher_aead_encrypt(struct ssh_cipher_struct *cipher, + void *in, + void *out, + size_t len, + uint8_t *tag, + uint64_t seq) +{ + size_t authlen, aadlen; + u_char lastiv[1]; + int outlen = 0; + int rc; + + (void) seq; + + aadlen = cipher->lenfield_blocksize; + authlen = cipher->tag_size; + + /* increment IV */ + rc = EVP_CIPHER_CTX_ctrl(cipher->ctx, + EVP_CTRL_GCM_IV_GEN, + 1, + lastiv); + if (rc == 0) { + SSH_LOG(SSH_LOG_WARNING, "EVP_CTRL_GCM_IV_GEN failed"); + return; + } + + /* Pass over the authenticated data (not encrypted) */ + rc = EVP_EncryptUpdate(cipher->ctx, + NULL, + &outlen, + (unsigned char *)in, + aadlen); + if (rc == 0 || outlen != aadlen) { + SSH_LOG(SSH_LOG_WARNING, "Failed to pass authenticated data"); + return; + } + memcpy(out, in, aadlen); + + /* Encrypt the rest of the data */ + rc = EVP_EncryptUpdate(cipher->ctx, + (unsigned char *)out + aadlen, + &outlen, + (unsigned char *)in + aadlen, + len - aadlen); + if (rc != 1 || outlen != len - aadlen) { + SSH_LOG(SSH_LOG_WARNING, "EVP_EncryptUpdate failed"); + return; + } + + /* compute tag */ + rc = EVP_EncryptFinal(cipher->ctx, + NULL, + &outlen); + if (rc < 0) { + SSH_LOG(SSH_LOG_WARNING, "EVP_EncryptFinal failed: Failed to create a tag"); + return; + } + + rc = EVP_CIPHER_CTX_ctrl(cipher->ctx, + EVP_CTRL_GCM_GET_TAG, + authlen, + (unsigned char *)tag); + if (rc != 1) { + SSH_LOG(SSH_LOG_WARNING, "EVP_CTRL_GCM_GET_TAG failed"); + return; + } +} + +static int +evp_cipher_aead_decrypt(struct ssh_cipher_struct *cipher, + void *complete_packet, + uint8_t *out, + size_t encrypted_size, + uint64_t seq) +{ + size_t authlen, aadlen; + u_char lastiv[1]; + int outlen = 0; + int rc = 0; + + (void)seq; + + aadlen = cipher->lenfield_blocksize; + authlen = cipher->tag_size; + + /* increment IV */ + rc = EVP_CIPHER_CTX_ctrl(cipher->ctx, + EVP_CTRL_GCM_IV_GEN, + 1, + lastiv); + if (rc == 0) { + SSH_LOG(SSH_LOG_WARNING, "EVP_CTRL_GCM_IV_GEN failed"); + return SSH_ERROR; + } + + /* set tag for authentication */ + rc = EVP_CIPHER_CTX_ctrl(cipher->ctx, + EVP_CTRL_GCM_SET_TAG, + authlen, + (unsigned char *)complete_packet + aadlen + encrypted_size); + if (rc == 0) { + SSH_LOG(SSH_LOG_WARNING, "EVP_CTRL_GCM_SET_TAG failed"); + return SSH_ERROR; + } + + /* Pass over the authenticated data (not encrypted) */ + rc = EVP_DecryptUpdate(cipher->ctx, + NULL, + &outlen, + (unsigned char *)complete_packet, + aadlen); + if (rc == 0) { + SSH_LOG(SSH_LOG_WARNING, "Failed to pass authenticated data"); + return SSH_ERROR; + } + /* Do not copy the length to the target buffer, because it is already processed */ + //memcpy(out, complete_packet, aadlen); + + /* Decrypt the rest of the data */ + rc = EVP_DecryptUpdate(cipher->ctx, + (unsigned char *)out, + &outlen, + (unsigned char *)complete_packet + aadlen, + encrypted_size /* already substracted aadlen*/); + if (rc != 1) { + SSH_LOG(SSH_LOG_WARNING, "EVP_DecryptUpdate failed"); + return SSH_ERROR; + } + + if (outlen != (int)encrypted_size) { + SSH_LOG(SSH_LOG_WARNING, + "EVP_DecryptUpdate: output size %d for %zd in", + outlen, + encrypted_size); + return SSH_ERROR; + } + + /* verify tag */ + rc = EVP_DecryptFinal(cipher->ctx, + NULL, + &outlen); + if (rc < 0) { + SSH_LOG(SSH_LOG_WARNING, "EVP_DecryptFinal failed: Failed authentication"); + return SSH_ERROR; + } + + return SSH_OK; +} + +#endif /* HAVE_OPENSSL_EVP_AES_GCM */ + /* * The table of supported ciphers */ @@ -765,6 +982,36 @@ static struct ssh_cipher_struct ssh_ciph .decrypt = evp_cipher_decrypt, .cleanup = evp_cipher_cleanup }, +#ifdef HAVE_OPENSSL_EVP_AES_GCM + { + .name = "aes128-...@openssh.com", + .blocksize = AES_BLOCK_SIZE, + .lenfield_blocksize = 4, /* not encrypted, but authenticated */ + .ciphertype = SSH_AEAD_AES128_GCM, + .keysize = 128, + .tag_size = AES_GCM_TAGLEN, + .set_encrypt_key = evp_cipher_set_encrypt_key, + .set_decrypt_key = evp_cipher_set_decrypt_key, + .aead_encrypt = evp_cipher_aead_encrypt, + .aead_decrypt_length = evp_cipher_aead_get_length, + .aead_decrypt = evp_cipher_aead_decrypt, + .cleanup = evp_cipher_cleanup + }, + { + .name = "aes256-...@openssh.com", + .blocksize = AES_BLOCK_SIZE, + .lenfield_blocksize = 4, /* not encrypted, but authenticated */ + .ciphertype = SSH_AEAD_AES256_GCM, + .keysize = 256, + .tag_size = AES_GCM_TAGLEN, + .set_encrypt_key = evp_cipher_set_encrypt_key, + .set_decrypt_key = evp_cipher_set_decrypt_key, + .aead_encrypt = evp_cipher_aead_encrypt, + .aead_decrypt_length = evp_cipher_aead_get_length, + .aead_decrypt = evp_cipher_aead_decrypt, + .cleanup = evp_cipher_cleanup + }, +#endif /* HAVE_OPENSSL_EVP_AES_GCM */ #endif /* HAS_AES */ #ifdef HAS_DES { Index: libssh-0.8.7/src/packet_crypt.c =================================================================== --- libssh-0.8.7.orig/src/packet_crypt.c +++ libssh-0.8.7/src/packet_crypt.c @@ -209,8 +209,9 @@ int ssh_packet_hmac_verify(ssh_session s unsigned int len; uint32_t seq; - /* AEAD type have no mac checking */ - if (type == SSH_HMAC_AEAD_POLY1305) { + /* AEAD types have no mac checking */ + if (type == SSH_HMAC_AEAD_POLY1305 || + type == SSH_HMAC_AEAD_GCM) { return SSH_OK; } Index: libssh-0.8.7/src/wrapper.c =================================================================== --- libssh-0.8.7.orig/src/wrapper.c +++ libssh-0.8.7/src/wrapper.c @@ -55,6 +55,7 @@ static struct ssh_hmac_struct ssh_hmac_t { "hmac-sha2-512", SSH_HMAC_SHA512 }, { "hmac-md5", SSH_HMAC_MD5 }, { "aead-poly1305", SSH_HMAC_AEAD_POLY1305 }, + { "aead-gcm", SSH_HMAC_AEAD_GCM }, { NULL, 0} }; @@ -74,6 +75,8 @@ size_t hmac_digest_len(enum ssh_hmac_e t return MD5_DIGEST_LEN; case SSH_HMAC_AEAD_POLY1305: return POLY1305_TAGLEN; + case SSH_HMAC_AEAD_GCM: + return AES_GCM_TAGLEN; default: return 0; } @@ -253,7 +256,11 @@ static int crypt_set_algorithms2(ssh_ses if (session->next_crypto->out_cipher->aead_encrypt != NULL){ /* this cipher has integrated MAC */ - wanted = "aead-poly1305"; + if (session->next_crypto->out_cipher->ciphertype == SSH_AEAD_CHACHA20_POLY1305) { + wanted = "aead-poly1305"; + } else { + wanted = "aead-gcm"; + } } else { /* * We must scan the kex entries to find hmac algorithms and set their @@ -307,7 +314,11 @@ static int crypt_set_algorithms2(ssh_ses if (session->next_crypto->in_cipher->aead_encrypt != NULL){ /* this cipher has integrated MAC */ - wanted = "aead-poly1305"; + if (session->next_crypto->in_cipher->ciphertype == SSH_AEAD_CHACHA20_POLY1305) { + wanted = "aead-poly1305"; + } else { + wanted = "aead-gcm"; + } } else { /* we must scan the kex entries to find hmac algorithms and set their appropriate structure */ wanted = session->next_crypto->kex_methods[SSH_MAC_S_C]; @@ -395,7 +406,11 @@ int crypt_set_algorithms_server(ssh_sess i=0; if (session->next_crypto->out_cipher->aead_encrypt != NULL){ /* this cipher has integrated MAC */ - method = "aead-poly1305"; + if (session->next_crypto->out_cipher->ciphertype == SSH_AEAD_CHACHA20_POLY1305) { + method = "aead-poly1305"; + } else { + method = "aead-gcm"; + } } else { /* we must scan the kex entries to find hmac algorithms and set their appropriate structure */ /* out */ @@ -446,7 +461,11 @@ int crypt_set_algorithms_server(ssh_sess if (session->next_crypto->in_cipher->aead_encrypt != NULL){ /* this cipher has integrated MAC */ - method = "aead-poly1305"; + if (session->next_crypto->in_cipher->ciphertype == SSH_AEAD_CHACHA20_POLY1305) { + method = "aead-poly1305"; + } else { + method = "aead-gcm"; + } } else { /* we must scan the kex entries to find hmac algorithms and set their appropriate structure */ method = session->next_crypto->kex_methods[SSH_MAC_C_S]; ++++++ 0001-libgcrypt-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch ++++++ >From 5790036a2305d5610ac55adb5382ea55d043998f Mon Sep 17 00:00:00 2001 From: Jakub Jelen <jje...@redhat.com> Date: Mon, 1 Oct 2018 14:32:05 +0200 Subject: [PATCH] libgcrypt: Implement OpenSSH-compatible AES-GCM ciphers using libgcrypt Signed-off-by: Jakub Jelen <jje...@redhat.com> Reviewed-by: Andreas Schneider <a...@cryptomilk.org> --- include/libssh/crypto.h | 1 + src/kex.c | 4 +- src/libgcrypt.c | 201 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 205 insertions(+), 1 deletion(-) diff --git a/include/libssh/crypto.h b/include/libssh/crypto.h index fc375a4f..8777f0c9 100644 --- a/include/libssh/crypto.h +++ b/include/libssh/crypto.h @@ -142,6 +142,7 @@ struct ssh_cipher_struct { size_t keylen; /* length of the key structure */ #ifdef HAVE_LIBGCRYPT gcry_cipher_hd_t *key; + unsigned char last_iv[AES_GCM_IVLEN]; #elif defined HAVE_LIBCRYPTO struct ssh_3des_key_schedule *des3_key; struct ssh_aes_key_schedule *aes_key; diff --git a/src/kex.c b/src/kex.c index e0fd5680..382d88fb 100644 --- a/src/kex.c +++ b/src/kex.c @@ -40,7 +40,9 @@ #ifdef HAVE_LIBGCRYPT # define BLOWFISH "blowfish-cbc," -# define AES "aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc," +# define AES "aes256-...@openssh.com,aes128-...@openssh.com," \ + "aes256-ctr,aes192-ctr,aes128-ctr," \ + "aes256-cbc,aes192-cbc,aes128-cbc," # define DES "3des-cbc" # define DES_SUPPORTED "3des-cbc" diff --git a/src/libgcrypt.c b/src/libgcrypt.c index f004ffe2..7160bb1c 100644 --- a/src/libgcrypt.c +++ b/src/libgcrypt.c @@ -353,6 +353,8 @@ static int aes_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { } if(strstr(cipher->name,"-ctr")) mode=GCRY_CIPHER_MODE_CTR; + if (strstr(cipher->name, "-gcm")) + mode = GCRY_CIPHER_MODE_GCM; switch (cipher->keysize) { case 128: if (gcry_cipher_open(&cipher->key[0], GCRY_CIPHER_AES128, @@ -386,6 +388,11 @@ static int aes_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { SAFE_FREE(cipher->key); return -1; } + } else if (mode == GCRY_CIPHER_MODE_GCM) { + /* Store the IV so we can handle the packet counter increments later + * The IV is passed to the cipher context later. + */ + memcpy(cipher->last_iv, IV, AES_GCM_IVLEN); } else { if(gcry_cipher_setctr(cipher->key[0],IV,16)){ SAFE_FREE(cipher->key); @@ -407,6 +414,172 @@ static void aes_decrypt(struct ssh_cipher_struct *cipher, void *in, void *out, gcry_cipher_decrypt(cipher->key[0], out, len, in, len); } +static int +aes_aead_get_length(struct ssh_cipher_struct *cipher, + void *in, + uint8_t *out, + size_t len, + uint64_t seq) +{ + (void)seq; + + /* The length is not encrypted: Copy it to the result buffer */ + memcpy(out, in, len); + + return SSH_OK; +} + +/* Increment 64b integer in network byte order */ +static void +uint64_inc(unsigned char *counter) +{ + int i; + + for (i = 7; i >= 0; i--) { + counter[i]++; + if (counter[i]) + return; + } +} + +static void +aes_gcm_encrypt(struct ssh_cipher_struct *cipher, + void *in, + void *out, + size_t len, + uint8_t *tag, + uint64_t seq) +{ + gpg_error_t err; + size_t aadlen, authlen; + + (void)seq; + + aadlen = cipher->lenfield_blocksize; + authlen = cipher->tag_size; + + /* increment IV */ + err = gcry_cipher_setiv(cipher->key[0], + cipher->last_iv, + AES_GCM_IVLEN); + /* This actualy does not increment the packet counter for the + * current encryption operation, but for the next one. The first + * operation needs to be completed with the derived IV. + * + * The IV buffer has the following structure: + * [ 4B static IV ][ 8B packet counter ][ 4B block counter ] + */ + uint64_inc(cipher->last_iv + 4); + if (err) { + SSH_LOG(SSH_LOG_WARNING, "gcry_cipher_setiv failed: %s", + gpg_strerror(err)); + return; + } + + /* Pass the authenticated data (packet_length) */ + err = gcry_cipher_authenticate(cipher->key[0], in, aadlen); + if (err) { + SSH_LOG(SSH_LOG_WARNING, "gcry_cipher_authenticate failed: %s", + gpg_strerror(err)); + return; + } + memcpy(out, in, aadlen); + + /* Encrypt the rest of the data */ + err = gcry_cipher_encrypt(cipher->key[0], + (unsigned char *)out + aadlen, + len - aadlen, + (unsigned char *)in + aadlen, + len - aadlen); + if (err) { + SSH_LOG(SSH_LOG_WARNING, "gcry_cipher_encrypt failed: %s", + gpg_strerror(err)); + return; + } + + /* Calculate the tag */ + err = gcry_cipher_gettag(cipher->key[0], + (void *)tag, + authlen); + if (err) { + SSH_LOG(SSH_LOG_WARNING, "gcry_cipher_gettag failed: %s", + gpg_strerror(err)); + return; + } +} + +static int +aes_gcm_decrypt(struct ssh_cipher_struct *cipher, + void *complete_packet, + uint8_t *out, + size_t encrypted_size, + uint64_t seq) +{ + gpg_error_t err; + size_t aadlen, authlen; + + (void)seq; + + aadlen = cipher->lenfield_blocksize; + authlen = cipher->tag_size; + + /* increment IV */ + err = gcry_cipher_setiv(cipher->key[0], + cipher->last_iv, + AES_GCM_IVLEN); + /* This actualy does not increment the packet counter for the + * current encryption operation, but for the next one. The first + * operation needs to be completed with the derived IV. + * + * The IV buffer has the following structure: + * [ 4B static IV ][ 8B packet counter ][ 4B block counter ] + */ + uint64_inc(cipher->last_iv + 4); + if (err) { + SSH_LOG(SSH_LOG_WARNING, "gcry_cipher_setiv failed: %s", + gpg_strerror(err)); + return SSH_ERROR; + } + + /* Pass the authenticated data (packet_length) */ + err = gcry_cipher_authenticate(cipher->key[0], + complete_packet, + aadlen); + if (err) { + SSH_LOG(SSH_LOG_WARNING, "gcry_cipher_authenticate failed: %s", + gpg_strerror(err)); + return SSH_ERROR; + } + /* Do not copy the length to the target buffer, because it is already processed */ + //memcpy(out, complete_packet, aadlen); + + /* Encrypt the rest of the data */ + err = gcry_cipher_decrypt(cipher->key[0], + out, + encrypted_size, + (unsigned char *)complete_packet + aadlen, + encrypted_size); + if (err) { + SSH_LOG(SSH_LOG_WARNING, "gcry_cipher_decrypt failed: %s", + gpg_strerror(err)); + return SSH_ERROR; + } + + /* Check the tag */ + err = gcry_cipher_checktag(cipher->key[0], + (unsigned char *)complete_packet + aadlen + encrypted_size, + authlen); + if (gpg_err_code(err) == GPG_ERR_CHECKSUM) { + SSH_LOG(SSH_LOG_WARNING, "The authentication tag does not match"); + return SSH_ERROR; + } else if (err != GPG_ERR_NO_ERROR) { + SSH_LOG(SSH_LOG_WARNING, "General error while decryption: %s", + gpg_strerror(err)); + return SSH_ERROR; + } + return SSH_OK; +} + static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { if (cipher->key == NULL) { if (alloc_key(cipher) < 0) { @@ -519,6 +692,34 @@ static struct ssh_cipher_struct ssh_ciphertab[] = { .encrypt = aes_encrypt, .decrypt = aes_decrypt }, + { + .name = "aes128-...@openssh.com", + .blocksize = 16, + .lenfield_blocksize = 4, /* not encrypted, but authenticated */ + .keylen = sizeof(gcry_cipher_hd_t), + .key = NULL, + .keysize = 128, + .tag_size = AES_GCM_TAGLEN, + .set_encrypt_key = aes_set_key, + .set_decrypt_key = aes_set_key, + .aead_encrypt = aes_gcm_encrypt, + .aead_decrypt_length = aes_aead_get_length, + .aead_decrypt = aes_gcm_decrypt, + }, + { + .name = "aes256-...@openssh.com", + .blocksize = 16, + .lenfield_blocksize = 4, /* not encrypted, but authenticated */ + .keylen = sizeof(gcry_cipher_hd_t), + .key = NULL, + .keysize = 256, + .tag_size = AES_GCM_TAGLEN, + .set_encrypt_key = aes_set_key, + .set_decrypt_key = aes_set_key, + .aead_encrypt = aes_gcm_encrypt, + .aead_decrypt_length = aes_aead_get_length, + .aead_decrypt = aes_gcm_decrypt, + }, { .name = "3des-cbc", .blocksize = 8, -- 2.21.0 ++++++ 0001-tests-Add-aes-gcm-ciphers-tests.patch ++++++ >From 42bd7cdf6c6e50786155c904821fc62d6d8e5acb Mon Sep 17 00:00:00 2001 From: Jakub Jelen <jje...@redhat.com> Date: Mon, 8 Oct 2018 13:31:12 +0200 Subject: [PATCH] tests: Add aes-gcm ciphers tests Signed-off-by: Jakub Jelen <jje...@redhat.com> Reviewed-by: Andreas Schneider <a...@cryptomilk.org> --- tests/client/torture_algorithms.c | 20 ++++++++++++++++++++ tests/pkd/pkd_hello.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/tests/client/torture_algorithms.c b/tests/client/torture_algorithms.c index c216c99b..9bb67410 100644 --- a/tests/client/torture_algorithms.c +++ b/tests/client/torture_algorithms.c @@ -240,6 +240,20 @@ static void torture_algorithms_aes256_ctr_hmac_sha2_512(void **state) { test_algorithm(s->ssh.session, NULL/*kex*/, "aes256-ctr", "hmac-sha2-512"); } +static void torture_algorithms_aes128_gcm(void **state) +{ + struct torture_state *s = *state; + + test_algorithm(s->ssh.session, NULL/*kex*/, "aes128-...@openssh.com", NULL); +} + +static void torture_algorithms_aes256_gcm(void **state) +{ + struct torture_state *s = *state; + + test_algorithm(s->ssh.session, NULL/*kex*/, "aes256-...@openssh.com", NULL); +} + static void torture_algorithms_3des_cbc_hmac_sha1(void **state) { struct torture_state *s = *state; @@ -464,6 +478,12 @@ int torture_run_tests(void) { cmocka_unit_test_setup_teardown(torture_algorithms_aes256_ctr_hmac_sha2_512, session_setup, session_teardown), + cmocka_unit_test_setup_teardown(torture_algorithms_aes128_gcm, + session_setup, + session_teardown), + cmocka_unit_test_setup_teardown(torture_algorithms_aes256_gcm, + session_setup, + session_teardown), cmocka_unit_test_setup_teardown(torture_algorithms_3des_cbc_hmac_sha1, session_setup, session_teardown), diff --git a/tests/pkd/pkd_hello.c b/tests/pkd/pkd_hello.c index e14316ec..0fa72d04 100644 --- a/tests/pkd/pkd_hello.c +++ b/tests/pkd/pkd_hello.c @@ -383,6 +383,8 @@ static int torture_pkd_setup_ecdsa_521(void **state) { #endif #define CHACHA20 "chacha20-poly1...@openssh.com" +#define AES128_GCM "aes128-...@openssh.com" +#define AES256_GCM "aes256-...@openssh.com" #ifdef HAVE_DSA #define PKDTESTS_CIPHER_OPENSSHONLY(f, client, ciphercmd) \ @@ -390,9 +392,13 @@ static int torture_pkd_setup_ecdsa_521(void **state) { f(client, rsa_aes192_cbc, ciphercmd("aes192-cbc"), setup_rsa, teardown) \ f(client, rsa_aes192_ctr, ciphercmd("aes192-ctr"), setup_rsa, teardown) \ f(client, rsa_chacha20, ciphercmd(CHACHA20), setup_rsa, teardown) \ + f(client, rsa_aes128_gcm, ciphercmd(AES128_GCM), setup_rsa, teardown) \ + f(client, rsa_aes256_gcm, ciphercmd(AES256_GCM), setup_rsa, teardown) \ f(client, dsa_aes192_cbc, ciphercmd("aes192-cbc"), setup_dsa, teardown) \ f(client, dsa_aes192_ctr, ciphercmd("aes192-ctr"), setup_dsa, teardown) \ f(client, dsa_chacha20, ciphercmd(CHACHA20), setup_dsa, teardown) \ + f(client, dsa_aes128_gcm, ciphercmd(AES128_GCM), setup_dsa, teardown) \ + f(client, dsa_aes256_gcm, ciphercmd(AES256_GCM), setup_dsa, teardown) \ f(client, ed25519_3des_cbc, ciphercmd("3des-cbc"), setup_ed25519, teardown) \ f(client, ed25519_aes128_cbc, ciphercmd("aes128-cbc"), setup_ed25519, teardown) \ f(client, ed25519_aes128_ctr, ciphercmd("aes128-ctr"), setup_ed25519, teardown) \ @@ -401,21 +407,31 @@ static int torture_pkd_setup_ecdsa_521(void **state) { f(client, ed25519_aes192_cbc, ciphercmd("aes192-cbc"), setup_ed25519, teardown) \ f(client, ed25519_aes192_ctr, ciphercmd("aes192-ctr"), setup_ed25519, teardown) \ f(client, ed25519_chacha20, ciphercmd(CHACHA20), setup_ed25519, teardown) \ + f(client, ed25519_aes128_gcm, ciphercmd(AES128_GCM), setup_ed25519, teardown) \ + f(client, ed25519_aes256_gcm, ciphercmd(AES256_GCM), setup_ed25519, teardown) \ f(client, ecdsa_256_aes192_cbc, ciphercmd("aes192-cbc"), setup_ecdsa_256, teardown) \ f(client, ecdsa_256_aes192_ctr, ciphercmd("aes192-ctr"), setup_ecdsa_256, teardown) \ f(client, ecdsa_256_chacha20, ciphercmd(CHACHA20), setup_ecdsa_256, teardown) \ + f(client, ecdsa_256_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_256, teardown) \ + f(client, ecdsa_256_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_256, teardown) \ f(client, ecdsa_384_aes192_cbc, ciphercmd("aes192-cbc"), setup_ecdsa_384, teardown) \ f(client, ecdsa_384_aes192_ctr, ciphercmd("aes192-ctr"), setup_ecdsa_384, teardown) \ f(client, ecdsa_384_chacha20, ciphercmd(CHACHA20), setup_ecdsa_384, teardown) \ + f(client, ecdsa_384_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_384, teardown) \ + f(client, ecdsa_384_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_384, teardown) \ f(client, ecdsa_521_aes192_cbc, ciphercmd("aes192-cbc"), setup_ecdsa_521, teardown) \ f(client, ecdsa_521_aes192_ctr, ciphercmd("aes192-ctr"), setup_ecdsa_521, teardown) \ - f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown) + f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown) \ + f(client, ecdsa_521_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_521, teardown) \ + f(client, ecdsa_521_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_521, teardown) #else #define PKDTESTS_CIPHER_OPENSSHONLY(f, client, ciphercmd) \ /* Ciphers. */ \ f(client, rsa_aes192_cbc, ciphercmd("aes192-cbc"), setup_rsa, teardown) \ f(client, rsa_aes192_ctr, ciphercmd("aes192-ctr"), setup_rsa, teardown) \ f(client, rsa_chacha20, ciphercmd(CHACHA20), setup_rsa, teardown) \ + f(client, rsa_aes128_gcm, ciphercmd(AES128_GCM), setup_rsa, teardown) \ + f(client, rsa_aes256_gcm, ciphercmd(AES256_GCM), setup_rsa, teardown) \ f(client, ed25519_3des_cbc, ciphercmd("3des-cbc"), setup_ed25519, teardown) \ f(client, ed25519_aes128_cbc, ciphercmd("aes128-cbc"), setup_ed25519, teardown) \ f(client, ed25519_aes128_ctr, ciphercmd("aes128-ctr"), setup_ed25519, teardown) \ @@ -424,17 +440,26 @@ static int torture_pkd_setup_ecdsa_521(void **state) { f(client, ed25519_aes192_cbc, ciphercmd("aes192-cbc"), setup_ed25519, teardown) \ f(client, ed25519_aes192_ctr, ciphercmd("aes192-ctr"), setup_ed25519, teardown) \ f(client, ed25519_chacha20, ciphercmd(CHACHA20), setup_ed25519, teardown) \ + f(client, ed25519_aes128_gcm, ciphercmd(AES128_GCM), setup_ed25519, teardown) \ + f(client, ed25519_aes256_gcm, ciphercmd(AES256_GCM), setup_ed25519, teardown) \ f(client, ecdsa_256_aes192_cbc, ciphercmd("aes192-cbc"), setup_ecdsa_256, teardown) \ f(client, ecdsa_256_aes192_ctr, ciphercmd("aes192-ctr"), setup_ecdsa_256, teardown) \ f(client, ecdsa_256_chacha20, ciphercmd(CHACHA20), setup_ecdsa_256, teardown) \ + f(client, ecdsa_256_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_256, teardown) \ + f(client, ecdsa_256_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_256, teardown) \ f(client, ecdsa_384_aes192_cbc, ciphercmd("aes192-cbc"), setup_ecdsa_384, teardown) \ f(client, ecdsa_384_aes192_ctr, ciphercmd("aes192-ctr"), setup_ecdsa_384, teardown) \ f(client, ecdsa_384_chacha20, ciphercmd(CHACHA20), setup_ecdsa_384, teardown) \ + f(client, ecdsa_384_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_384, teardown) \ + f(client, ecdsa_384_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_384, teardown) \ f(client, ecdsa_521_aes192_cbc, ciphercmd("aes192-cbc"), setup_ecdsa_521, teardown) \ f(client, ecdsa_521_aes192_ctr, ciphercmd("aes192-ctr"), setup_ecdsa_521, teardown) \ - f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown) + f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown) \ + f(client, ecdsa_521_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_521, teardown) \ + f(client, ecdsa_521_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_521, teardown) #endif + #ifdef HAVE_DSA #define PKDTESTS_MAC(f, client, maccmd) \ /* MACs. */ \ -- 2.21.0 ++++++ CVE-2019-14889.patch ++++++ ++++ 1697 lines (skipped) ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild> ++++++ baselibs.conf ++++++ libssh4
