summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_srvr.c
diff options
context:
space:
mode:
authorjsing <>2017-01-22 06:36:49 +0000
committerjsing <>2017-01-22 06:36:49 +0000
commit334c9196a27db4244daba48e4ba2118985c535ed (patch)
tree765f88b1c5ef0790c3644c70ffacf8e9a39b9ceb /src/lib/libssl/s3_srvr.c
parent107eff56043a3070d462256dca1675a3db9d9eab (diff)
downloadopenbsd-334c9196a27db4244daba48e4ba2118985c535ed.tar.gz
openbsd-334c9196a27db4244daba48e4ba2118985c535ed.tar.bz2
openbsd-334c9196a27db4244daba48e4ba2118985c535ed.zip
Move ALPN and NPN fields from SSL/SSL_CTX to internal.
ok beck@
Diffstat (limited to 'src/lib/libssl/s3_srvr.c')
-rw-r--r--src/lib/libssl/s3_srvr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 8e3dc11fc1..72d90a85c4 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_srvr.c,v 1.138 2016/12/21 16:44:31 jsing Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.139 2017/01/22 06:36:49 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -2905,15 +2905,15 @@ ssl3_get_next_proto(SSL *s)
2905 * XXX We should not NULL it, but this matches old behavior of not 2905 * XXX We should not NULL it, but this matches old behavior of not
2906 * freeing before malloc. 2906 * freeing before malloc.
2907 */ 2907 */
2908 s->next_proto_negotiated = NULL; 2908 s->internal->next_proto_negotiated = NULL;
2909 s->next_proto_negotiated_len = 0; 2909 s->internal->next_proto_negotiated_len = 0;
2910 2910
2911 if (!CBS_stow(&proto, &s->next_proto_negotiated, &len)) { 2911 if (!CBS_stow(&proto, &s->internal->next_proto_negotiated, &len)) {
2912 SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, 2912 SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,
2913 ERR_R_MALLOC_FAILURE); 2913 ERR_R_MALLOC_FAILURE);
2914 return (0); 2914 return (0);
2915 } 2915 }
2916 s->next_proto_negotiated_len = (uint8_t)len; 2916 s->internal->next_proto_negotiated_len = (uint8_t)len;
2917 2917
2918 return (1); 2918 return (1);
2919} 2919}