[openssl-commits] [openssl] OpenSSL_1_0_0-stable update

[Matt Caswell]

The branch OpenSSL_1_0_0-stable has been updated
       via  6ee4fc4853bda4b9163e18dadc797a870daa4519 (commit)
      from  b4a99d8ad728f5a592bacae565d1c3cf50982731 (commit)


- Log -----------------------------------------------------------------
commit 6ee4fc4853bda4b9163e18dadc797a870daa4519
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>
    (cherry picked from commit 9a931208d7fc8a3596dda005cdbd6439938f01b0)
    
    Conflicts:
    	ssl/ssl_sess.c

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

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 9fcb632..968f27f 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -253,8 +253,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
     memset(&dest->ex_data, 0, sizeof(dest->ex_data));
 
     /* We deliberately don't copy the prev and next pointers */
@@ -318,7 +318,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);
@@ -328,6 +327,7 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket)
         dest->tlsext_tick_lifetime_hint = 0;
         dest->tlsext_ticklen = 0;
     }
+#endif
 
     return dest;
 err: