summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2018-01-27 15:30:43 +0000
committerjsing <>2018-01-27 15:30:43 +0000
commit9995aadc83fe5c1fdcdabd24dec09d459ebe9a6a (patch)
tree09f96c92e3d3589f6e89833aebf0ac83b068b295
parent7e9d176210d3d878a8e83ab3e422f4bf370711e6 (diff)
downloadopenbsd-9995aadc83fe5c1fdcdabd24dec09d459ebe9a6a.tar.gz
openbsd-9995aadc83fe5c1fdcdabd24dec09d459ebe9a6a.tar.bz2
openbsd-9995aadc83fe5c1fdcdabd24dec09d459ebe9a6a.zip
Update regress to match removal of ssl_parse_clienthello_tlsext().
-rw-r--r--src/regress/lib/libssl/unit/tls_ext_alpn.c13
1 files changed, 8 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 7fd7afac5a..df46b73a06 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.3 2017/01/22 08:19:36 jsing Exp $ */ 1/* $OpenBSD: tls_ext_alpn.c,v 1.4 2018/01/27 15:30:43 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2015 Doug Hogan <doug@openbsd.org> 3 * Copyright (c) 2015 Doug Hogan <doug@openbsd.org>
4 * 4 *
@@ -22,6 +22,7 @@
22#include <openssl/ssl.h> 22#include <openssl/ssl.h>
23 23
24#include "ssl_locl.h" 24#include "ssl_locl.h"
25#include "ssl_tlsext.h"
25 26
26#include "tests.h" 27#include "tests.h"
27 28
@@ -314,12 +315,14 @@ static uint8_t proto_invalid_missing9[] = {
314}; 315};
315 316
316 317
317#define CHECK_BOTH(c_val,s_val,proto) do { \ 318#define CHECK_BOTH(c_val, s_val, proto) do { \
318 { \ 319 { \
319 unsigned char *p = proto; \ 320 unsigned char *p; \
321 CBS cbs; \
320 int al; \ 322 int al; \
321 CHECK(c_val == ssl_parse_clienthello_tlsext(s, &p, \ 323 \
322 proto, sizeof(proto), &al)); \ 324 CBS_init(&cbs, proto, sizeof(proto)); \
325 CHECK(c_val == tlsext_clienthello_parse(s, &cbs, &al)); \
323 p = proto; \ 326 p = proto; \
324 CHECK(s_val == ssl_parse_serverhello_tlsext(s, &p, \ 327 CHECK(s_val == ssl_parse_serverhello_tlsext(s, &p, \
325 sizeof(proto), &al)); \ 328 sizeof(proto), &al)); \