diff options
author | Daiki Ueno <ueno@gnu.org> | 2021-08-10 12:26:04 +0000 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2021-08-10 12:26:04 +0000 |
commit | 8c14abad0210ae961dff9553c1872fc35e88e0d0 (patch) | |
tree | 91e54c6b87ad5e5ee02550901309a45d2ee0b1df /tests | |
parent | 778b9ae1060a8ddffe3049618629cd525104afb0 (diff) | |
parent | f23c3a6cba43706a6ebb3f9b0018cd658dcc0a72 (diff) | |
download | gnutls-8c14abad0210ae961dff9553c1872fc35e88e0d0.tar.gz |
Merge branch 'wip/dueno/asan-poisoning' into 'master'
mem: instrument with ASan memory poisoning as well as valgrind
Closes #1260
See merge request gnutls/gnutls!1458
Diffstat (limited to 'tests')
-rw-r--r-- | tests/session-export-funcs.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/tests/session-export-funcs.c b/tests/session-export-funcs.c index 5bf8201611..579c9d6005 100644 --- a/tests/session-export-funcs.c +++ b/tests/session-export-funcs.c @@ -156,19 +156,21 @@ void start(const char *prio) memset(&v1, 0, sizeof(v1)); memset(&v2, 0, sizeof(v2)); - /* check master secret */ - gnutls_session_get_master_secret(server, &v1); - if (v1.size <= 0) { - fail("error in server's master secret\n"); - } - - gnutls_session_get_master_secret(client, &v2); - if (v2.size <= 0) { - fail("error in client's master secret\n"); - } - - if (v1.size != v2.size || memcmp(v1.data, v2.data, v1.size) != 0) { - fail("master secret don't match!\n"); + if (gnutls_protocol_get_version(client) != GNUTLS_TLS1_3) { + /* check master secret */ + gnutls_session_get_master_secret(server, &v1); + if (v1.size <= 0) { + fail("error in server's master secret\n"); + } + + gnutls_session_get_master_secret(client, &v2); + if (v2.size <= 0) { + fail("error in client's master secret\n"); + } + + if (v1.size != v2.size || memcmp(v1.data, v2.data, v1.size) != 0) { + fail("master secret don't match!\n"); + } } gnutls_bye(client, GNUTLS_SHUT_RDWR); |