[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  9a931208d7fc8a3596dda005cdbd6439938f01b0 (commit)
      from  41fe7d2380617da515581503490f1467ee75a521 (commit)


- Log -----------------------------------------------------------------
commit 9a931208d7fc8a3596dda005cdbd6439938f01b0
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Jun 16 14:17:24 2015 -0400

    Fix building with OPENSSL_NO_TLSEXT.
    
    Builds using no-tlsext in 1.0.0 and 0.9.8 are broken. This commit fixes the
    issue. The same commit is applied to 1.0.1 and 1.0.2 branches for code
    consistency. However this commit will not fix no-tlsext in those branches
    which have always been broken for other reasons. The commit is not applied
    to master at all, because no-tlsext has been completely removed from that
    branch.
    
    Based on a patch by Marc Branchaud <marcnarc at xiplink.com>
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

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

Summary of changes:
 ssl/ssl_sess.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 07e7379..68390d3 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -256,8 +256,8 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket)
     dest->tlsext_ecpointformatlist = NULL;
     dest->tlsext_ellipticcurvelist = NULL;
 # endif
-#endif
     dest->tlsext_tick = NULL;
+#endif
 #ifndef OPENSSL_NO_SRP
     dest->srp_username = NULL;
 #endif
@@ -324,7 +324,6 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket)
             goto err;
     }
 # endif
-#endif
 
     if (ticket != 0) {
         dest->tlsext_tick = BUF_memdup(src->tlsext_tick, src->tlsext_ticklen);
@@ -334,6 +333,7 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket)
         dest->tlsext_tick_lifetime_hint = 0;
         dest->tlsext_ticklen = 0;
     }
+#endif
 
 #ifndef OPENSSL_NO_SRP
     if (src->srp_username) {