|
 |
d3b5a2 |
From 1408f489240dca04f086e4b32b253313eea28ea8 Mon Sep 17 00:00:00 2001
|
|
|
d3b5a2 |
From: Jakub Jelen <jjelen@redhat.com>
|
|
|
d3b5a2 |
Date: Mon, 26 Sep 2022 15:26:12 +0200
|
|
|
d3b5a2 |
Subject: [PATCH] Add final version of RequiredRSASize
|
|
|
d3b5a2 |
|
|
|
d3b5a2 |
Keep the old version for backward compatibility
|
|
|
d3b5a2 |
|
|
|
d3b5a2 |
Upstream commit:
|
|
|
d3b5a2 |
https://github.com/openssh/openssh-portable/commit/1875042c
|
|
|
d3b5a2 |
---
|
|
|
d3b5a2 |
meta/options_body | 1 +
|
|
|
d3b5a2 |
meta/options_match | 1 +
|
|
|
d3b5a2 |
templates/sshd_config.j2 | 2 ++
|
|
|
d3b5a2 |
templates/sshd_config_snippet.j2 | 2 ++
|
|
|
d3b5a2 |
4 files changed, 6 insertions(+)
|
|
|
d3b5a2 |
|
|
|
d3b5a2 |
diff --git a/meta/options_body b/meta/options_body
|
|
|
d3b5a2 |
index 8681269..23a00f4 100644
|
|
|
d3b5a2 |
--- a/meta/options_body
|
|
|
d3b5a2 |
+++ b/meta/options_body
|
|
|
d3b5a2 |
@@ -89,6 +89,7 @@ PubkeyAuthentication
|
|
|
d3b5a2 |
RSAAuthentication
|
|
|
d3b5a2 |
RSAMinSize
|
|
|
d3b5a2 |
RekeyLimit
|
|
|
d3b5a2 |
+RequiredRSASize
|
|
|
d3b5a2 |
RevokedKeys
|
|
|
d3b5a2 |
RDomain
|
|
|
d3b5a2 |
RhostsRSAAuthentication
|
|
|
d3b5a2 |
diff --git a/meta/options_match b/meta/options_match
|
|
|
d3b5a2 |
index 6ef9214..5ec1413 100644
|
|
|
d3b5a2 |
--- a/meta/options_match
|
|
|
d3b5a2 |
+++ b/meta/options_match
|
|
|
d3b5a2 |
@@ -47,6 +47,7 @@ PubkeyAuthentication
|
|
|
d3b5a2 |
RDomain
|
|
|
d3b5a2 |
RekeyLimit
|
|
|
d3b5a2 |
RevokedKeys
|
|
|
d3b5a2 |
+RequiredRSASize
|
|
|
d3b5a2 |
RhostsRSAAuthentication
|
|
|
d3b5a2 |
RSAAuthentication
|
|
|
d3b5a2 |
RSAMinSize
|
|
|
d3b5a2 |
diff --git a/templates/sshd_config.j2 b/templates/sshd_config.j2
|
|
|
d3b5a2 |
index 2899f0a..a3b2465 100644
|
|
|
d3b5a2 |
--- a/templates/sshd_config.j2
|
|
|
d3b5a2 |
+++ b/templates/sshd_config.j2
|
|
|
d3b5a2 |
@@ -89,6 +89,7 @@ Match {{ match["Condition"] }}
|
|
|
d3b5a2 |
{{ render_option("RDomain",match["RDomain"],true) -}}
|
|
|
d3b5a2 |
{{ render_option("RekeyLimit",match["RekeyLimit"],true) -}}
|
|
|
d3b5a2 |
{{ render_option("RevokedKeys",match["RevokedKeys"],true) -}}
|
|
|
d3b5a2 |
+{{ render_option("RequiredRSASize",match["RequiredRSASize"],true) -}}
|
|
|
d3b5a2 |
{{ render_option("RhostsRSAAuthentication",match["RhostsRSAAuthentication"],true) -}}
|
|
|
d3b5a2 |
{{ render_option("RSAAuthentication",match["RSAAuthentication"],true) -}}
|
|
|
d3b5a2 |
{{ render_option("RSAMinSize",match["RSAMinSize"],true) -}}
|
|
|
d3b5a2 |
@@ -203,6 +204,7 @@ Match {{ match["Condition"] }}
|
|
|
d3b5a2 |
{{ body_option("RSAAuthentication",sshd_RSAAuthentication) -}}
|
|
|
d3b5a2 |
{{ body_option("RSAMinSize",sshd_RSAMinSize) -}}
|
|
|
d3b5a2 |
{{ body_option("RekeyLimit",sshd_RekeyLimit) -}}
|
|
|
d3b5a2 |
+{{ body_option("RequiredRSASize",sshd_RequiredRSASize) -}}
|
|
|
d3b5a2 |
{{ body_option("RevokedKeys",sshd_RevokedKeys) -}}
|
|
|
d3b5a2 |
{{ body_option("RDomain",sshd_RDomain) -}}
|
|
|
d3b5a2 |
{{ body_option("RhostsRSAAuthentication",sshd_RhostsRSAAuthentication) -}}
|
|
|
d3b5a2 |
diff --git a/templates/sshd_config_snippet.j2 b/templates/sshd_config_snippet.j2
|
|
|
d3b5a2 |
index 0ece8ed..a12cb3b 100644
|
|
|
d3b5a2 |
--- a/templates/sshd_config_snippet.j2
|
|
|
d3b5a2 |
+++ b/templates/sshd_config_snippet.j2
|
|
|
d3b5a2 |
@@ -88,6 +88,7 @@ Match {{ match["Condition"] }}
|
|
|
d3b5a2 |
{{ render_option("RDomain",match["RDomain"],true) -}}
|
|
|
d3b5a2 |
{{ render_option("RekeyLimit",match["RekeyLimit"],true) -}}
|
|
|
d3b5a2 |
{{ render_option("RevokedKeys",match["RevokedKeys"],true) -}}
|
|
|
d3b5a2 |
+{{ render_option("RequiredRSASize",match["RequiredRSASize"],true) -}}
|
|
|
d3b5a2 |
{{ render_option("RhostsRSAAuthentication",match["RhostsRSAAuthentication"],true) -}}
|
|
|
d3b5a2 |
{{ render_option("RSAAuthentication",match["RSAAuthentication"],true) -}}
|
|
|
d3b5a2 |
{{ render_option("RSAMinSize",match["RSAMinSize"],true) -}}
|
|
|
d3b5a2 |
@@ -202,6 +203,7 @@ Match {{ match["Condition"] }}
|
|
|
d3b5a2 |
{{ body_option("RSAAuthentication",sshd_RSAAuthentication) -}}
|
|
|
d3b5a2 |
{{ body_option("RSAMinSize",sshd_RSAMinSize) -}}
|
|
|
d3b5a2 |
{{ body_option("RekeyLimit",sshd_RekeyLimit) -}}
|
|
|
d3b5a2 |
+{{ body_option("RequiredRSASize",sshd_RequiredRSASize) -}}
|
|
|
d3b5a2 |
{{ body_option("RevokedKeys",sshd_RevokedKeys) -}}
|
|
|
d3b5a2 |
{{ body_option("RDomain",sshd_RDomain) -}}
|
|
|
d3b5a2 |
{{ body_option("RhostsRSAAuthentication",sshd_RhostsRSAAuthentication) -}}
|
|
|
d3b5a2 |
--
|
|
|
d3b5a2 |
2.37.3
|
|
|
d3b5a2 |
|