summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinoguchi <>2021-09-14 23:07:18 +0000
committerinoguchi <>2021-09-14 23:07:18 +0000
commit157bfef1b05fd44a30fc87e17c41e708407f61f9 (patch)
treeb75bce878047e81d46eb5b61c09b31efa2a11607
parent22a984b3406437c8821498bd4a37de2a664b528c (diff)
downloadopenbsd-157bfef1b05fd44a30fc87e17c41e708407f61f9.tar.gz
openbsd-157bfef1b05fd44a30fc87e17c41e708407f61f9.tar.bz2
openbsd-157bfef1b05fd44a30fc87e17c41e708407f61f9.zip
Avoid typedef redefinitionlibressl-v3.4.0
"typedef struct ssl_st SSL;" is defined in ossl_typ.h. This reverts part of r1.204. ok tb@
-rw-r--r--src/lib/libssl/ssl.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 5ba2b799e4..2c208b098b 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.208 2021/09/10 14:58:44 tb Exp $ */ 1/* $OpenBSD: ssl.h,v 1.209 2021/09/14 23:07:18 inoguchi Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -703,8 +703,6 @@ void SSL_set_psk_use_session_callback(SSL *s, SSL_psk_use_session_cb_func cb);
703#define SSL_MAC_FLAG_READ_MAC_STREAM 1 703#define SSL_MAC_FLAG_READ_MAC_STREAM 1
704#define SSL_MAC_FLAG_WRITE_MAC_STREAM 2 704#define SSL_MAC_FLAG_WRITE_MAC_STREAM 2
705 705
706typedef struct ssl_st SSL;
707
708#if defined(LIBRESSL_INTERNAL) 706#if defined(LIBRESSL_INTERNAL)
709struct ssl_internal_st; 707struct ssl_internal_st;
710 708