diff options
author | jsing <> | 2018-02-08 11:31:00 +0000 |
---|---|---|
committer | jsing <> | 2018-02-08 11:31:00 +0000 |
commit | 355350dab91070021a1c64cd51ef05aec5acf2fd (patch) | |
tree | 0068a4ae5ac75abaaecf28dcbee76c9b7169a6b1 | |
parent | 229ae49ead0f79b4527f210ea8576c4bd87866e0 (diff) | |
download | openbsd-355350dab91070021a1c64cd51ef05aec5acf2fd.tar.gz openbsd-355350dab91070021a1c64cd51ef05aec5acf2fd.tar.bz2 openbsd-355350dab91070021a1c64cd51ef05aec5acf2fd.zip |
Update regress to use tlsext_serverhello_parse().
-rw-r--r-- | src/regress/lib/libssl/unit/tls_ext_alpn.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/regress/lib/libssl/unit/tls_ext_alpn.c b/src/regress/lib/libssl/unit/tls_ext_alpn.c index df46b73a06..7dec1bfc51 100644 --- a/src/regress/lib/libssl/unit/tls_ext_alpn.c +++ b/src/regress/lib/libssl/unit/tls_ext_alpn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls_ext_alpn.c,v 1.4 2018/01/27 15:30:43 jsing Exp $ */ | 1 | /* $OpenBSD: tls_ext_alpn.c,v 1.5 2018/02/08 11:31:00 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2015 Doug Hogan <doug@openbsd.org> | 3 | * Copyright (c) 2015 Doug Hogan <doug@openbsd.org> |
4 | * | 4 | * |
@@ -317,15 +317,13 @@ static uint8_t proto_invalid_missing9[] = { | |||
317 | 317 | ||
318 | #define CHECK_BOTH(c_val, s_val, proto) do { \ | 318 | #define CHECK_BOTH(c_val, s_val, proto) do { \ |
319 | { \ | 319 | { \ |
320 | unsigned char *p; \ | ||
321 | CBS cbs; \ | 320 | CBS cbs; \ |
322 | int al; \ | 321 | int al; \ |
323 | \ | 322 | \ |
324 | CBS_init(&cbs, proto, sizeof(proto)); \ | 323 | CBS_init(&cbs, proto, sizeof(proto)); \ |
325 | CHECK(c_val == tlsext_clienthello_parse(s, &cbs, &al)); \ | 324 | CHECK(c_val == tlsext_clienthello_parse(s, &cbs, &al)); \ |
326 | p = proto; \ | 325 | CBS_init(&cbs, proto, sizeof(proto)); \ |
327 | CHECK(s_val == ssl_parse_serverhello_tlsext(s, &p, \ | 326 | CHECK(s_val == tlsext_serverhello_parse(s, &cbs, &al)); \ |
328 | sizeof(proto), &al)); \ | ||
329 | } \ | 327 | } \ |
330 | } while (0) | 328 | } while (0) |
331 | 329 | ||