From 296f1f6dd8eb0dd635bae9674282382b71487ef3 Mon Sep 17 00:00:00 2001
From: Michael Baentsch <57787676+baentsch@users.noreply.github.com>
Date: Tue, 29 Jul 2025 12:32:00 +0200
Subject: [PATCH] Remove unnecessary OPENSSL_NO_RSA remnants

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28113)
---
 apps/progs.pl              |  3 +--
 test/generate_buildtest.pl | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/progs.pl b/apps/progs.pl
index 4a1e4be47c6..c886e8424f4 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -93,7 +93,6 @@ EOF
 
     my %cmd_disabler = (
         ciphers  => "sock",
-        genrsa   => "rsa",
         gendsa   => "dsa",
         dsaparam => "dsa",
         gendh    => "dh",
@@ -107,7 +106,7 @@ EOF
 #   [2] = preprocessor conditional for excluding irrespective of deprecation
 #        rsa      => [ "pkey",      "3_0", "rsa" ],
 #        genrsa   => [ "genpkey",   "3_0", "rsa" ],
-        rsautl   => [ "pkeyutl",   "3_0", "rsa" ],
+        rsautl   => [ "pkeyutl",   "3_0", "" ],
 #        dhparam  => [ "pkeyparam", "3_0", "dh"  ],
 #        dsaparam => [ "pkeyparam", "3_0", "dsa" ],
 #        dsa      => [ "pkey",      "3_0", "dsa" ],
diff --git a/test/generate_buildtest.pl b/test/generate_buildtest.pl
index 62c64f33d08..8e5e8ec3271 100644
--- a/test/generate_buildtest.pl
+++ b/test/generate_buildtest.pl
@@ -23,9 +23,19 @@ print <<"_____";
 #ifndef OPENSSL_NO_STDIO
 # include <stdio.h>
 #endif
+_____
+
+if (${name_uc} eq "RSA") {
+    print("#include <openssl/rsa.h>");
+}
+else {
+    print <<"_____";
 #ifndef OPENSSL_NO_${name_uc}
 # include <openssl/$name.h>
 #endif
+_____
+}
+print <<"_____";
 
 int main(void)
 {
-- 
2.47.2