diff options
| author | Matt Caswell <matt@openssl.org> | 2018-07-16 17:31:37 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-07-17 11:07:22 +0100 |
| commit | d162340d367d7a74916106d8706c6b22adb727c2 (patch) | |
| tree | 6e15576757771497947d91c6e1e32ff37288a96a /ssl/statem/statem_lib.c | |
| parent | 03cdf559145bff263692c9516cac3c6456c77f2c (diff) | |
Fix no-psk
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6724)
Diffstat (limited to 'ssl/statem/statem_lib.c')
| -rw-r--r-- | ssl/statem/statem_lib.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c index 0d8fe5d912..6262a068c2 100644 --- a/ssl/statem/statem_lib.c +++ b/ssl/statem/statem_lib.c @@ -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++) { |