diff options
| author |   jsing <jsing@openbsd.org> | 2019-02-03 14:03:46 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2019-02-03 14:03:46 +0000 |
| commit | 89c7562da563c600e81ced5971021e03fb93bd40 (patch) | |
| tree | 37d39375f2c3f66605f8ac440fc06c6d6f8039df | |
| parent | Add mvgicp(4), a driver for the Marvell extension to the GIC that (diff) | |
| download | wireguard-openbsd-89c7562da563c600e81ced5971021e03fb93bd40.tar.xz wireguard-openbsd-89c7562da563c600e81ced5971021e03fb93bd40.zip | |
Use malloc() and memcpy() the test X25519 x25519_peer_public value.
Otherwise, if tlsext_keyshare_server_build() fails we call free with a
pointer to static memory and bad things happen.
Reported by bcook@
| -rw-r--r-- | regress/lib/libssl/tlsext/tlsexttest.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/regress/lib/libssl/tlsext/tlsexttest.c b/regress/lib/libssl/tlsext/tlsexttest.c index d9b048dbfc1..06b855f6bbb 100644 --- a/regress/lib/libssl/tlsext/tlsexttest.c +++ b/regress/lib/libssl/tlsext/tlsexttest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tlsexttest.c,v 1.27 2019/01/24 02:56:41 beck Exp $ */ +/* $OpenBSD: tlsexttest.c,v 1.28 2019/02/03 14:03:46 jsing Exp $ */ /* * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> @@ -3269,13 +3269,16 @@ test_tlsext_keyshare_server(void) goto done; } - S3I(ssl)->hs_tls13.x25519_peer_public = bogokey; + if ((S3I(ssl)->hs_tls13.x25519_peer_public = + malloc(sizeof(bogokey))) == NULL) + errx(1, "malloc failed"); + memcpy(S3I(ssl)->hs_tls13.x25519_peer_public, bogokey, sizeof(bogokey)); + if (!tlsext_keyshare_server_build(ssl, &cbb)) { FAIL("server should be able to build a keyshare response"); failure = 1; goto done; } - S3I(ssl)->hs_tls13.x25519_peer_public = NULL; if (!CBB_finish(&cbb, &data, &dlen)) { FAIL("failed to finish CBB"); |