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

Rename ssl_set_handshake_header2() 



ssl_set_handshake_header2() was only ever a temporary name while we had
to have ssl_set_handshake_header() for code that hadn't been converted to
WPACKET yet. No code remains that needed that so we can rename it.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent e2726ce6

ssl/d1_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ const SSL3_ENC_METHOD DTLSv1_enc_data = { 
    tls1_export_keying_material,

    SSL_ENC_FLAG_DTLS | SSL_ENC_FLAG_EXPLICIT_IV,

    DTLS1_HM_HEADER_LENGTH,

    dtls1_set_handshake_header2,

    dtls1_set_handshake_header,

    dtls1_close_construct_packet,

    dtls1_handshake_write

};
@@ -62,7 +62,7 @@ const SSL3_ENC_METHOD DTLSv1_2_enc_data = { 
    SSL_ENC_FLAG_DTLS | SSL_ENC_FLAG_EXPLICIT_IV | SSL_ENC_FLAG_SIGALGS

        | SSL_ENC_FLAG_SHA256_PRF | SSL_ENC_FLAG_TLS1_2_CIPHERS,

    DTLS1_HM_HEADER_LENGTH,

    dtls1_set_handshake_header2,

    dtls1_set_handshake_header,

    dtls1_close_construct_packet,

    dtls1_handshake_write

};

ssl/s3_lib.c

+2 −8
Original line number Diff line number Diff line
@@ -2750,7 +2750,7 @@ const SSL3_ENC_METHOD SSLv3_enc_data = { 
             int use_context))ssl_undefined_function,

    0,

    SSL3_HM_HEADER_LENGTH,

    ssl3_set_handshake_header2,

    ssl3_set_handshake_header,

    tls_close_construct_packet,

    ssl3_handshake_write

};
@@ -2777,13 +2777,7 @@ const SSL_CIPHER *ssl3_get_cipher(unsigned int u) 
        return (NULL);

}



/*

 * Temporary name. To be renamed ssl3_set_handshake_header() once all WPACKET

 * conversion is complete. The old ssl3_set_handshake_heder() can be deleted

 * at that point.

 * TODO - RENAME ME

 */

int ssl3_set_handshake_header2(SSL *s, WPACKET *pkt, int htype)

int ssl3_set_handshake_header(SSL *s, WPACKET *pkt, int htype)

{

    /* Set the content type and 3 bytes for the message len */

    if (!WPACKET_put_bytes_u8(pkt, htype)

ssl/ssl_locl.h

+5 −5
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@ typedef struct ssl3_enc_method { 
    /* Handshake header length */

    unsigned int hhlen;

    /* Set the handshake header */

    int (*set_handshake_header2) (SSL *s, WPACKET *pkt, int type);

    int (*set_handshake_header) (SSL *s, WPACKET *pkt, int type);

    /* Close construction of the handshake message */

    int (*close_construct_packet) (SSL *s, WPACKET *pkt);

    /* Write out handshake message */
@@ -1594,8 +1594,8 @@ typedef struct ssl3_enc_method { 
# define SSL_HM_HEADER_LENGTH(s) s->method->ssl3_enc->hhlen

# define ssl_handshake_start(s) \

        (((unsigned char *)s->init_buf->data) + s->method->ssl3_enc->hhlen)

# define ssl_set_handshake_header2(s, pkt, htype) \

        s->method->ssl3_enc->set_handshake_header2((s), (pkt), (htype))

# define ssl_set_handshake_header(s, pkt, htype) \

        s->method->ssl3_enc->set_handshake_header((s), (pkt), (htype))

# define ssl_close_construct_packet(s, pkt) \

        s->method->ssl3_enc->close_construct_packet((s), (pkt))

# define ssl_do_write(s)  s->method->ssl3_enc->do_write(s)
@@ -1899,9 +1899,9 @@ __owur long ssl3_ctx_callback_ctrl(SSL_CTX *s, int cmd, void (*fp) (void)); 
__owur int ssl3_do_change_cipher_spec(SSL *ssl);

__owur long ssl3_default_timeout(void);



__owur int ssl3_set_handshake_header2(SSL *s, WPACKET *pkt, int htype);

__owur int ssl3_set_handshake_header(SSL *s, WPACKET *pkt, int htype);

__owur int tls_close_construct_packet(SSL *s, WPACKET *pkt);

__owur int dtls1_set_handshake_header2(SSL *s, WPACKET *pkt, int htype);

__owur int dtls1_set_handshake_header(SSL *s, WPACKET *pkt, int htype);

__owur int dtls1_close_construct_packet(SSL *s, WPACKET *pkt);

__owur int ssl3_handshake_write(SSL *s);

ssl/statem/statem_clnt.c

+4 −4
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ int tls_construct_client_hello(SSL *s) 
    if (i && ssl_fill_hello_random(s, 0, p, sizeof(s->s3->client_random)) <= 0)

        goto err;



    if (!ssl_set_handshake_header2(s, &pkt, SSL3_MT_CLIENT_HELLO)) {

    if (!ssl_set_handshake_header(s, &pkt, SSL3_MT_CLIENT_HELLO)) {

        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);

        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);

        goto err;
@@ -2469,7 +2469,7 @@ int tls_construct_client_key_exchange(SSL *s) 
        goto err;

    }



    if (!ssl_set_handshake_header2(s, &pkt, SSL3_MT_CLIENT_KEY_EXCHANGE)) {

    if (!ssl_set_handshake_header(s, &pkt, SSL3_MT_CLIENT_KEY_EXCHANGE)) {

        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);

        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);

        goto err;
@@ -2605,7 +2605,7 @@ int tls_construct_client_verify(SSL *s) 
        goto err;

    }



    if (!ssl_set_handshake_header2(s, &pkt, SSL3_MT_CERTIFICATE_VERIFY)) {

    if (!ssl_set_handshake_header(s, &pkt, SSL3_MT_CERTIFICATE_VERIFY)) {

        SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);

        goto err;

    }
@@ -2878,7 +2878,7 @@ int tls_construct_next_proto(SSL *s) 
        goto err;

    }



    if (!ssl_set_handshake_header2(s, &pkt, SSL3_MT_NEXT_PROTO)) {

    if (!ssl_set_handshake_header(s, &pkt, SSL3_MT_NEXT_PROTO)) {

        SSLerr(SSL_F_TLS_CONSTRUCT_NEXT_PROTO, ERR_R_INTERNAL_ERROR);

        goto err;

    }

ssl/statem/statem_dtls.c

+1 −7
Original line number Diff line number Diff line
@@ -1212,13 +1212,7 @@ void dtls1_get_message_header(unsigned char *data, struct hm_header_st *msg_hdr) 
    n2l3(data, msg_hdr->frag_len);

}



/*

 * Temporary name. To be renamed dtls1_set_handshake_header() once all WPACKET

 * conversion is complete. The old dtls1_set_handshake_heder() can be deleted

 * at that point.

 * TODO - RENAME ME

 */

int dtls1_set_handshake_header2(SSL *s, WPACKET *pkt, int htype)

int dtls1_set_handshake_header(SSL *s, WPACKET *pkt, int htype)

{

    unsigned char *header;