diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-07-12 09:20:57 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-07-12 17:43:16 +0200 |
| commit | 6f6574f745a011ad5819d6100ecadab0bea5aa51 (patch) | |
| tree | 8ad4cf4b4cabfdadfc9635f175992440e2899116 | |
| parent | 2f96907d2c0efa5f39f65c1e9bfffa3dcd47f845 (diff) | |
| download | gnutls-6f6574f745a011ad5819d6100ecadab0bea5aa51.tar.gz | |
gnutls-cli-debug: generalized cipher tests
That is, tests now check for either the 128-bit or the 256-bit
of the cipher consistently.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | src/cli-debug.c | 12 | ||||
| -rw-r--r-- | src/tests.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/cli-debug.c b/src/cli-debug.c index 18ad1ecd39..26937269b7 100644 --- a/src/cli-debug.c +++ b/src/cli-debug.c @@ -156,17 +156,17 @@ static const TLS_TEST tls_tests[] = { {"for curve SECP384r1 (RFC4492)", test_ecdhe_secp384r1, "yes", "no", "dunno"}, {"for curve SECP521r1 (RFC4492)", test_ecdhe_secp521r1, "yes", "no", "dunno"}, {"for curve X25519 (draft-ietf-tls-rfc4492bis-17)", test_ecdhe_x25519, "yes", "no", "dunno"}, - {"for AES-128-GCM cipher (RFC5288) support", test_aes_gcm, "yes", "no", + {"for AES-GCM cipher (RFC5288) support", test_aes_gcm, "yes", "no", "dunno"}, - {"for AES-128-CCM cipher (RFC6655) support", test_aes_ccm, "yes", "no", + {"for AES-CCM cipher (RFC6655) support", test_aes_ccm, "yes", "no", "dunno"}, - {"for AES-128-CCM-8 cipher (RFC6655) support", test_aes_ccm_8, "yes", "no", + {"for AES-CCM-8 cipher (RFC6655) support", test_aes_ccm_8, "yes", "no", "dunno"}, - {"for AES-128-CBC cipher (RFC3268) support", test_aes, "yes", "no", + {"for AES-CBC cipher (RFC3268) support", test_aes, "yes", "no", "dunno"}, - {"for CAMELLIA-128-GCM cipher (RFC6367) support", test_camellia_gcm, "yes", "no", + {"for CAMELLIA-GCM cipher (RFC6367) support", test_camellia_gcm, "yes", "no", "dunno"}, - {"for CAMELLIA-128-CBC cipher (RFC5932) support", test_camellia_cbc, "yes", "no", + {"for CAMELLIA-CBC cipher (RFC5932) support", test_camellia_cbc, "yes", "no", "dunno"}, {"for 3DES-CBC cipher (RFC2246) support", test_3des, "yes", "no", "dunno"}, {"for ARCFOUR 128 cipher (RFC2246) support", test_arcfour, "yes", "no", diff --git a/src/tests.c b/src/tests.c index 972bf0afa2..b51045f365 100644 --- a/src/tests.c +++ b/src/tests.c @@ -614,7 +614,7 @@ test_code_t test_aes(gnutls_session_t session) int ret; sprintf(prio_str, INIT_STR - "+AES-128-CBC:" ALL_COMP ":%s:" ALL_MACS + "+AES-128-CBC:+AES-256-CBC:" ALL_COMP ":%s:" ALL_MACS ":" ALL_KX ":%s", protocol_str, rest); _gnutls_priority_set_direct(session, prio_str); @@ -680,7 +680,7 @@ test_code_t test_camellia_cbc(gnutls_session_t session) return TEST_IGNORE; sprintf(prio_str, - INIT_STR "+CAMELLIA-128-CBC:" ALL_COMP + INIT_STR "+CAMELLIA-128-CBC:+CAMELLIA-256-CBC:" ALL_COMP ":%s:" ALL_MACS ":" ALL_KX ":%s", protocol_str, rest); _gnutls_priority_set_direct(session, prio_str); @@ -699,7 +699,7 @@ test_code_t test_camellia_gcm(gnutls_session_t session) return TEST_IGNORE; sprintf(prio_str, - INIT_STR "+CAMELLIA-128-GCM:" ALL_COMP + INIT_STR "+CAMELLIA-128-GCM:+CAMELLIA-256-GCM:" ALL_COMP ":%s:" ALL_MACS ":" ALL_KX ":%s", protocol_str, rest); _gnutls_priority_set_direct(session, prio_str); |