Disable all PSK if no callback.

[openssl.git] / ssl / s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 8b7c52af52699704e8ce0c7a5efa0dd96e28f059..60465804207dd5e62d9823d4eb54899504356da0 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3933,7 +3933,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
 
 #ifndef OPENSSL_NO_PSK
         /* with PSK there must be server callback set */
 
 #ifndef OPENSSL_NO_PSK
         /* with PSK there must be server callback set */

-        if ((alg_k & SSL_kPSK) && s->psk_server_callback == NULL)
+        if ((alg_k & SSL_PSK) && s->psk_server_callback == NULL)

             continue;
 #endif                          /* OPENSSL_NO_PSK */
 
             continue;
 #endif                          /* OPENSSL_NO_PSK */