tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Make the standard output messages of both methods of

Browse Source 
changing a key pair's comments (using -c and -C) more applicable to both
methods. ok and suggestions djm@ dtucker@

OpenBSD-Commit-ID: b379338118109eb36e14a65bc0a12735205b3de6
This commit is contained in:
lum@openbsd.org 2019-05-29 08:30:26 +00:00 committed by Darren Tucker
parent 2b3402dc9f
commit 410b231aa4
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.329 2019/03/25 16:19:44 dtucker Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.330 2019/05/29 08:30:26 lum 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
@ -1488,14 +1488,14 @@ do_change_comment(struct passwd *pw, const char *identity_comment)
exit(1); exit(1);
} }
if (comment) if (comment)
printf("Key now has comment '%s'\n", comment); printf("Old comment: %s\n", comment);
else else
printf("Key now has no comment\n"); printf("No existing comment\n");
if (identity_comment) { if (identity_comment) {
strlcpy(new_comment, identity_comment, sizeof(new_comment)); strlcpy(new_comment, identity_comment, sizeof(new_comment));
} else { } else {
printf("Enter new comment: "); printf("New comment: ");
fflush(stdout); fflush(stdout);
if (!fgets(new_comment, sizeof(new_comment), stdin)) { if (!fgets(new_comment, sizeof(new_comment), stdin)) {
explicit_bzero(passphrase, strlen(passphrase)); explicit_bzero(passphrase, strlen(passphrase));
@ -1504,6 +1504,13 @@ do_change_comment(struct passwd *pw, const char *identity_comment)
} }
new_comment[strcspn(new_comment, "\n")] = '\0'; new_comment[strcspn(new_comment, "\n")] = '\0';
} }
if (comment != NULL && strcmp(comment, new_comment) == 0) {
printf("No change to comment\n");
free(passphrase);
sshkey_free(private);
free(comment);
exit(0);
}
/* Save the file using the new passphrase. */ /* Save the file using the new passphrase. */
if ((r = sshkey_save_private(private, identity_file, passphrase, if ((r = sshkey_save_private(private, identity_file, passphrase,
@ -1537,7 +1544,11 @@ do_change_comment(struct passwd *pw, const char *identity_comment)
free(comment); free(comment);
printf("The comment in your key file has been changed.\n"); if (strlen(new_comment) > 0)
printf("Comment '%s' applied\n", new_comment);
else
printf("Comment removed\n");
exit(0); exit(0);
} }