DSA support is disabled, so remove from fuzzers

diff --git a/regress/misc/fuzz-harness/agent_fuzz_helper.c b/regress/misc/fuzz-harness/agent_fuzz_helper.c
index c3051c72b8db398d9f90c22b4569cf24899991bd..321343bbbbdc10214aef9394be1abc2e35be19b3 100644 (file)
--- a/regress/misc/fuzz-harness/agent_fuzz_helper.c
+++ b/regress/misc/fuzz-harness/agent_fuzz_helper.c
@@ -112,7 +112,6 @@ reset_idtab(void)
        idtab_init();
        // Load keys.
        add_key(PRIV_RSA, CERT_RSA);
-       add_key(PRIV_DSA, CERT_DSA);
        add_key(PRIV_ECDSA, CERT_ECDSA);
        add_key(PRIV_ED25519, CERT_ED25519);
        add_key(PRIV_ECDSA_SK, CERT_ECDSA_SK);

diff --git a/regress/misc/fuzz-harness/kex_fuzz.cc b/regress/misc/fuzz-harness/kex_fuzz.cc
index d38ca8597072ff84bc4961255fa30be93cb5fc5d..f126d93f69de3f027e0a388f5701bf448ebe6d33 100644 (file)
--- a/regress/misc/fuzz-harness/kex_fuzz.cc
+++ b/regress/misc/fuzz-harness/kex_fuzz.cc
@@ -144,7 +144,6 @@ static int
 prepare_keys(struct shared_state *st)
 {
        if (prepare_key(st, KEY_RSA, 2048) != 0 ||
-           prepare_key(st, KEY_DSA, 1024) != 0 ||
            prepare_key(st, KEY_ECDSA, 256) != 0 ||
            prepare_key(st, KEY_ED25519, 256) != 0) {
                error_f("key prepare failed");
@@ -264,10 +263,6 @@ prepare_key(struct shared_state *st, int kt, int bits)
                pubstr = PUB_RSA;
                privstr = PRIV_RSA;
                break;
-       case KEY_DSA:
-               pubstr = PUB_DSA;
-               privstr = PRIV_DSA;
-               break;
        case KEY_ECDSA:
                pubstr = PUB_ECDSA;
                privstr = PRIV_ECDSA;
@@ -325,7 +320,7 @@ int main(void)
 {
        static struct shared_state *st;
        struct test_state *ts;
-       const int keytypes[] = { KEY_RSA, KEY_DSA, KEY_ECDSA, KEY_ED25519, -1 };
+       const int keytypes[] = { KEY_RSA, KEY_ECDSA, KEY_ED25519, -1 };
        static const char * const kextypes[] = {
                "sntrup761x25519-sha512@openssh.com",
                "curve25519-sha256@libssh.org",
@@ -399,7 +394,6 @@ static void
 do_kex(struct shared_state *st, struct test_state *ts, const char *kex)
 {
        do_kex_with_key(st, ts, kex, KEY_RSA);
-       do_kex_with_key(st, ts, kex, KEY_DSA);
        do_kex_with_key(st, ts, kex, KEY_ECDSA);
        do_kex_with_key(st, ts, kex, KEY_ED25519);
 }

diff --git a/regress/misc/fuzz-harness/sig_fuzz.cc b/regress/misc/fuzz-harness/sig_fuzz.cc
index b32502ba023f2bdd70ca3e2ec08e7017e421ca8d..ac63bdf5c6a525c7193d3799057636c46a9b731b 100644 (file)
--- a/regress/misc/fuzz-harness/sig_fuzz.cc
+++ b/regress/misc/fuzz-harness/sig_fuzz.cc
@@ -26,7 +26,6 @@ int LLVMFuzzerTestOneInput(const uint8_t* sig, size_t slen)
 {
 #ifdef WITH_OPENSSL
   static struct sshkey *rsa = generate_or_die(KEY_RSA, 2048);
-  static struct sshkey *dsa = generate_or_die(KEY_DSA, 1024);
   static struct sshkey *ecdsa256 = generate_or_die(KEY_ECDSA, 256);
   static struct sshkey *ecdsa384 = generate_or_die(KEY_ECDSA, 384);
   static struct sshkey *ecdsa521 = generate_or_die(KEY_ECDSA, 521);