Merge remote-tracking branch 'apache/4.18' into 4.19

weizhouapache · weizhouapache · commit e86363be8e7e · 2024-03-04T09:06:53.000+01:00
diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
@@ -619,7 +619,7 @@ public void updateKeyPairs() {
             // FIXME: take a global database lock here for safety.
             boolean onWindows = isOnWindows();
             if(!onWindows) {
-                Script.runSimpleBashScript("if [ -f " + privkeyfile + " ]; then rm -f " + privkeyfile + "; fi; ssh-keygen -t ed25519 -m PEM -N '' -f " + privkeyfile + " -q 2>/dev/null || ssh-keygen -t ed25519 -N '' -f " + privkeyfile + " -q");
+                Script.runSimpleBashScript("if [ -f " + privkeyfile + " ]; then rm -f " + privkeyfile + "; fi; ssh-keygen -t ecdsa -m PEM -N '' -f " + privkeyfile + " -q 2>/dev/null || ssh-keygen -t ecdsa -N '' -f " + privkeyfile + " -q");
             }
 
             final String privateKey;

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,7 @@ public void updateKeyPairs() {`
`619`	`619`	`// FIXME: take a global database lock here for safety.`
`620`	`620`	`boolean onWindows = isOnWindows();`
`621`	`621`	`if(!onWindows) {`
`622`		`- Script.runSimpleBashScript("if [ -f " + privkeyfile + " ]; then rm -f " + privkeyfile + "; fi; ssh-keygen -t ed25519 -m PEM -N '' -f " + privkeyfile + " -q 2>/dev/null \|\| ssh-keygen -t ed25519 -N '' -f " + privkeyfile + " -q");`
	`622`	`+ Script.runSimpleBashScript("if [ -f " + privkeyfile + " ]; then rm -f " + privkeyfile + "; fi; ssh-keygen -t ecdsa -m PEM -N '' -f " + privkeyfile + " -q 2>/dev/null \|\| ssh-keygen -t ecdsa -N '' -f " + privkeyfile + " -q");`
`623`	`623`	`}`
`624`	`624`
`625`	`625`	`final String privateKey;`