From ad9644f74c83ac26c38bad04f494576e4bb83e46 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <dbelyavs@redhat.com>
Date: Sep 23 2022 09:14:03 +0000
Subject: Set minimal value of RSA key length via configuration option


Added a support for our name as alias.

Resolves: rhbz#2128352

---

diff --git a/openssh-8.7p1-minrsabits.patch b/openssh-8.7p1-minrsabits.patch
index 255d34d..b53c383 100644
--- a/openssh-8.7p1-minrsabits.patch
+++ b/openssh-8.7p1-minrsabits.patch
@@ -43,11 +43,12 @@ index 7f26c680..42be690b 100644
  	oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported
  } OpCodes;
  
-@@ -320,6 +320,7 @@ static struct {
+@@ -320,6 +320,8 @@ static struct {
  	{ "proxyjump", oProxyJump },
  	{ "securitykeyprovider", oSecurityKeyProvider },
  	{ "knownhostscommand", oKnownHostsCommand },
 +	{ "requiredrsasize", oRequiredRSASize },
++	{ "rsaminsize", oRequiredRSASize }, /* alias */
  
  	{ NULL, oBadOption }
  };
@@ -129,11 +130,12 @@ index 29df0463..423772b1 100644
  	sDeprecated, sIgnore, sUnsupported
  } ServerOpCodes;
  
-@@ -676,6 +680,7 @@ static struct {
+@@ -676,6 +680,8 @@ static struct {
  	{ "rdomain", sRDomain, SSHCFG_ALL },
  	{ "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },
  	{ "securitykeyprovider", sSecurityKeyProvider, SSHCFG_GLOBAL },
 +	{ "requiredrsasize", sRequiredRSASize, SSHCFG_ALL },
++	{ "rsaminsize", sRequiredRSASize, SSHCFG_ALL }, /* alias */
  	{ NULL, sBadOption, 0 }
  };
  
diff --git a/openssh.spec b/openssh.spec
index 3c8d66a..d6b2c6b 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -51,7 +51,7 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %global openssh_ver 8.7p1
-%global openssh_rel 23
+%global openssh_rel 24
 %global pam_ssh_agent_ver 0.10.4
 %global pam_ssh_agent_rel 5
 
@@ -734,6 +734,10 @@ test -f %{sysconfig_anaconda} && \
 %endif
 
 %changelog
+* Fri Sep 23 2022 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.7p1-24
+- Set minimal value of RSA key length via configuration option - support both names
+  Resolves: rhbz#2128352
+
 * Thu Sep 22 2022 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.7p1-23
 - Set minimal value of RSA key length via configuration option
   Resolves: rhbz#2128352