summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_tlsext.h
diff options
context:
space:
mode:
authorjsing <>2018-02-08 11:30:30 +0000
committerjsing <>2018-02-08 11:30:30 +0000
commit80eca49ce660d22bdfc1eea6731e8af8c5d43030 (patch)
tree9e5cad14fc7d443c7ddd3a3abf5efddfc0546802 /src/lib/libssl/ssl_tlsext.h
parent65ab7356a60597cf0c63882b8ed825bef112e719 (diff)
downloadopenbsd-80eca49ce660d22bdfc1eea6731e8af8c5d43030.tar.gz
openbsd-80eca49ce660d22bdfc1eea6731e8af8c5d43030.tar.bz2
openbsd-80eca49ce660d22bdfc1eea6731e8af8c5d43030.zip
Complete the TLS extension rewrite on the client-side.
The RI logic gets pulled up into ssl3_get_server_hello() and ssl_parse_serverhello_tlsext() gets replaced by tlsext_client_parse(), which allows a CBS to be passed all the way down. This also deduplicates the tlsext_client_build() and tlsext_server_build() code. ok beck@
Diffstat (limited to 'src/lib/libssl/ssl_tlsext.h')
-rw-r--r--src/lib/libssl/ssl_tlsext.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_tlsext.h b/src/lib/libssl/ssl_tlsext.h
index 1af2e6cb3b..4248932fb2 100644
--- a/src/lib/libssl/ssl_tlsext.h
+++ b/src/lib/libssl/ssl_tlsext.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_tlsext.h,v 1.11 2018/01/27 15:30:05 jsing Exp $ */ 1/* $OpenBSD: ssl_tlsext.h,v 1.12 2018/02/08 11:30:30 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> 4 * Copyright (c) 2017 Doug Hogan <doug@openbsd.org>
@@ -85,5 +85,4 @@ int tlsext_clienthello_build(SSL *s, CBB *cbb);
85int tlsext_clienthello_parse(SSL *s, CBS *cbs, int *alert); 85int tlsext_clienthello_parse(SSL *s, CBS *cbs, int *alert);
86 86
87int tlsext_serverhello_build(SSL *s, CBB *cbb); 87int tlsext_serverhello_build(SSL *s, CBB *cbb);
88int tlsext_serverhello_parse_one(SSL *s, CBS *cbs, uint16_t tlsext_type, 88int tlsext_serverhello_parse(SSL *s, CBS *cbs, int *alert);
89 int *alert);