From 91c389f89015a024212e73f5ec6e24166955ab6e Mon Sep 17 00:00:00 2001
From: beck <>
Date: Tue, 7 Feb 2017 02:08:38 +0000
Subject: 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

---
 src/lib/libssl/ssl_locl.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/lib/libssl/ssl_locl.h')

diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 1ce9350ba6..a64edd2c18 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.172 2017/01/26 10:40:21 beck Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.173 2017/02/07 02:08:38 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1367,8 +1367,11 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char *md_out,
     const unsigned char *data, size_t data_plus_mac_size,
     size_t data_plus_mac_plus_padding_size, const unsigned char *mac_secret,
     unsigned mac_secret_length);
+int SSL_state_func_code(int _state);
 
-#define SSLerror(r)  ERR_PUT_error(ERR_LIB_SSL,(0xfff),(r),__FILE__,__LINE__)
+#define SSLerror(s, r)  ERR_PUT_error(ERR_LIB_SSL,			\
+    (SSL_state_func_code(s->internal->state)),(r),__FILE__,__LINE__)
+#define SSLerrorx(r) ERR_PUT_error(ERR_LIB_SSL,(0xfff),(r),__FILE__,__LINE__)
 
 __END_HIDDEN_DECLS
 
-- 
cgit v1.2.3-55-g6feb