!240 [sync] PR-238: do not generate dsa

From: @openeuler-sync-bot 
Reviewed-by: @gaoruoshu 
Signed-off-by: @gaoruoshu
This commit is contained in:
openeuler-ci-bot 2024-07-20 08:23:19 +00:00 committed by Gitee
commit 923cf335c6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 35 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Name: cloud-init Name: cloud-init
Version: 23.4.1 Version: 23.4.1
Release: 6 Release: 7
Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. Summary: the defacto multi-distribution package that handles early initialization of a cloud instance.
License: ASL 2.0 or GPLv3 License: ASL 2.0 or GPLv3
URL: http://launchpad.net/cloud-init URL: http://launchpad.net/cloud-init
@ -28,6 +28,8 @@ Patch6010: backport-fix-net-Make-duplicate-route-add-succeed.-5343.patch
Patch6011: backport-fix-netplan-Fix-predictable-interface-rename-issue-5.patch Patch6011: backport-fix-netplan-Fix-predictable-interface-rename-issue-5.patch
Patch6012: backport-fix-Fall-back-to-cached-local-ds-if-no-valid-ds-foun.patch Patch6012: backport-fix-Fall-back-to-cached-local-ds-if-no-valid-ds-foun.patch
Patch9000: do-not-generate-dsa.patch
BuildRequires: pkgconfig(systemd) python3-devel python3-setuptools systemd BuildRequires: pkgconfig(systemd) python3-devel python3-setuptools systemd
BuildRequires: iproute python3-configobj python3-responses BuildRequires: iproute python3-configobj python3-responses
BuildRequires: python3-jinja2 python3-jsonpatch python3-jsonschema BuildRequires: python3-jinja2 python3-jsonpatch python3-jsonschema
@ -157,6 +159,12 @@ fi
%exclude /usr/share/doc/* %exclude /usr/share/doc/*
%changelog %changelog
* Sat Jul 20 2024 shixuantong <shixuantong1@huawei.com> - 23.4.1-7
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:do not generate dsa
* Tue Jul 02 2024 shixuantong <shixuantong1@huawei.com> - 23.4.1-6 * Tue Jul 02 2024 shixuantong <shixuantong1@huawei.com> - 23.4.1-6
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA

26
do-not-generate-dsa.patch Normal file
View File

@ -0,0 +1,26 @@
From 5f121b085119d7eb694b5ee09f4183175cda2678 Mon Sep 17 00:00:00 2001
From: shixuantong <shixuantong1@huawei.com>
Date: Sat, 20 Jul 2024 15:04:30 +0800
Subject: [PATCH] do not generate dsa
---
config/cloud.cfg.tmpl | 3 +++
1 file changed, 3 insertions(+)
diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
index f096595..37571fc 100644
--- a/config/cloud.cfg.tmpl
+++ b/config/cloud.cfg.tmpl
@@ -109,6 +109,9 @@ syslog_fix_perms: ~
disable_vmware_customization: false
{% endif -%}
+# do not generate dsa
+ssh_genkeytypes: ['rsa', 'ecdsa', 'ed25519']
+
# The modules that run in the 'init' stage
cloud_init_modules:
- migrator
--
2.27.0