From: Damien Miller <djm@mindrot.org>
Date: Mon, 17 Jun 2024 23:35:53 +0000 (+1000)
Subject: DSA support is disabled, so remove from fuzzers
X-Git-Tag: V_9_8_P1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f9cc47da588e8de520720e59f98438043fdaf93;p=thirdparty%2Fopenssh-portable.git

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 c3051c72b..321343bbb 100644
--- 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 d38ca8597..f126d93f6 100644
--- 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 b32502ba0..ac63bdf5c 100644
--- 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);