From: tb <tb@openbsd.org>
Date: Mon, 10 May 2021 17:10:57 +0000 (+0000)
Subject: Make SSL_CIPHER, SSL_CTX, SSL_SESSION, {DTLS1,SSL3}_STATE
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=34c047d7b1c4975b436412932f91ac29aed6667b;p=openbsd

Make SSL_CIPHER, SSL_CTX, SSL_SESSION, {DTLS1,SSL3}_STATE
and a few other structs in libssl opaque.

from/ok jsing
---

diff --git a/lib/libssl/dtls1.h b/lib/libssl/dtls1.h
index fe8c5864dd9..624df2479b9 100644
--- a/lib/libssl/dtls1.h
+++ b/lib/libssl/dtls1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dtls1.h,v 1.25 2021/03/31 16:59:32 tb Exp $ */
+/* $OpenBSD: dtls1.h,v 1.26 2021/05/10 17:10:57 tb Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -91,8 +91,7 @@ extern "C" {
 
 #define DTLS1_AL_HEADER_LENGTH                   2
 
-#ifndef OPENSSL_NO_SSL_INTERN
-
+#ifdef LIBRESSL_INTERNAL
 
 typedef struct dtls1_bitmap_st {
 	unsigned long map;		/* track 32 packets on 32-bit systems
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index 987d06ee044..571143040c3 100644
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.189 2021/05/10 17:07:23 tb Exp $ */
+/* $OpenBSD: ssl.h,v 1.190 2021/05/10 17:10:57 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -377,7 +377,7 @@ typedef int (*tls_session_ticket_ext_cb_fn)(SSL *s, const unsigned char *data,
 typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len,
     STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg);
 
-#ifndef OPENSSL_NO_SSL_INTERN
+#ifdef LIBRESSL_INTERNAL
 
 /* used to hold info on the particular ciphers used */
 struct ssl_cipher_st {
@@ -639,7 +639,7 @@ typedef int (*GEN_SESSION_CB)(const SSL *ssl, unsigned char *id,
 
 typedef struct ssl_comp_st SSL_COMP;
 
-#ifndef OPENSSL_NO_SSL_INTERN
+#ifdef LIBRESSL_INTERNAL
 
 struct ssl_comp_st {
 	int id;
diff --git a/lib/libssl/ssl3.h b/lib/libssl/ssl3.h
index fc40c20d6ce..631f8dee235 100644
--- a/lib/libssl/ssl3.h
+++ b/lib/libssl/ssl3.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl3.h,v 1.52 2021/05/02 18:10:32 tb Exp $ */
+/* $OpenBSD: ssl3.h,v 1.53 2021/05/10 17:10:57 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -355,7 +355,7 @@ typedef struct ssl3_buffer_st {
 #define TLS1_FLAGS_FREEZE_TRANSCRIPT		0x0020
 #define SSL3_FLAGS_CCS_OK			0x0080
 
-#ifndef OPENSSL_NO_SSL_INTERN
+#ifdef LIBRESSL_INTERNAL
 
 struct ssl3_state_internal_st;