Fix no-psk

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6724)
This commit is contained in:
Matt Caswell 2018-07-16 17:31:37 +01:00
parent 03cdf55914
commit d162340d36

View File

@ -1493,7 +1493,12 @@ static int is_tls13_capable(const SSL *s)
{
int i;
if (s->psk_server_callback != NULL || s->psk_find_session_cb != NULL)
#ifndef OPENSSL_NO_PSK
if (s->psk_server_callback != NULL)
return 1;
#endif
if (s->psk_find_session_cb != NULL)
return 1;
for (i = 0; i < SSL_PKEY_NUM; i++) {