Commit 42cde22f authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove the tls12_get_sigandhash_old() function 



This is no longer needed now that all messages use WPACKET

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

ssl/ssl_locl.h

+0 −2
Original line number Diff line number Diff line
@@ -2037,8 +2037,6 @@ __owur int tls_check_serverhello_tlsext_early(SSL *s, const PACKET *ext, 


__owur int tls12_get_sigandhash(WPACKET *pkt, const EVP_PKEY *pk,

                                const EVP_MD *md);

__owur int tls12_get_sigandhash_old(unsigned char *p, const EVP_PKEY *pk,

                                    const EVP_MD *md);

__owur int tls12_get_sigid(const EVP_PKEY *pk);

__owur const EVP_MD *tls12_get_hash(unsigned char hash_alg);

void ssl_set_sig_mask(uint32_t *pmask_a, SSL *s, int op);

ssl/t1_lib.c

+0 −23
Original line number Diff line number Diff line
@@ -3132,29 +3132,6 @@ int tls12_get_sigandhash(WPACKET *pkt, const EVP_PKEY *pk, const EVP_MD *md) 
    return 1;

}



/*

 * Old version of the tls12_get_sigandhash function used by code that has not

 * yet been converted to WPACKET yet. It will be deleted once WPACKET conversion

 * is complete.

 * TODO - DELETE ME

 */

int tls12_get_sigandhash_old(unsigned char *p, const EVP_PKEY *pk,

                             const EVP_MD *md)

{

    int sig_id, md_id;

    if (!md)

        return 0;

    md_id = tls12_find_id(EVP_MD_type(md), tls12_md, OSSL_NELEM(tls12_md));

    if (md_id == -1)

        return 0;

    sig_id = tls12_get_sigid(pk);

    if (sig_id == -1)

        return 0;

    p[0] = (unsigned char)md_id;

    p[1] = (unsigned char)sig_id;

    return 1;

}



int tls12_get_sigid(const EVP_PKEY *pk)

{

    return tls12_find_id(EVP_PKEY_id(pk), tls12_sig, OSSL_NELEM(tls12_sig));