From 1d0cc834451b4755c527bc53d1795af2faf9e777 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Wed, 22 Jan 2020 07:49:33 +0000
Subject: Move guards from public to internal headers, and fix not use values.

reverts previous attempt which would have broken ports

ok jsing@
---
 src/lib/libssl/ssl.h      | 8 +-------
 src/lib/libssl/ssl_locl.h | 7 ++++++-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 012556fa71..39aa25356c 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.169 2020/01/22 01:21:43 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.170 2020/01/22 07:49:33 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -167,12 +167,6 @@
 extern "C" {
 #endif
 
-#if defined(LIBRESSL_HAS_TLS1_3_CLIENT) || defined(LIBRESSL_HAS_TLS1_3_SERVER)
-#define LIBRESSL_HAS_TLS1_3 1
-#else
-#define LIBRESSL_HAS_TLS1_3 0
-#endif
-
 /* SSLeay version number for ASN.1 encoding of the session information */
 /* Version 0 - initial version
  * Version 1 - added the optional peer certificate
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index f9c75f8a7f..6016b4f984 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.248 2019/11/17 19:07:07 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.249 2020/01/22 07:49:33 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -186,6 +186,11 @@ __BEGIN_HIDDEN_DECLS
 #define s2n(s,c)	((c[0]=(unsigned char)(((s)>> 8)&0xff), \
 			  c[1]=(unsigned char)(((s)    )&0xff)),c+=2)
 
+/* #define LIBRESSL_HAS_TLS1_3_CLIENT */
+#if defined(LIBRESSL_HAS_TLS1_3_CLIENT) || defined(LIBRESSL_HAS_TLS1_3_SERVER)
+#define LIBRESSL_HAS_TLS1_3
+#endif
+
 /* LOCAL STUFF */
 
 #define SSL_DECRYPT	0
-- 
cgit v1.2.3-55-g6feb