Add final version of RequiredRSASize

Keep the old version for backward compatibility Upstream commit: openssh/openssh-portable@1875042c
willshersystems · Sep 27, 2022 · 1ae6284 · 1ae6284
1 parent e8e583b
commit 1ae6284
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/meta/options_body b/meta/options_body
@@ -89,6 +89,7 @@ PubkeyAuthentication
 RSAAuthentication
 RSAMinSize
 RekeyLimit
+RequiredRSASize
 RevokedKeys
 RDomain
 RhostsRSAAuthentication

diff --git a/meta/options_match b/meta/options_match
@@ -47,6 +47,7 @@ PubkeyAuthentication
 RDomain
 RekeyLimit
 RevokedKeys
+RequiredRSASize
 RhostsRSAAuthentication
 RSAAuthentication
 RSAMinSize

diff --git a/templates/sshd_config.j2 b/templates/sshd_config.j2
@@ -89,6 +89,7 @@ Match {{ match["Condition"] }}
 {{       render_option("RDomain",match["RDomain"],true) -}}
 {{       render_option("RekeyLimit",match["RekeyLimit"],true) -}}
 {{       render_option("RevokedKeys",match["RevokedKeys"],true) -}}
+{{       render_option("RequiredRSASize",match["RequiredRSASize"],true) -}}
 {{       render_option("RhostsRSAAuthentication",match["RhostsRSAAuthentication"],true) -}}
 {{       render_option("RSAAuthentication",match["RSAAuthentication"],true) -}}
 {{       render_option("RSAMinSize",match["RSAMinSize"],true) -}}
@@ -203,6 +204,7 @@ Match {{ match["Condition"] }}
 {{ body_option("RSAAuthentication",sshd_RSAAuthentication) -}}
 {{ body_option("RSAMinSize",sshd_RSAMinSize) -}}
 {{ body_option("RekeyLimit",sshd_RekeyLimit) -}}
+{{ body_option("RequiredRSASize",sshd_RequiredRSASize) -}}
 {{ body_option("RevokedKeys",sshd_RevokedKeys) -}}
 {{ body_option("RDomain",sshd_RDomain) -}}
 {{ body_option("RhostsRSAAuthentication",sshd_RhostsRSAAuthentication) -}}

diff --git a/templates/sshd_config_snippet.j2 b/templates/sshd_config_snippet.j2
@@ -88,6 +88,7 @@ Match {{ match["Condition"] }}
 {{       render_option("RDomain",match["RDomain"],true) -}}
 {{       render_option("RekeyLimit",match["RekeyLimit"],true) -}}
 {{       render_option("RevokedKeys",match["RevokedKeys"],true) -}}
+{{       render_option("RequiredRSASize",match["RequiredRSASize"],true) -}}
 {{       render_option("RhostsRSAAuthentication",match["RhostsRSAAuthentication"],true) -}}
 {{       render_option("RSAAuthentication",match["RSAAuthentication"],true) -}}
 {{       render_option("RSAMinSize",match["RSAMinSize"],true) -}}
@@ -202,6 +203,7 @@ Match {{ match["Condition"] }}
 {{ body_option("RSAAuthentication",sshd_RSAAuthentication) -}}
 {{ body_option("RSAMinSize",sshd_RSAMinSize) -}}
 {{ body_option("RekeyLimit",sshd_RekeyLimit) -}}
+{{ body_option("RequiredRSASize",sshd_RequiredRSASize) -}}
 {{ body_option("RevokedKeys",sshd_RevokedKeys) -}}
 {{ body_option("RDomain",sshd_RDomain) -}}
 {{ body_option("RhostsRSAAuthentication",sshd_RhostsRSAAuthentication) -}}