Commit 927f7a87 authored by Matt Caswell's avatar Matt Caswell
Browse files

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@xiplink.com>

Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
(cherry picked from commit 9a931208)
parent 525e1361

ssl/ssl_sess.c

+2 −2
Original line number Diff line number Diff line
@@ -255,9 +255,9 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) 
# ifndef OPENSSL_NO_EC

    dest->tlsext_ecpointformatlist = NULL;

    dest->tlsext_ellipticcurvelist = NULL;

# endif

# endif

    dest->tlsext_tick = NULL;

#endif

#ifndef OPENSSL_NO_SRP

    dest->srp_username = NULL;

#endif
@@ -323,7 +323,6 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) 
        if (dest->tlsext_ellipticcurvelist == NULL)

            goto err;

    }

# endif

# endif



    if (ticket != 0) {
@@ -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) {