Commit f69fe73a authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix more alert codes 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3436)
parent ef57a475

ssl/statem/extensions_clnt.c

+5 −5
Original line number Diff line number Diff line
@@ -1312,7 +1312,7 @@ int tls_parse_stoc_key_share(SSL *s, PACKET *pkt, unsigned int context, X509 *x, 
    }



    if (!PACKET_get_net_2(pkt, &group_id)) {

        *al = SSL_AD_HANDSHAKE_FAILURE;

        *al = SSL_AD_DECODE_ERROR;

        SSLerr(SSL_F_TLS_PARSE_STOC_KEY_SHARE, SSL_R_LENGTH_MISMATCH);

        return 0;

    }
@@ -1322,7 +1322,7 @@ int tls_parse_stoc_key_share(SSL *s, PACKET *pkt, unsigned int context, X509 *x, 
        size_t i, num_curves;



        if (PACKET_remaining(pkt) != 0) {

            *al = SSL_AD_HANDSHAKE_FAILURE;

            *al = SSL_AD_DECODE_ERROR;

            SSLerr(SSL_F_TLS_PARSE_STOC_KEY_SHARE, SSL_R_LENGTH_MISMATCH);

            return 0;

        }
@@ -1364,7 +1364,7 @@ int tls_parse_stoc_key_share(SSL *s, PACKET *pkt, unsigned int context, X509 *x, 
         * This isn't for the group that we sent in the original

         * key_share!

         */

        *al = SSL_AD_HANDSHAKE_FAILURE;

        *al = SSL_AD_ILLEGAL_PARAMETER;

        SSLerr(SSL_F_TLS_PARSE_STOC_KEY_SHARE, SSL_R_BAD_KEY_SHARE);

        return 0;

    }
@@ -1465,13 +1465,13 @@ int tls_parse_stoc_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, 
    unsigned int identity;



    if (!PACKET_get_net_2(pkt, &identity) || PACKET_remaining(pkt) != 0) {

        *al = SSL_AD_HANDSHAKE_FAILURE;

        *al = SSL_AD_DECODE_ERROR;

        SSLerr(SSL_F_TLS_PARSE_STOC_PSK, SSL_R_LENGTH_MISMATCH);

        return 0;

    }



    if (s->session->ext.tick_identity != (int)identity) {

        *al = SSL_AD_HANDSHAKE_FAILURE;

        *al = SSL_AD_ILLEGAL_PARAMETER;

        SSLerr(SSL_F_TLS_PARSE_STOC_PSK, SSL_R_BAD_PSK_IDENTITY);

        return 0;

    }

ssl/statem/statem_clnt.c

+1 −1
Original line number Diff line number Diff line
@@ -1787,7 +1787,7 @@ MSG_PROCESS_RETURN tls_process_server_certificate(SSL *s, PACKET *pkt) 


    if (pkey == NULL || EVP_PKEY_missing_parameters(pkey)) {

        x = NULL;

        al = SSL3_AL_FATAL;

        al = SSL_AD_INTERNAL_ERROR;

        SSLerr(SSL_F_TLS_PROCESS_SERVER_CERTIFICATE,

               SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);

        goto f_err;