From: Matt Caswell <matt@openssl.org>
Date: Thu, 29 Sep 2016 13:26:36 +0000 (+0100)
Subject: Remove tls12_copy_sigalgs_old()
X-Git-Tag: OpenSSL_1_1_1-pre1~3432
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ac8cc3efb26fa91c4f29463044cfe9e7070ebc14;p=oweals%2Fopenssl.git

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: Rich Salz <rsalz@openssl.org>
---

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 4fbea50a31..a1b3e3d355 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -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);
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 230fe66da4..e2e5f6025e 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -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)
 {