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:12:26 +0000 (00:12 +0100)
commit6ee4fc4853bda4b9163e18dadc797a870daa4519
tree401a20be2626bbd3a14ddeac6079cddde4ddebac
parentb4a99d8ad728f5a592bacae565d1c3cf50982731
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