From 3b455600d14ddcf2be0dcd2d4765d1b7854cd1c5 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Sun, 7 May 2017 04:22:24 +0000
Subject: Move state from ssl->internal to the handshake structure. while we
 are at it, convert SSLerror to use a function internally, so that we may
 later allocate the handshake structure and check for it ok jsing@

---
 src/lib/libssl/ssl_err.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/lib/libssl/ssl_err.c')

diff --git a/src/lib/libssl/ssl_err.c b/src/lib/libssl/ssl_err.c
index f9e450125b..d61660c934 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.33 2017/02/07 02:08:38 beck Exp $ */
+/* $OpenBSD: ssl_err.c,v 1.34 2017/05/07 04:22:24 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -63,6 +63,8 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
+#include "ssl_locl.h"
+
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 
@@ -667,3 +669,10 @@ SSL_state_func_code(int state) {
 	}
 	return 0xfff;
 }
+
+void
+SSL_error_internal(const SSL *s, int r, char *f, int l)
+{
+	ERR_PUT_error(ERR_LIB_SSL,
+	    (SSL_state_func_code(S3I(s)->hs.state)), r, f, l);
+}
-- 
cgit v1.2.3-55-g6feb