Rewrite obj_xref.c

Instead of having two unreadable tables placed in a header generated by a
janky perl script from an ugly text file, use a single table inlined in
the C file. This table is used to translate between signature algorithm
OIDs and pairs of OIDs of a message digest and a cipher. The table has
fewer than fifty entries and isn't used in a hot path. Using binary search
is overkill. Just do two linear searches, one for each translation. None
of the original code remains apart from the API.

ok jsing

1 files changed, 291 insertions, 125 deletions

diff --git a/src/lib/libcrypto/objects/obj_xref.c b/src/lib/libcrypto/objects/obj_xref.c
index ac1459c123..7cd3141d14 100644
--- a/src/lib/libcrypto/objects/obj_xref.c
+++ b/src/lib/libcrypto/objects/obj_xref.c
@@ -1,147 +1,313 @@
-/* $OpenBSD: obj_xref.c,v 1.10 2023/07/22 18:12:09 tb Exp $ */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2006.
- */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
+/*      $OpenBSD: obj_xref.c,v 1.11 2023/07/22 18:32:05 tb Exp $ */
+
+/*
+ * Copyright (c) 2023 Theo Buehler <tb@openbsd.org>
  *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <openssl/objects.h>
-#include "obj_xref.h"
 
-DECLARE_STACK_OF(nid_triple)
-
-static int
-sig_cmp(const nid_triple *a, const nid_triple *b)
-{
-        return a->sign_id - b->sign_id;
-}
+/*
+ * Map between signature nids and pairs of (hash, pkey) nids. If the hash nid
+ * is NID_undef, this indicates to ASN1_item_{sign,verify}() that the pkey's
+ * ASN.1 method needs to handle algorithm identifiers and part of the message
+ * digest.
+ */
 
-static int
-sig_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)
-{
-        nid_triple const *a = a_;
-        nid_triple const *b = b_;
-        return sig_cmp(a, b);
-}
+static const struct {
+        int sign_nid;
+        int hash_nid;
+        int pkey_nid;
+} nid_triple[] = {
+        {
+                .sign_nid = NID_md2WithRSAEncryption,
+                .hash_nid = NID_md2,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_md5WithRSAEncryption,
+                .hash_nid = NID_md5,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_shaWithRSAEncryption,
+                .hash_nid = NID_sha,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_sha1WithRSAEncryption,
+                .hash_nid = NID_sha1,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_dsaWithSHA,
+                .hash_nid = NID_sha,
+                .pkey_nid = NID_dsa,
+        },
+        {
+                .sign_nid = NID_dsaWithSHA1_2,
+                .hash_nid = NID_sha1,
+                .pkey_nid = NID_dsa_2,
+        },
+        {
+                .sign_nid = NID_mdc2WithRSA,
+                .hash_nid = NID_mdc2,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_md5WithRSA,
+                .hash_nid = NID_md5,
+                .pkey_nid = NID_rsa,
+        },
+        {
+                .sign_nid = NID_dsaWithSHA1,
+                .hash_nid = NID_sha1,
+                .pkey_nid = NID_dsa,
+        },
+        {
+                .sign_nid = NID_sha1WithRSA,
+                .hash_nid = NID_sha1,
+                .pkey_nid = NID_rsa,
+        },
+        {
+                .sign_nid = NID_ripemd160WithRSA,
+                .hash_nid = NID_ripemd160,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_md4WithRSAEncryption,
+                .hash_nid = NID_md4,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_ecdsa_with_SHA1,
+                .hash_nid = NID_sha1,
+                .pkey_nid = NID_X9_62_id_ecPublicKey,
+        },
+        {
+                .sign_nid = NID_sha256WithRSAEncryption,
+                .hash_nid = NID_sha256,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_sha384WithRSAEncryption,
+                .hash_nid = NID_sha384,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_sha512WithRSAEncryption,
+                .hash_nid = NID_sha512,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_sha224WithRSAEncryption,
+                .hash_nid = NID_sha224,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_ecdsa_with_Recommended,
+                .hash_nid = NID_undef,
+                .pkey_nid = NID_X9_62_id_ecPublicKey,
+        },
+        {
+                .sign_nid = NID_ecdsa_with_Specified,
+                .hash_nid = NID_undef,
+                .pkey_nid = NID_X9_62_id_ecPublicKey,
+        },
+        {
+                .sign_nid = NID_ecdsa_with_SHA224,
+                .hash_nid = NID_sha224,
+                .pkey_nid = NID_X9_62_id_ecPublicKey,
+        },
+        {
+                .sign_nid = NID_ecdsa_with_SHA256,
+                .hash_nid = NID_sha256,
+                .pkey_nid = NID_X9_62_id_ecPublicKey,
+        },
+        {
+                .sign_nid = NID_ecdsa_with_SHA384,
+                .hash_nid = NID_sha384,
+                .pkey_nid = NID_X9_62_id_ecPublicKey,
+        },
+        {
+                .sign_nid = NID_ecdsa_with_SHA512,
+                .hash_nid = NID_sha512,
+                .pkey_nid = NID_X9_62_id_ecPublicKey,
+        },
+        {
+                .sign_nid = NID_dsa_with_SHA224,
+                .hash_nid = NID_sha224,
+                .pkey_nid = NID_dsa,
+        },
+        {
+                .sign_nid = NID_dsa_with_SHA256,
+                .hash_nid = NID_sha256,
+                .pkey_nid = NID_dsa,
+        },
+        {
+                .sign_nid = NID_id_GostR3411_94_with_GostR3410_2001,
+                .hash_nid = NID_id_GostR3411_94,
+                .pkey_nid = NID_id_GostR3410_2001,
+        },
+        {
+                .sign_nid = NID_id_GostR3411_94_with_GostR3410_94,
+                .hash_nid = NID_id_GostR3411_94,
+                .pkey_nid = NID_id_GostR3410_94,
+        },
+        {
+                .sign_nid = NID_id_GostR3411_94_with_GostR3410_94_cc,
+                .hash_nid = NID_id_GostR3411_94,
+                .pkey_nid = NID_id_GostR3410_94_cc,
+        },
+        {
+                .sign_nid = NID_id_GostR3411_94_with_GostR3410_2001_cc,
+                .hash_nid = NID_id_GostR3411_94,
+                .pkey_nid = NID_id_GostR3410_2001_cc,
+        },
+        {
+                .sign_nid = NID_rsassaPss,
+                .hash_nid = NID_undef,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_id_tc26_signwithdigest_gost3410_2012_256,
+                .hash_nid = NID_id_tc26_gost3411_2012_256,
+                .pkey_nid = NID_id_GostR3410_2001,
+        },
+        {
+                .sign_nid = NID_id_tc26_signwithdigest_gost3410_2012_512,
+                .hash_nid = NID_id_tc26_gost3411_2012_512,
+                .pkey_nid = NID_id_GostR3410_2001,
+        },
+        {
+                .sign_nid = NID_Ed25519,
+                .hash_nid = NID_undef,
+                .pkey_nid = NID_Ed25519,
+        },
+        {
+                .sign_nid = NID_dhSinglePass_stdDH_sha1kdf_scheme,
+                .hash_nid = NID_sha1,
+                .pkey_nid = NID_dh_std_kdf,
+        },
+        {
+                .sign_nid = NID_dhSinglePass_stdDH_sha224kdf_scheme,
+                .hash_nid = NID_sha224,
+                .pkey_nid = NID_dh_std_kdf,
+        },
+        {
+                .sign_nid = NID_dhSinglePass_stdDH_sha256kdf_scheme,
+                .hash_nid = NID_sha256,
+                .pkey_nid = NID_dh_std_kdf,
+        },
+        {
+                .sign_nid = NID_dhSinglePass_stdDH_sha384kdf_scheme,
+                .hash_nid = NID_sha384,
+                .pkey_nid = NID_dh_std_kdf,
+        },
+        {
+                .sign_nid = NID_dhSinglePass_stdDH_sha512kdf_scheme,
+                .hash_nid = NID_sha512,
+                .pkey_nid = NID_dh_std_kdf,
+        },
+        {
+                .sign_nid = NID_dhSinglePass_cofactorDH_sha1kdf_scheme,
+                .hash_nid = NID_sha1,
+                .pkey_nid = NID_dh_cofactor_kdf,
+        },
+        {
+                .sign_nid = NID_dhSinglePass_cofactorDH_sha224kdf_scheme,
+                .hash_nid = NID_sha224,
+                .pkey_nid = NID_dh_cofactor_kdf,
+        },
+        {
+                .sign_nid = NID_dhSinglePass_cofactorDH_sha256kdf_scheme,
+                .hash_nid = NID_sha256,
+                .pkey_nid = NID_dh_cofactor_kdf,
+        },
+        {
+                .sign_nid = NID_dhSinglePass_cofactorDH_sha384kdf_scheme,
+                .hash_nid = NID_sha384,
+                .pkey_nid = NID_dh_cofactor_kdf,
+        },
+        {
+                .sign_nid = NID_dhSinglePass_cofactorDH_sha512kdf_scheme,
+                .hash_nid = NID_sha512,
+                .pkey_nid = NID_dh_cofactor_kdf,
+        },
+        {
+                .sign_nid = NID_RSA_SHA3_224,
+                .hash_nid = NID_sha3_224,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_RSA_SHA3_256,
+                .hash_nid = NID_sha3_256,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_RSA_SHA3_384,
+                .hash_nid = NID_sha3_384,
+                .pkey_nid = NID_rsaEncryption,
+        },
+        {
+                .sign_nid = NID_RSA_SHA3_512,
+                .hash_nid = NID_sha3_512,
+                .pkey_nid = NID_rsaEncryption,
+        },
+};
 
-static const nid_triple *
-OBJ_bsearch_sig(nid_triple *key, nid_triple const *base, int num)
-{
-        return OBJ_bsearch_(key, base, num, sizeof(nid_triple),
-            sig_cmp_BSEARCH_CMP_FN);
-}
+#define N_NID_TRIPLES (sizeof(nid_triple) / sizeof(nid_triple[0]))
 
-static int
-sigx_cmp(const nid_triple * const *a, const nid_triple * const *b)
+int
+OBJ_find_sigid_algs(int sign_nid, int *hash_nid, int *pkey_nid)
 {
-        int ret;
+        size_t i;
 
-        ret = (*a)->hash_id - (*b)->hash_id;
-        if (ret)
-                return ret;
-        return (*a)->pkey_id - (*b)->pkey_id;
-}
+        for (i = 0; i < N_NID_TRIPLES; i++) {
+                if (sign_nid != nid_triple[i].sign_nid)
+                        continue;
 
-static int
-sigx_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)
-{
-        const nid_triple * const *a = a_;
-        const nid_triple * const *b = b_;
-        return sigx_cmp(a, b);
-}
+                if (hash_nid != NULL)
+                        *hash_nid = nid_triple[i].hash_nid;
+                if (pkey_nid != NULL)
+                        *pkey_nid = nid_triple[i].pkey_nid;
 
-static const nid_triple * const*
-OBJ_bsearch_sigx(const nid_triple * *key, const nid_triple * const *base, int num)
-{
-        return OBJ_bsearch_(key, base, num, sizeof(const nid_triple *),
-            sigx_cmp_BSEARCH_CMP_FN);
-}
+                return 1;
+        }
 
-int
-OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
-{
-        nid_triple tmp;
-        const nid_triple *rv = NULL;
-        tmp.sign_id = signid;
-
-        if ((rv = OBJ_bsearch_sig(&tmp, sigoid_srt,
-            sizeof(sigoid_srt) / sizeof(nid_triple))) == NULL)
-                return 0;
-        if (pdig_nid)
-                *pdig_nid = rv->hash_id;
-        if (ppkey_nid)
-                *ppkey_nid = rv->pkey_id;
-        return 1;
+        return 0;
 }
 LCRYPTO_ALIAS(OBJ_find_sigid_algs);
 
 int
-OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
+OBJ_find_sigid_by_algs(int *sign_nid, int hash_nid, int pkey_nid)
 {
-        nid_triple tmp;
-        const nid_triple *t = &tmp;
-        const nid_triple *const *rv;
-
-        tmp.hash_id = dig_nid;
-        tmp.pkey_id = pkey_nid;
-
-        if ((rv = OBJ_bsearch_sigx(&t, sigoid_srt_xref,
-            sizeof(sigoid_srt_xref) / sizeof(nid_triple *))) == NULL)
-                return 0;
-        if (psignid)
-                *psignid = (*rv)->sign_id;
-        return 1;
+        size_t i;
+
+        for (i = 0; i < N_NID_TRIPLES; i++) {
+                if (hash_nid != nid_triple[i].hash_nid)
+                        continue;
+                if (pkey_nid != nid_triple[i].pkey_nid)
+                        continue;
+
+                if (sign_nid != NULL)
+                        *sign_nid = nid_triple[i].sign_nid;
+
+                return 1;
+        }
+
+        return 0;
 }
 LCRYPTO_ALIAS(OBJ_find_sigid_by_algs);