Change SSLerror() back to taking two args, with the first one being an SSL *.

Make a table of "function codes" which maps the internal state of the SSL *
to something like a useful name so in a typical error in the connection you
know in what sort of place in the handshake things happened. (instead of
by arcane function name).
Add SSLerrorx() for when we don't have an SSL *
ok jsing@ after us both being prodded by bluhm@ to make it not terrible

1 files changed, 267 insertions, 2 deletions

diff --git a/src/lib/libssl/ssl_err.c b/src/lib/libssl/ssl_err.c
index 525ba2146b..f9e450125b 100644
--- a/src/lib/libssl/ssl_err.c
+++ b/src/lib/libssl/ssl_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_err.c,v 1.32 2017/01/26 10:40:21 beck Exp $ */
+/* $OpenBSD: ssl_err.c,v 1.33 2017/02/07 02:08:38 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -69,8 +69,94 @@
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_SSL,func,0)
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_SSL,0,reason)
 
+/* See SSL_state_func_code below */
 static ERR_STRING_DATA SSL_str_functs[]= {
-        {ERR_FUNC(0xfff), "SSL_internal"},
+        {ERR_FUNC(1),  "CONNECT_CW_FLUSH"},
+        {ERR_FUNC(2),  "CONNECT_CW_CLNT_HELLO"},
+        {ERR_FUNC(3),  "CONNECT_CW_CLNT_HELLO"},
+        {ERR_FUNC(4),  "CONNECT_CR_SRVR_HELLO"},
+        {ERR_FUNC(5),  "CONNECT_CR_SRVR_HELLO"},
+        {ERR_FUNC(6),  "CONNECT_CR_CERT"},
+        {ERR_FUNC(7),  "CONNECT_CR_CERT"},
+        {ERR_FUNC(8),  "CONNECT_CR_KEY_EXCH"},
+        {ERR_FUNC(9),  "CONNECT_CR_KEY_EXCH"},
+        {ERR_FUNC(10),  "CONNECT_CR_CERT_REQ"},
+        {ERR_FUNC(11),  "CONNECT_CR_CERT_REQ"},
+        {ERR_FUNC(12),  "CONNECT_CR_SRVR_DONE"},
+        {ERR_FUNC(13),  "CONNECT_CR_SRVR_DONE"},
+        {ERR_FUNC(14),  "CONNECT_CW_CERT"},
+        {ERR_FUNC(15),  "CONNECT_CW_CERT"},
+        {ERR_FUNC(16),  "CONNECT_CW_CERT_C"},
+        {ERR_FUNC(17),  "CONNECT_CW_CERT_D"},
+        {ERR_FUNC(18),  "CONNECT_CW_KEY_EXCH"},
+        {ERR_FUNC(19),  "CONNECT_CW_KEY_EXCH"},
+        {ERR_FUNC(20),  "CONNECT_CW_CERT_VRFY"},
+        {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"},
+        {ERR_FUNC(29),  "CONNECT_CR_CHANGE"},
+        {ERR_FUNC(30),  "CONNECT_CR_FINISHED"},
+        {ERR_FUNC(31),  "CONNECT_CR_FINISHED"},
+        {ERR_FUNC(32),  "CONNECT_CR_SESSION_TICKET"},
+        {ERR_FUNC(33),  "CONNECT_CR_SESSION_TICKET"},
+        {ERR_FUNC(34),  "CONNECT_CR_CERT_STATUS"},
+        {ERR_FUNC(35),  "CONNECT_CR_CERT_STATUS"},
+        {ERR_FUNC(36),  "ACCEPT_SW_FLUSH"},
+        {ERR_FUNC(37),  "ACCEPT_SR_CLNT_HELLO"},
+        {ERR_FUNC(38),  "ACCEPT_SR_CLNT_HELLO"},
+        {ERR_FUNC(39),  "ACCEPT_SR_CLNT_HELLO_C"},
+        {ERR_FUNC(40),  "ACCEPT_SW_HELLO_REQ"},
+        {ERR_FUNC(41),  "ACCEPT_SW_HELLO_REQ"},
+        {ERR_FUNC(42),  "ACCEPT_SW_HELLO_REQ_C"},
+        {ERR_FUNC(43),  "ACCEPT_SW_SRVR_HELLO"},
+        {ERR_FUNC(44),  "ACCEPT_SW_SRVR_HELLO"},
+        {ERR_FUNC(45),  "ACCEPT_SW_CERT"},
+        {ERR_FUNC(46),  "ACCEPT_SW_CERT"},
+        {ERR_FUNC(47),  "ACCEPT_SW_KEY_EXCH"},
+        {ERR_FUNC(48),  "ACCEPT_SW_KEY_EXCH"},
+        {ERR_FUNC(49),  "ACCEPT_SW_CERT_REQ"},
+        {ERR_FUNC(50),  "ACCEPT_SW_CERT_REQ"},
+        {ERR_FUNC(51),  "ACCEPT_SW_SRVR_DONE"},
+        {ERR_FUNC(52),  "ACCEPT_SW_SRVR_DONE"},
+        {ERR_FUNC(53),  "ACCEPT_SR_CERT"},
+        {ERR_FUNC(54),  "ACCEPT_SR_CERT"},
+        {ERR_FUNC(55),  "ACCEPT_SR_KEY_EXCH"},
+        {ERR_FUNC(56),  "ACCEPT_SR_KEY_EXCH"},
+        {ERR_FUNC(57),  "ACCEPT_SR_CERT_VRFY"},
+        {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"},
+        {ERR_FUNC(66),  "ACCEPT_SW_CHANGE"},
+        {ERR_FUNC(67),  "ACCEPT_SW_FINISHED"},
+        {ERR_FUNC(68),  "ACCEPT_SW_FINISHED"},
+        {ERR_FUNC(69),  "ACCEPT_SW_SESSION_TICKET"},
+        {ERR_FUNC(70),  "ACCEPT_SW_SESSION_TICKET"},
+        {ERR_FUNC(71),  "ACCEPT_SW_CERT_STATUS"},
+        {ERR_FUNC(72),  "ACCEPT_SW_CERT_STATUS"},
+        {ERR_FUNC(73),  "ST_BEFORE"},
+        {ERR_FUNC(74),  "ST_ACCEPT"},
+        {ERR_FUNC(75),  "ST_CONNECT"},
+        {ERR_FUNC(76),  "ST_OK"},
+        {ERR_FUNC(77),  "ST_RENEGOTIATE"},
+        {ERR_FUNC(78),  "ST_BEFORE_CONNECT"},
+        {ERR_FUNC(79),  "ST_OK_CONNECT"},
+        {ERR_FUNC(80),  "ST_BEFORE_ACCEPT"},
+        {ERR_FUNC(81),  "ST_OK_ACCEPT"},
+        {ERR_FUNC(83),  "DTLS1_ST_CR_HELLO_VERIFY_REQUEST"},
+        {ERR_FUNC(84),  "DTLS1_ST_CR_HELLO_VERIFY_REQUEST"},
+        {ERR_FUNC(85),  "DTLS1_ST_SW_HELLO_VERIFY_REQUEST"},
+        {ERR_FUNC(86),  "DTLS1_ST_SW_HELLO_VERIFY_REQUEST"},
+        {ERR_FUNC(0xfff),   "(UNKNOWN)SSL_internal"},
         {0, NULL}
 };
 
@@ -402,3 +488,182 @@ SSL_load_error_strings(void)
         ERR_load_SSL_strings();
 #endif
 }
+
+int
+SSL_state_func_code(int state) {
+        switch (state) {
+        case SSL3_ST_CW_FLUSH:
+                return 1;
+        case SSL3_ST_CW_CLNT_HELLO_A:
+                return 2;
+        case SSL3_ST_CW_CLNT_HELLO_B:
+                return 3;
+        case SSL3_ST_CR_SRVR_HELLO_A:
+                return 4;
+        case SSL3_ST_CR_SRVR_HELLO_B:
+                return 5;
+        case SSL3_ST_CR_CERT_A:
+                return 6;
+        case SSL3_ST_CR_CERT_B:
+                return 7;
+        case SSL3_ST_CR_KEY_EXCH_A:
+                return 8;
+        case SSL3_ST_CR_KEY_EXCH_B:
+                return 9;
+        case SSL3_ST_CR_CERT_REQ_A:
+                return 10;
+        case SSL3_ST_CR_CERT_REQ_B:
+                return 11;
+        case SSL3_ST_CR_SRVR_DONE_A:
+                return 12;
+        case SSL3_ST_CR_SRVR_DONE_B:
+                return 13;
+        case SSL3_ST_CW_CERT_A:
+                return 14;
+        case SSL3_ST_CW_CERT_B:
+                return 15;
+        case SSL3_ST_CW_CERT_C:
+                return 16;
+        case SSL3_ST_CW_CERT_D:
+                return 17;
+        case SSL3_ST_CW_KEY_EXCH_A:
+                return 18;
+        case SSL3_ST_CW_KEY_EXCH_B:
+                return 19;
+        case SSL3_ST_CW_CERT_VRFY_A:
+                return 20;
+        case SSL3_ST_CW_CERT_VRFY_B:
+                return 21;
+        case SSL3_ST_CW_CHANGE_A:
+                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:
+                return 27;
+        case SSL3_ST_CR_CHANGE_A:
+                return 28;
+        case SSL3_ST_CR_CHANGE_B:
+                return 29;
+        case SSL3_ST_CR_FINISHED_A:
+                return 30;
+        case SSL3_ST_CR_FINISHED_B:
+                return 31;
+        case SSL3_ST_CR_SESSION_TICKET_A:
+                return 32;
+        case SSL3_ST_CR_SESSION_TICKET_B:
+                return 33;
+        case SSL3_ST_CR_CERT_STATUS_A:
+                return 34;
+        case SSL3_ST_CR_CERT_STATUS_B:
+                return 35;
+        case SSL3_ST_SW_FLUSH:
+                return 36;
+        case SSL3_ST_SR_CLNT_HELLO_A:
+                return 37;
+        case SSL3_ST_SR_CLNT_HELLO_B:
+                return 38;
+        case SSL3_ST_SR_CLNT_HELLO_C:
+                return 39;
+        case SSL3_ST_SW_HELLO_REQ_A:
+                return 40;
+        case SSL3_ST_SW_HELLO_REQ_B:
+                return 41;
+        case SSL3_ST_SW_HELLO_REQ_C:
+                return 42;
+        case SSL3_ST_SW_SRVR_HELLO_A:
+                return 43;
+        case SSL3_ST_SW_SRVR_HELLO_B:
+                return 44;
+        case SSL3_ST_SW_CERT_A:
+                return 45;
+        case SSL3_ST_SW_CERT_B:
+                return 46;
+        case SSL3_ST_SW_KEY_EXCH_A:
+                return 47;
+        case SSL3_ST_SW_KEY_EXCH_B:
+                return 48;
+        case SSL3_ST_SW_CERT_REQ_A:
+                return 49;
+        case SSL3_ST_SW_CERT_REQ_B:
+                return 50;
+        case SSL3_ST_SW_SRVR_DONE_A:
+                return 51;
+        case SSL3_ST_SW_SRVR_DONE_B:
+                return 52;
+        case SSL3_ST_SR_CERT_A:
+                return 53;
+        case SSL3_ST_SR_CERT_B:
+                return 54;
+        case SSL3_ST_SR_KEY_EXCH_A:
+                return 55;
+        case SSL3_ST_SR_KEY_EXCH_B:
+                return 56;
+        case SSL3_ST_SR_CERT_VRFY_A:
+                return 57;
+        case SSL3_ST_SR_CERT_VRFY_B:
+                return 58;
+        case SSL3_ST_SR_CHANGE_A:
+                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:
+                return 64;
+        case SSL3_ST_SW_CHANGE_A:
+                return 65;
+        case SSL3_ST_SW_CHANGE_B:
+                return 66;
+        case SSL3_ST_SW_FINISHED_A:
+                return 67;
+        case SSL3_ST_SW_FINISHED_B:
+                return 68;
+        case SSL3_ST_SW_SESSION_TICKET_A:
+                return 69;
+        case SSL3_ST_SW_SESSION_TICKET_B:
+                return 70;
+        case SSL3_ST_SW_CERT_STATUS_A:
+                return 71;
+        case SSL3_ST_SW_CERT_STATUS_B:
+                return 72;
+        case SSL_ST_BEFORE:
+                return 73;
+        case SSL_ST_ACCEPT:
+                return 74;
+        case SSL_ST_CONNECT:
+                return 75;
+        case SSL_ST_OK:
+                return 76;
+        case SSL_ST_RENEGOTIATE:
+                return 77;
+        case SSL_ST_BEFORE|SSL_ST_CONNECT:
+                return 78;
+        case SSL_ST_OK|SSL_ST_CONNECT:
+                return 79;
+        case SSL_ST_BEFORE|SSL_ST_ACCEPT:
+                return 80;
+        case SSL_ST_OK|SSL_ST_ACCEPT:
+                return 81;
+        case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A:
+                return 83;
+        case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B:
+                return 84;
+        case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A:
+                return 85;
+        case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B:
+                return 86;
+        default:
+                break;
+        }
+        return 0xfff;
+}