[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  4b1fa408b299ed19edba0828109ed93ac1d5322f (commit)
      from  cf926b4563165c92b09ec7854d054e618b80de4c (commit)


- Log -----------------------------------------------------------------
commit 4b1fa408b299ed19edba0828109ed93ac1d5322f
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Tue Jan 12 14:03:30 2016 -0500

    STACK_OF(SSL_COMP) is a public type
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/ssl.h | 2 ++
 ssl/ssl_locl.h        | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index b6ba59b..ec4adc4 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -325,8 +325,10 @@ typedef struct ssl_cipher_st SSL_CIPHER;
 typedef struct ssl_session_st SSL_SESSION;
 typedef struct tls_sigalgs_st TLS_SIGALGS;
 typedef struct ssl_conf_ctx_st SSL_CONF_CTX;
+typedef struct ssl_comp_st SSL_COMP;
 
 DEFINE_STACK_OF_CONST(SSL_CIPHER)
+DEFINE_STACK_OF(SSL_COMP)
 
 /* SRTP protection profiles for use with the use_srtp extension (RFC 5764)*/
 typedef struct srtp_protection_profile_st {
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index a490cd3..c222a7d 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -685,15 +685,12 @@ typedef struct srp_ctx_st {
 
 # endif
 
-typedef struct ssl_comp_st SSL_COMP;
-
 struct ssl_comp_st {
     int id;
     const char *name;
     COMP_METHOD *method;
 };
 
-DEFINE_STACK_OF(SSL_COMP)
 DEFINE_LHASH_OF(SSL_SESSION);