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

Support draft-19 TLS certificate request format 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2918)
parent 51c7d3e8

ssl/statem/statem_clnt.c

+50 −43
Original line number Diff line number Diff line
@@ -2327,85 +2327,91 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt) 
MSG_PROCESS_RETURN tls_process_certificate_request(SSL *s, PACKET *pkt)

{

    int ret = MSG_PROCESS_ERROR;

    int al = -1;

    unsigned int i;

    int al = SSL_AD_DECODE_ERROR;

    size_t i;



    /* Clear certificate validity flags */

    for (i = 0; i < SSL_PKEY_NUM; i++)

        s->s3->tmp.valid_flags[i] = 0;



    if (SSL_IS_TLS13(s)) {

        PACKET reqctx;

        PACKET reqctx, extensions;

        RAW_EXTENSION *rawexts = NULL;



        /* Free and zero certificate types: it is not present in TLS 1.3 */

        OPENSSL_free(s->s3->tmp.ctype);

        s->s3->tmp.ctype = NULL;

        s->s3->tmp.ctype_len = 0;



        /* TODO(TLS1.3) need to process request context, for now ignore */

        if (!PACKET_get_length_prefixed_1(pkt, &reqctx)) {

            SSLerr(SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST,

                   SSL_R_LENGTH_MISMATCH);

            goto err;

        }



        if (!PACKET_get_length_prefixed_2(pkt, &extensions)) {

                SSLerr(SSL_F_TLS_PROCESS_CLIENT_CERTIFICATE, SSL_R_BAD_LENGTH);

                goto err;

        }

        if (!tls_collect_extensions(s, &extensions,

                                    EXT_TLS1_3_CERTIFICATE_REQUEST,

                                    &rawexts, &al, NULL)

            || !tls_parse_all_extensions(s, EXT_TLS1_3_CERTIFICATE_REQUEST,

                                         rawexts, NULL, 0, &al)) {

            OPENSSL_free(rawexts);

            goto err;

        }

        OPENSSL_free(rawexts);

        if (!tls1_process_sigalgs(s)) {

            al = SSL_AD_INTERNAL_ERROR;

            SSLerr(SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST, ERR_R_MALLOC_FAILURE);

            goto err;

        }

    } else {

        PACKET ctypes;



        /* get the certificate types */

        if (!PACKET_get_length_prefixed_1(pkt, &ctypes)) {

            ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);

            SSLerr(SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST,

                   SSL_R_LENGTH_MISMATCH);

            goto err;

        }



        if (!PACKET_memdup(&ctypes, &s->s3->tmp.ctype, &s->s3->tmp.ctype_len)) {

            al = SSL_AD_INTERNAL_ERROR;

            SSLerr(SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST, ERR_R_INTERNAL_ERROR);

            goto err;

        }

    }



        if (SSL_USE_SIGALGS(s)) {

            PACKET sigalgs;



            if (!PACKET_get_length_prefixed_2(pkt, &sigalgs)) {

            ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);

                SSLerr(SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST,

                       SSL_R_LENGTH_MISMATCH);

                goto err;

            }



        /* Clear certificate validity flags */

        for (i = 0; i < SSL_PKEY_NUM; i++)

            s->s3->tmp.valid_flags[i] = 0;

            if (!tls1_save_sigalgs(s, &sigalgs)) {

            ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);

                SSLerr(SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST,

                       SSL_R_SIGNATURE_ALGORITHMS_ERROR);

                goto err;

            }

            if (!tls1_process_sigalgs(s)) {

            ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);

            SSLerr(SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST, ERR_R_MALLOC_FAILURE);

                al = SSL_AD_INTERNAL_ERROR;

                SSLerr(SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST,

                       ERR_R_MALLOC_FAILURE);

                goto err;

            }

        }



        /* get the CA RDNs */

    if (!parse_ca_names(s, pkt, &al)) {

        ssl3_send_alert(s, SSL3_AL_FATAL, al);

        if (!parse_ca_names(s, pkt, &al))

            goto err;

    }



    /* TODO(TLS1.3) need to parse and process extensions, for now ignore */

    if (SSL_IS_TLS13(s)) {

        PACKET reqexts;



        if (!PACKET_get_length_prefixed_2(pkt, &reqexts)) {

            ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);

            SSLerr(SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST,

                   SSL_R_EXT_LENGTH_MISMATCH);

            goto err;

        }

    }



    if (PACKET_remaining(pkt) != 0) {

        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);

        SSLerr(SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST, SSL_R_LENGTH_MISMATCH);

        goto err;

    }
@@ -2416,6 +2422,7 @@ MSG_PROCESS_RETURN tls_process_certificate_request(SSL *s, PACKET *pkt) 
    ret = MSG_PROCESS_CONTINUE_PROCESSING;

    goto done;

 err:

    ssl3_send_alert(s, SSL3_AL_FATAL, al);

    ossl_statem_set_error(s);

 done:

    return ret;

ssl/statem/statem_srvr.c

+15 −15
Original line number Diff line number Diff line
@@ -2499,6 +2499,8 @@ int tls_construct_server_key_exchange(SSL *s, WPACKET *pkt) 


int tls_construct_certificate_request(SSL *s, WPACKET *pkt)

{

    int al = SSL_AD_INTERNAL_ERROR;



    if (SSL_IS_TLS13(s)) {

        /* TODO(TLS1.3) for now send empty request context */

        if (!WPACKET_put_bytes_u8(pkt, 0)) {
@@ -2506,14 +2508,21 @@ int tls_construct_certificate_request(SSL *s, WPACKET *pkt) 
                   ERR_R_INTERNAL_ERROR);

            goto err;

        }

    } else {

        /* get the list of acceptable cert types */

        if (!WPACKET_start_sub_packet_u8(pkt)

            || !ssl3_get_req_cert_type(s, pkt) || !WPACKET_close(pkt)) {



        if (!tls_construct_extensions(s, pkt, EXT_TLS1_3_CERTIFICATE_REQUEST,

                                      NULL, 0, &al)) {

            SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST,

                   ERR_R_INTERNAL_ERROR);

            goto err;

        }

        goto done;

    }



    /* get the list of acceptable cert types */

    if (!WPACKET_start_sub_packet_u8(pkt)

        || !ssl3_get_req_cert_type(s, pkt) || !WPACKET_close(pkt)) {

        SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, ERR_R_INTERNAL_ERROR);

        goto err;

    }



    if (SSL_USE_SIGALGS(s)) {
@@ -2535,20 +2544,11 @@ int tls_construct_certificate_request(SSL *s, WPACKET *pkt) 
        goto err;

    }



    /*

     * TODO(TLS1.3) implement configurable certificate_extensions

     * For now just send zero length extensions.

     */

    if (SSL_IS_TLS13(s) && !WPACKET_put_bytes_u16(pkt, 0)) {

        SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, ERR_R_INTERNAL_ERROR);

        goto err;

    }



 done:

    s->s3->tmp.cert_request = 1;



    return 1;

 err:

    ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);

    ssl3_send_alert(s, SSL3_AL_FATAL, al);

    return 0;

}