tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

allow comment change for all supported formats

ok djm@

Upstream-ID: 5fc477cf2f119b2d44aa9c683af16cb00bb3744b
This commit is contained in:
halex@openbsd.org 2015-11-20 23:04:01 +00:00 committed by Damien Miller
parent 8ca915fc76
commit 4d90625b22
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.282 2015/11/19 01:12:32 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.283 2015/11/20 23:04:01 halex Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1429,9 +1429,11 @@ do_change_comment(struct passwd *pw)
identity_file, ssh_err(r)); identity_file, ssh_err(r));
} }
} }
/* XXX what about new-format keys? */
if (private->type != KEY_RSA1) { if (private->type != KEY_RSA1 && private->type != KEY_ED25519 &&
error("Comments are only supported for RSA1 keys."); !use_new_format) {
error("Comments are only supported for RSA1 or keys stored in "
"the new format (-o).");
explicit_bzero(passphrase, strlen(passphrase)); explicit_bzero(passphrase, strlen(passphrase));
sshkey_free(private); sshkey_free(private);
exit(1); exit(1);