From: Matt Caswell <matt@openssl.org>
Date: Thu, 29 Sep 2016 17:08:34 +0000 (+0100)
Subject: Remove the tls12_get_sigandhash_old() function
X-Git-Tag: OpenSSL_1_1_1-pre1~3408
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=42cde22f487773d6baba4374f1f2cf5793ce0606

Remove the tls12_get_sigandhash_old() function

This is no longer needed now that all messages use WPACKET

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index a1b3e3d355..bad9ff72df 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -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);
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index e2e5f6025e..69a472be15 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -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));