Updating link to change in openSUSE:Factory/libssh revision 58.0
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libssh?expand=0&rev=aa48a23794f5559f5cb46b48c5b564e4
This commit is contained in:
parent
9cf1bb569d
commit
82729633e4
@ -1,7 +1,7 @@
|
||||
Index: libssh-0.8.2/tests/unittests/torture_misc.c
|
||||
Index: libssh-0.9.0/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
|
||||
--- libssh-0.9.0.orig/tests/unittests/torture_misc.c 2019-06-28 08:45:32.418434037 +0200
|
||||
+++ libssh-0.9.0/tests/unittests/torture_misc.c 2019-06-28 08:45:38.766497056 +0200
|
||||
@@ -197,11 +197,13 @@ static void torture_timeout_elapsed(void
|
||||
(void) state;
|
||||
ssh_timestamp_init(&ts);
|
||||
@ -30,22 +30,22 @@ Index: libssh-0.8.2/tests/unittests/torture_misc.c
|
||||
}
|
||||
|
||||
static void torture_ssh_analyze_banner(void **state) {
|
||||
Index: libssh-0.8.2/DefineOptions.cmake
|
||||
Index: libssh-0.9.0/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)
|
||||
--- libssh-0.9.0.orig/DefineOptions.cmake 2019-06-28 08:45:32.418434037 +0200
|
||||
+++ libssh-0.9.0/DefineOptions.cmake 2019-06-28 08:46:08.330789588 +0200
|
||||
@@ -22,6 +22,7 @@ option(WITH_ABI_BREAK "Allow ABI break"
|
||||
option(WITH_GEX "Enable DH Group exchange mechanisms" ON)
|
||||
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)
|
||||
@@ -57,3 +58,8 @@ endif (NOT GLOBAL_BIND_CONFIG)
|
||||
if (NOT GLOBAL_CLIENT_CONFIG)
|
||||
set(GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config")
|
||||
endif (NOT GLOBAL_CLIENT_CONFIG)
|
||||
+
|
||||
+if (SLOW_TEST_SYSTEM)
|
||||
+ set (SLOW_TEST_SYSTEM ON)
|
||||
|
@ -1,519 +0,0 @@
|
||||
From 46090facbae8c8292d2775546082ccbd5e56fbd1 Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Jelen <jjelen@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 <jjelen@redhat.com>
|
||||
Reviewed-by: Andreas Schneider <asn@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-poly1305@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-gcm@openssh.com,aes128-gcm@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-gcm@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-gcm@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];
|
@ -1,277 +0,0 @@
|
||||
From 5790036a2305d5610ac55adb5382ea55d043998f Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Jelen <jjelen@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 <jjelen@redhat.com>
|
||||
Reviewed-by: Andreas Schneider <asn@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-gcm@openssh.com,aes128-gcm@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-gcm@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-gcm@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
|
||||
|
@ -1,141 +0,0 @@
|
||||
From 42bd7cdf6c6e50786155c904821fc62d6d8e5acb Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Jelen <jjelen@redhat.com>
|
||||
Date: Mon, 8 Oct 2018 13:31:12 +0200
|
||||
Subject: [PATCH] tests: Add aes-gcm ciphers tests
|
||||
|
||||
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
||||
Reviewed-by: Andreas Schneider <asn@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-gcm@openssh.com", NULL);
|
||||
+}
|
||||
+
|
||||
+static void torture_algorithms_aes256_gcm(void **state)
|
||||
+{
|
||||
+ struct torture_state *s = *state;
|
||||
+
|
||||
+ test_algorithm(s->ssh.session, NULL/*kex*/, "aes256-gcm@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-poly1305@openssh.com"
|
||||
+#define AES128_GCM "aes128-gcm@openssh.com"
|
||||
+#define AES256_GCM "aes256-gcm@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
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:43304ca22f0ba0b654e14b574a39816bc70212fdea5858a6637cc26cade3d592
|
||||
size 430104
|
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAlxztLUACgkQfuD8TcwB
|
||||
Tj3hVw//VpBWEZn9lxakmApQd51nVAlyByt8GOHxb/KOTvoS5E/tmiaZ0dc4KWqc
|
||||
A1DvQY3YnkdIqx8u55bKdUAWaZO7vwAYOR4YBTQ5tHertK13bZJQxPQYjMhVOGsy
|
||||
9xpVq/kJvNGtQ7riLX8cbYL1PuWN3xSPOCjNrKK5hw6gK4Ykbn+evXjGqrr0jDKl
|
||||
F27+H8+hs167UJ0u0/kBl84tObvbdCBVx4b3uflFJYd0yllvVGQ/qObhgZlnWP8X
|
||||
fZIeHSeKiXPbYP/rEW3t/x+5Oepv4YFlk7yL2zKxCMSVewdmk30Y1Q+yF1RHKxfF
|
||||
xP52yb0y3JQOoMQFATiGse/tz0jvNvBJuCUBKdrHvnL0SWECY58Vd8yldiVKxtZi
|
||||
vJ0ghZQZeoD8t6+CCq6fUn4M9+r8mGd6Q5eSKuIWtgUVgdDgc2Oj7s2Jd3pkyNTB
|
||||
Gx4koXoakCVP2YbuUCPRGK/eGrMjerOuiGvURIJmmJXqb7O1IJ7cBXvg3xw8l4Ey
|
||||
L7YZ6CpUgZndMIdNdS0P7LY8s1J/3k5df3teYjOXcddBj9FiNxfRSR8wJsD8ZERL
|
||||
boZN7NY9Ruy6l9vhuqC5umDhx9mtf+mrJDhWJQbW7qFzCMBtICpJMrLNeHqTMvlw
|
||||
Yktoa4T680s8UM3WcD/A7B+++wK//YhYEEC5NfHLa1vZoiEGJ2s=
|
||||
=O5H5
|
||||
-----END PGP SIGNATURE-----
|
3
libssh-0.9.0.tar.xz
Normal file
3
libssh-0.9.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:25303c2995e663cd169fdd902bae88106f48242d7e96311d74f812023482c7a5
|
||||
size 487628
|
16
libssh-0.9.0.tar.xz.asc
Normal file
16
libssh-0.9.0.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAl0VtfEACgkQfuD8TcwB
|
||||
Tj0cthAApYglGlE2+f06uKvPUc8LvzVkRFJA5ycm7uMddrMbSJ+ElScEu1a6q/qV
|
||||
xPK3w49WdDpbYcz3s/GtdhGkSTye49Zav2PJzDFWvac+PoXVOwt7C5JzlPSq7kfa
|
||||
0i6k1/7YSiPcFCo7467v2fpg0t80OHgS+Tbc1mwI0KtRzPA2pjqHsnu+RVNc6EA1
|
||||
paUf1QMhjPFIQwcqJcQGAHZBqpx4JBspzBpC7wDxQKFh5FfMbVOxPG3qvgeOYDqd
|
||||
cbfsJkdOJQ0rAxyNBB6xbz8XktJyK4Bjg5eT9GEz+zpsjh8jtfJMhNEemaBLXkug
|
||||
+4wb4DU2uhEuOoOFh0YOgLcRLm2INNhVSTcizasmA8X1YcvAUmKB7fUMuYwOQOPZ
|
||||
bsSkJ8kg7v76Y8w/pUger99pVYg0iiLi9KI6a2t7qTSibZewv38IV6eSJqORnZja
|
||||
SLeswZUAAtHK/nTf7ohZ8Blnhx3UE5M6vyuli+KMmHAxTOzHhyWJvYDYJ2oJ7+tR
|
||||
N49U1O77VE0WYY7HoyEXYkvSwWLb+MYK6ueaJTVBEbq7ZdpzQBQtPLoyCXUdQwZ2
|
||||
DyZaaZnhkn9FYvsJp/twHra3XlQ359EXdMwflISaKgFUpfaluLIu1xRGrYH4XPNm
|
||||
FHZRPCj34PY1uDOKHXiRl/xUdaR4CSIKPgofhxzy/mLZepJR9vU=
|
||||
=xGD9
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +1,31 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 10 08:42:34 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Split out configuration to separate package to not mess up the
|
||||
library packaging and coinstallation
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 28 06:40:49 UTC 2019 - Andreas Schneider <asn@cryptomilk.org>
|
||||
|
||||
- Update to verion 0.9.0
|
||||
* Added support for AES-GCM
|
||||
* Added improved rekeying support
|
||||
* Added performance improvements
|
||||
* Disabled blowfish support by default
|
||||
* Fixed several ssh config parsing issues
|
||||
* Added support for DH Group Exchange KEX
|
||||
* Added support for Encrypt-then-MAC mode
|
||||
* Added support for parsing server side configuration file
|
||||
* Added support for ECDSA/Ed25519 certificates
|
||||
* Added FIPS 140-2 compatibility
|
||||
* Improved known_hosts parsing
|
||||
* Improved documentation
|
||||
* Improved OpenSSL API usage for KEX, DH, and signatures
|
||||
- Removed 0001-libcrypto-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch
|
||||
- Removed 0001-libgcrypt-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch
|
||||
- Removed 0001-tests-Add-aes-gcm-ciphers-tests.patch
|
||||
- Add libssh client and server config files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 29 12:56:05 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
|
||||
|
||||
|
46
libssh.spec
46
libssh.spec
@ -19,26 +19,30 @@
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
%if "%{flavor}" == "test"
|
||||
%define suffix -test
|
||||
%ifarch s390 s390x ppc64le
|
||||
%define slow_test_system "ON"
|
||||
%else
|
||||
%define slow_test_system "OFF"
|
||||
%endif
|
||||
%bcond_without test
|
||||
%else
|
||||
%define suffix %{nil}
|
||||
%bcond_with test
|
||||
%endif
|
||||
Name: libssh%{suffix}
|
||||
Version: 0.8.7
|
||||
Version: 0.9.0
|
||||
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
|
||||
Source0: https://www.libssh.org/files/0.9/libssh-%{version}.tar.xz
|
||||
Source1: https://www.libssh.org/files/0.9/libssh-%{version}.tar.xz.asc
|
||||
Source2: https://cryptomilk.org/gpgkey-8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D.gpg#/libssh.keyring
|
||||
Source3: libssh_client.config
|
||||
Source4: libssh_server.config
|
||||
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
|
||||
# cmake pulls curl, but libssh is a dependency of it, so avoid cycles by using curl-mini
|
||||
#!BuildRequires: libcurl4-mini
|
||||
BuildRequires: cmake
|
||||
@ -65,6 +69,7 @@ confused with libssh2 available from https://www.libssh2.org (libssh2 package)
|
||||
%package -n libssh4
|
||||
Summary: SSH library
|
||||
Group: System/Libraries
|
||||
Requires: %{name}-config >= %{version}
|
||||
|
||||
%description -n libssh4
|
||||
An SSH implementation in the form of a library. With libssh, you can remotely
|
||||
@ -74,6 +79,13 @@ 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 config
|
||||
Summary: SSH library configuration files
|
||||
Group: Productivity/Networking/SSH
|
||||
|
||||
%description config
|
||||
Configuration files for the SSH library.
|
||||
|
||||
%package devel
|
||||
Summary: SSH library development headers
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -87,15 +99,6 @@ Development headers for the SSH library.
|
||||
%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}
|
||||
@ -103,13 +106,19 @@ Development headers for the SSH library.
|
||||
-DSLOW_TEST_SYSTEM=%{slow_test_system} \
|
||||
%endif
|
||||
-DWITH_GSSAPI=ON \
|
||||
-DWITH_EXAMPLES="OFF"
|
||||
-DWITH_EXAMPLES="OFF" \
|
||||
-DGLOBAL_CLIENT_CONFIG="%{_sysconfdir}/libssh/libssh_client.config" \
|
||||
-DGLOBAL_BIND_CONFIG="%{_sysconfdir}/libssh/libssh_server.config"
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%if !%{with test}
|
||||
%cmake_install
|
||||
|
||||
install -d -m755 %{buildroot}%{_sysconfdir}/libssh
|
||||
install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/libssh/libssh_client.config
|
||||
install -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/libssh/libssh_server.config
|
||||
%endif
|
||||
|
||||
%check
|
||||
@ -125,6 +134,11 @@ make %{?_smp_mflags}
|
||||
%doc AUTHORS README ChangeLog
|
||||
%{_libdir}/libssh.so.*
|
||||
|
||||
%files config
|
||||
%dir %{_sysconfdir}/libssh
|
||||
%config(noreplace) %{_sysconfdir}/libssh/libssh_client.config
|
||||
%config(noreplace) %{_sysconfdir}/libssh/libssh_server.config
|
||||
|
||||
%files devel
|
||||
%{_includedir}/libssh
|
||||
%{_libdir}/libssh.so
|
||||
|
2
libssh_client.config
Normal file
2
libssh_client.config
Normal file
@ -0,0 +1,2 @@
|
||||
# Parse OpenSSH configuration file for consistency
|
||||
Include /etc/ssh/ssh_config
|
2
libssh_server.config
Normal file
2
libssh_server.config
Normal file
@ -0,0 +1,2 @@
|
||||
# Parse OpenSSH configuration file for consistency
|
||||
Include /etc/ssh/sshd_config
|
Loading…
Reference in New Issue
Block a user