From: Matt Caswell <matt@openssl.org>
Date: Mon, 5 Oct 2015 09:21:11 +0000 (+0100)
Subject: Don't depend on SSL structure internals
X-Git-Tag: OpenSSL_1_1_0-pre1~350
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7c8b53571698f32219a912e05bc71df4017094c1;p=oweals%2Fopenssl.git

Don't depend on SSL structure internals

The macros SSL_in_connect_init() and SSL_in_accept_init() inadvertently
depended on SSL structure internals. This fixes it to use public API calls
instead.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 8570f33653..a810da7759 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1007,8 +1007,8 @@ typedef enum {
 
 /* Is the SSL_connection established? */
 # define SSL_get_state(a)                SSL_state(a)
-# define SSL_in_connect_init(a)          (SSL_in_init(a) && !a->server)
-# define SSL_in_accept_init(a)           (SSL_in_init(a) && a->server)
+# define SSL_in_connect_init(a)          (SSL_in_init(a) && !SSL_is_server(a))
+# define SSL_in_accept_init(a)           (SSL_in_init(a) && SSL_is_server(a))
 int SSL_in_init(SSL *s);
 int SSL_in_before(SSL *s);
 int SSL_is_init_finished(SSL *s);