[openssh-commits] [openssh] 03/04: upstream: ssh-keygen -A: do not generate DSA keys by default.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 88e376fcd67478ad1660d94bc73ab348ac9f4527
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Fri Jun 3 03:17:42 2022 +0000

    upstream: ssh-keygen -A: do not generate DSA keys by default.
    
    Based on github PR#303 from jsegitz with man page text from jmc@, ok markus@
    djm@
    
    OpenBSD-Commit-ID: 5c4c57bdd7063ff03381cfb6696659dd3f9f5b9f
---
 ssh-keygen.1 | 10 +++++-----
 ssh-keygen.c |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 4e724536..5f429813 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-keygen.1,v 1.222 2022/05/09 03:09:53 djm Exp $
+.\"	$OpenBSD: ssh-keygen.1,v 1.223 2022/06/03 03:17:42 dtucker Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo at cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 9 2022 $
+.Dd $Mdocdate: June 3 2022 $
 .Dt SSH-KEYGEN 1
 .Os
 .Sh NAME
@@ -271,9 +271,9 @@ should be placed to be activated.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl A
-For each of the key types (rsa, dsa, ecdsa and ed25519)
-for which host keys
-do not exist, generate the host keys with the default key file path,
+Generate host keys of all default key types (rsa, ecdsa, and
+ed25519) if they do not already exist.
+The host keys are generated with the default key file path,
 an empty passphrase, default bits for the key type, and default comment.
 If
 .Fl f
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 35e70a10..f122cbd1 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.453 2022/05/31 14:05:12 naddy Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.454 2022/06/03 03:17:42 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1045,7 +1045,6 @@ do_gen_all_hostkeys(struct passwd *pw)
 	} key_types[] = {
 #ifdef WITH_OPENSSL
 		{ "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE },
-		{ "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE },
 #ifdef OPENSSL_HAS_ECC
 		{ "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE },
 #endif /* OPENSSL_HAS_ECC */

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.