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

Set signature algorithm when choosing cipher 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2339)
parent 93a77f9e

ssl/statem/statem_srvr.c

+6 −0
Original line number Diff line number Diff line
@@ -1797,6 +1797,12 @@ WORK_STATE tls_post_process_client_hello(SSL *s, WORK_STATE wst) 
                goto f_err;

            }

            s->s3->tmp.new_cipher = cipher;

            if (!tls_choose_sigalg(s)) {

                al = SSL_AD_HANDSHAKE_FAILURE;

                SSLerr(SSL_F_TLS_POST_PROCESS_CLIENT_HELLO,

                       SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);

                goto f_err;

            }

            /* check whether we should disable session resumption */

            if (s->not_resumable_session_cb != NULL)

                s->session->not_resumable =