The branch master has been updated via d162340d367d7a74916106d8706c6b22adb727c2 (commit) from 03cdf559145bff263692c9516cac3c6456c77f2c (commit)
- Log ----------------------------------------------------------------- commit d162340d367d7a74916106d8706c6b22adb727c2 Author: Matt Caswell <m...@openssl.org> Date: Mon Jul 16 17:31:37 2018 +0100 Fix no-psk Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6724) ----------------------------------------------------------------------- Summary of changes: ssl/statem/statem_lib.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c index 0d8fe5d..6262a06 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++) { _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits