From 1bda31d2d07ed9042b09b0596904dd4f317d8f48 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Mon, 26 Sep 2022 20:20:47 +0200
Subject: [PATCH] Add final version of the option RequiredRSASize (#53)

* Update source template to match generated template

* Add final name of the RequiredRSASize parameter

keeping the old version for backward compatibility.

Upstream commit:
https://github.com/openssh/openssh-portable/commit/54b333d1
---
 .dev-tools/10_top.j2    | 4 ++--
 .dev-tools/options_body | 1 +
 templates/ssh_config.j2 | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.dev-tools/10_top.j2 b/.dev-tools/10_top.j2
index 99704bd..8411de8 100644
--- a/.dev-tools/10_top.j2
+++ b/.dev-tools/10_top.j2
@@ -7,10 +7,10 @@
 {%     elif value is sameas false %}
 {{ key }} no
 {%     elif value is string or value is number %}
-{{ key }} {{ value }}
+{{ key }} {{ value | string }}
 {%     else %}
 {%       for i in value %}
-{{ key }} {{ i }}
+{{ key }} {{ i | string }}
 {%       endfor %}
 {%     endif %}
 {%   endif %}
diff --git a/.dev-tools/options_body b/.dev-tools/options_body
index 176879d..8cc382f 100644
--- a/.dev-tools/options_body
+++ b/.dev-tools/options_body
@@ -84,6 +84,7 @@ RekeyLimit
 RemoteCommand
 RemoteForward
 RequestTTY
+RequiredRSASize
 RevokedHostKeys
 RhostsRSAAuthentication
 RSAAuthentication
diff --git a/templates/ssh_config.j2 b/templates/ssh_config.j2
index fab57de..7f277c7 100644
--- a/templates/ssh_config.j2
+++ b/templates/ssh_config.j2
@@ -119,6 +119,7 @@ Match {{ match["Condition"] }}
 {{       render_option("RemoteCommand",match["RemoteCommand"],true) -}}
 {{       render_option("RemoteForward",match["RemoteForward"],true) -}}
 {{       render_option("RequestTTY",match["RequestTTY"],true) -}}
+{{       render_option("RequiredRSASize",match["RequiredRSASize"],true) -}}
 {{       render_option("RevokedHostKeys",match["RevokedHostKeys"],true) -}}
 {{       render_option("RhostsRSAAuthentication",match["RhostsRSAAuthentication"],true) -}}
 {{       render_option("RSAAuthentication",match["RSAAuthentication"],true) -}}
@@ -240,6 +241,7 @@ Host {{ host["Condition"] }}
 {{       render_option("RemoteCommand",host["RemoteCommand"],true) -}}
 {{       render_option("RemoteForward",host["RemoteForward"],true) -}}
 {{       render_option("RequestTTY",host["RequestTTY"],true) -}}
+{{       render_option("RequiredRSASize",host["RequiredRSASize"],true) -}}
 {{       render_option("RevokedHostKeys",host["RevokedHostKeys"],true) -}}
 {{       render_option("RhostsRSAAuthentication",host["RhostsRSAAuthentication"],true) -}}
 {{       render_option("RSAAuthentication",host["RSAAuthentication"],true) -}}
@@ -354,6 +356,7 @@ Host {{ host["Condition"] }}
 {{ body_option("RemoteCommand",ssh_RemoteCommand) -}}
 {{ body_option("RemoteForward",ssh_RemoteForward) -}}
 {{ body_option("RequestTTY",ssh_RequestTTY) -}}
+{{ body_option("RequiredRSASize",ssh_RequiredRSASize) -}}
 {{ body_option("RevokedHostKeys",ssh_RevokedHostKeys) -}}
 {{ body_option("RhostsRSAAuthentication",ssh_RhostsRSAAuthentication) -}}
 {{ body_option("RSAAuthentication",ssh_RSAAuthentication) -}}
-- 
2.37.3