diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2017-08-28 17:36:59 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2017-08-28 17:36:59 +0000 |
| commit | c96c2afdc5ae43206d9b336c9ab7a949e0eb2393 (patch) | |
| tree | fd23099504836440cd0764d6d5fc8383cad70e6b /lib/libssl/ssl_err.c | |
| parent | cc46e4d0077494fd3c6f7675ebe8e61808e46d22 (diff) | |
Completely remove NPN remnants.
Based on a diff from doug@, similar diff from inoguchi@
Diffstat (limited to 'lib/libssl/ssl_err.c')
| -rw-r--r-- | lib/libssl/ssl_err.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/libssl/ssl_err.c b/lib/libssl/ssl_err.c index d61660c934d..db3c1a0d2db 100644 --- a/lib/libssl/ssl_err.c +++ b/lib/libssl/ssl_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_err.c,v 1.34 2017/05/07 04:22:24 beck Exp $ */ +/* $OpenBSD: ssl_err.c,v 1.35 2017/08/28 17:36:58 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -96,8 +96,6 @@ static ERR_STRING_DATA SSL_str_functs[]= { {ERR_FUNC(21), "CONNECT_CW_CERT_VRFY"}, {ERR_FUNC(22), "CONNECT_CW_CHANGE"}, {ERR_FUNC(23), "CONNECT_CW_CHANGE"}, - {ERR_FUNC(24), "CONNECT_CW_NEXT_PROTO"}, - {ERR_FUNC(25), "CONNECT_CW_NEXT_PROTO"}, {ERR_FUNC(26), "CONNECT_CW_FINISHED"}, {ERR_FUNC(27), "CONNECT_CW_FINISHED"}, {ERR_FUNC(28), "CONNECT_CR_CHANGE"}, @@ -133,8 +131,6 @@ static ERR_STRING_DATA SSL_str_functs[]= { {ERR_FUNC(58), "ACCEPT_SR_CERT_VRFY"}, {ERR_FUNC(59), "ACCEPT_SR_CHANGE"}, {ERR_FUNC(60), "ACCEPT_SR_CHANGE"}, - {ERR_FUNC(61), "ACCEPT_SR_NEXT_PROTO"}, - {ERR_FUNC(62), "ACCEPT_SR_NEXT_PROTO"}, {ERR_FUNC(63), "ACCEPT_SR_FINISHED"}, {ERR_FUNC(64), "ACCEPT_SR_FINISHED"}, {ERR_FUNC(65), "ACCEPT_SW_CHANGE"}, @@ -540,10 +536,6 @@ SSL_state_func_code(int state) { return 22; case SSL3_ST_CW_CHANGE_B: return 23; - case SSL3_ST_CW_NEXT_PROTO_A: - return 24; - case SSL3_ST_CW_NEXT_PROTO_B: - return 25; case SSL3_ST_CW_FINISHED_A: return 26; case SSL3_ST_CW_FINISHED_B: @@ -614,10 +606,6 @@ SSL_state_func_code(int state) { return 59; case SSL3_ST_SR_CHANGE_B: return 60; - case SSL3_ST_SR_NEXT_PROTO_A: - return 61; - case SSL3_ST_SR_NEXT_PROTO_B: - return 62; case SSL3_ST_SR_FINISHED_A: return 63; case SSL3_ST_SR_FINISHED_B: |