Commit fe5eef3a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Disable all PSK if no callback. 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 332a251f

ssl/s3_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

        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 */

ssl/t1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ void ssl_set_client_disabled(SSL *s) 
    /* with PSK there must be client callback set */

    if (!s->psk_client_callback) {

        s->s3->tmp.mask_a |= SSL_aPSK;

        s->s3->tmp.mask_k |= SSL_kPSK;

        s->s3->tmp.mask_k |= SSL_PSK;

    }

#endif                         /* OPENSSL_NO_PSK */

#ifndef OPENSSL_NO_SRP