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

Remove tls12_copy_sigalgs_old() 



This was a temporary function needed during the conversion to WPACKET. All
callers have now been converted to the new way of doing this so this
function is no longer required.

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

ssl/ssl_locl.h

+0 −2
Original line number Diff line number Diff line
@@ -2068,8 +2068,6 @@ __owur int ssl_add_serverhello_renegotiate_ext(SSL *s, WPACKET *pkt); 
__owur int ssl_parse_serverhello_renegotiate_ext(SSL *s, PACKET *pkt, int *al);

__owur int ssl_parse_clienthello_renegotiate_ext(SSL *s, PACKET *pkt, int *al);

__owur long ssl_get_algorithm2(SSL *s);

__owur size_t tls12_copy_sigalgs_old(SSL *s, unsigned char *out,

                                     const unsigned char *psig, size_t psiglen);

__owur int tls12_copy_sigalgs(SSL *s, WPACKET *pkt,

                              const unsigned char *psig, size_t psiglen);

__owur int tls1_save_sigalgs(SSL *s, const unsigned char *data, int dsize);

ssl/t1_lib.c

+0 −20
Original line number Diff line number Diff line
@@ -3320,26 +3320,6 @@ void ssl_set_sig_mask(uint32_t *pmask_a, SSL *s, int op) 
        *pmask_a |= SSL_aECDSA;

}



/*

 * Old version of the tls12_copy_sigalgs 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

 */

size_t tls12_copy_sigalgs_old(SSL *s, unsigned char *out,

                          const unsigned char *psig, size_t psiglen)

{

    unsigned char *tmpout = out;

    size_t i;

    for (i = 0; i < psiglen; i += 2, psig += 2) {

        if (tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SUPPORTED, psig)) {

            *tmpout++ = psig[0];

            *tmpout++ = psig[1];

        }

    }

    return tmpout - out;

}



int tls12_copy_sigalgs(SSL *s, WPACKET *pkt,

                       const unsigned char *psig, size_t psiglen)

{