Fix building with OPENSSL_NO_TLSEXT.
authorMatt Caswell <matt@openssl.org>
Tue, 16 Jun 2015 18:17:24 +0000 (14:17 -0400)
committerMatt Caswell <matt@openssl.org>
Tue, 1 Sep 2015 23:16:30 +0000 (00:16 +0100)
commit27bc0555aa4f5f95a54bef79ecc20b0655bb6451
tree95404d6a51b7b5c71ff6efe4a698f9ec11adda8f
parent1cbe0ff56900126fbf67ff03b1fd2e84c2a61f69
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: Emilia Käsper <emilia@openssl.org>
(cherry picked from commit 9a931208d7fc8a3596dda005cdbd6439938f01b0)

Conflicts:
ssl/ssl_sess.c
ssl/ssl_sess.c