summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2018-04-06 13:36:11 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2018-04-06 13:37:26 +0200
commit09b1a08a57d098d1344958d323e75c149f59574e (patch)
tree1c8cb249fd394d15893bc477d1c6b5898e8083b8
parent5242dc17e855eb29e0e373bbf1490dae7a6a667c (diff)
downloadgnutls-09b1a08a57d098d1344958d323e75c149f59574e.tar.gz
fuzz: added PSK traces with TLS1.3
Relates: #359 Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--doc/credentials/psk-passwd.txt1
-rw-r--r--fuzz/gnutls_psk_client_fuzzer.c2
-rw-r--r--fuzz/gnutls_psk_client_fuzzer.in/28d33b4d5e7ad312901c9f51023d2f7ab605f9fabin0 -> 226 bytes
-rw-r--r--fuzz/gnutls_psk_client_fuzzer.in/ceba1e5c0b8c832c25aa750635c62dbfd6a2d4d9bin0 -> 153 bytes
-rw-r--r--fuzz/gnutls_psk_server_fuzzer.c2
-rw-r--r--fuzz/gnutls_psk_server_fuzzer.in/2cbbd4cda870e8340932304add5371a3ac54d4d8bin0 -> 507 bytes
-rw-r--r--fuzz/gnutls_psk_server_fuzzer.in/fd8eed89f313f43f87d4a1e83ab70019ba86fd91bin0 -> 507 bytes
7 files changed, 3 insertions, 2 deletions
diff --git a/doc/credentials/psk-passwd.txt b/doc/credentials/psk-passwd.txt
index 40ac30efac..81b63011e8 100644
--- a/doc/credentials/psk-passwd.txt
+++ b/doc/credentials/psk-passwd.txt
@@ -1 +1,2 @@
jas:9e32cf7786321a828ef7668f09fb35db
+test:8a7759b3f26983c453e448060bde8981
diff --git a/fuzz/gnutls_psk_client_fuzzer.c b/fuzz/gnutls_psk_client_fuzzer.c
index 6af86ee856..fd5a8b5161 100644
--- a/fuzz/gnutls_psk_client_fuzzer.c
+++ b/fuzz/gnutls_psk_client_fuzzer.c
@@ -58,7 +58,7 @@ int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
res = gnutls_credentials_set(session, GNUTLS_CRD_PSK, pcred);
assert(res >= 0);
- res = gnutls_priority_set_direct(session, "NORMAL:-KX-ALL:+ECDHE-PSK:+DHE-PSK:+PSK", NULL);
+ res = gnutls_priority_set_direct(session, "NORMAL:-KX-ALL:+ECDHE-PSK:+DHE-PSK:+PSK:+VERS-TLS1.3", NULL);
assert(res >= 0);
memdata.data = data;
diff --git a/fuzz/gnutls_psk_client_fuzzer.in/28d33b4d5e7ad312901c9f51023d2f7ab605f9fa b/fuzz/gnutls_psk_client_fuzzer.in/28d33b4d5e7ad312901c9f51023d2f7ab605f9fa
new file mode 100644
index 0000000000..4d3ba239fc
--- /dev/null
+++ b/fuzz/gnutls_psk_client_fuzzer.in/28d33b4d5e7ad312901c9f51023d2f7ab605f9fa
Binary files differ
diff --git a/fuzz/gnutls_psk_client_fuzzer.in/ceba1e5c0b8c832c25aa750635c62dbfd6a2d4d9 b/fuzz/gnutls_psk_client_fuzzer.in/ceba1e5c0b8c832c25aa750635c62dbfd6a2d4d9
new file mode 100644
index 0000000000..dd89344a6a
--- /dev/null
+++ b/fuzz/gnutls_psk_client_fuzzer.in/ceba1e5c0b8c832c25aa750635c62dbfd6a2d4d9
Binary files differ
diff --git a/fuzz/gnutls_psk_server_fuzzer.c b/fuzz/gnutls_psk_server_fuzzer.c
index 612259aef7..09476e44b2 100644
--- a/fuzz/gnutls_psk_server_fuzzer.c
+++ b/fuzz/gnutls_psk_server_fuzzer.c
@@ -106,7 +106,7 @@ int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
res = gnutls_credentials_set(session, GNUTLS_CRD_PSK, pcred);
assert(res >= 0);
- res = gnutls_priority_set_direct(session, "NORMAL:-KX-ALL:+ECDHE-PSK:+DHE-PSK:+PSK:+RSA-PSK", NULL);
+ res = gnutls_priority_set_direct(session, "NORMAL:-KX-ALL:+ECDHE-PSK:+DHE-PSK:+PSK:+RSA-PSK:+VERS-TLS1.3", NULL);
assert(res >= 0);
memdata.data = data;
diff --git a/fuzz/gnutls_psk_server_fuzzer.in/2cbbd4cda870e8340932304add5371a3ac54d4d8 b/fuzz/gnutls_psk_server_fuzzer.in/2cbbd4cda870e8340932304add5371a3ac54d4d8
new file mode 100644
index 0000000000..850b5de6a0
--- /dev/null
+++ b/fuzz/gnutls_psk_server_fuzzer.in/2cbbd4cda870e8340932304add5371a3ac54d4d8
Binary files differ
diff --git a/fuzz/gnutls_psk_server_fuzzer.in/fd8eed89f313f43f87d4a1e83ab70019ba86fd91 b/fuzz/gnutls_psk_server_fuzzer.in/fd8eed89f313f43f87d4a1e83ab70019ba86fd91
new file mode 100644
index 0000000000..00ccf5ae50
--- /dev/null
+++ b/fuzz/gnutls_psk_server_fuzzer.in/fd8eed89f313f43f87d4a1e83ab70019ba86fd91
Binary files differ