From 1408f489240dca04f086e4b32b253313eea28ea8 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 26 Sep 2022 15:26:12 +0200 Subject: [PATCH] Add final version of RequiredRSASize Keep the old version for backward compatibility Upstream commit: https://github.com/openssh/openssh-portable/commit/1875042c --- meta/options_body | 1 + meta/options_match | 1 + templates/sshd_config.j2 | 2 ++ templates/sshd_config_snippet.j2 | 2 ++ 4 files changed, 6 insertions(+) diff --git a/meta/options_body b/meta/options_body index 8681269..23a00f4 100644 --- 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 index 6ef9214..5ec1413 100644 --- 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 index 2899f0a..a3b2465 100644 --- 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 index 0ece8ed..a12cb3b 100644 --- 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) -}} -- 2.37.3