diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-02-10 05:43:26 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-02-10 16:45:34 +1100 |
| commit | b56ac069d46b6f800de34e1e935f98d050731d14 (patch) | |
| tree | 36a2f535b9480c838476f4b7a4bf38e743b11a04 /ssh-keygen.c | |
| parent | cdb10bd431f9f6833475c27e9a82ebb36fdb12db (diff) | |
upstream commit
fatal if we're unable to write all the public key; previously
we would silently ignore errors writing the comment and terminating newline.
Prompted by github PR from WillerZ; ok dtucker
OpenBSD-Commit-ID: 18fbfcfd4e8c6adbc84820039b64d70906e49831
Diffstat (limited to 'ssh-keygen.c')
| -rw-r--r-- | ssh-keygen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index e8e2a2aa..d81f42cb 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.310 2018/02/07 05:15:49 jsing Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.311 2018/02/10 05:43:26 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2841,7 +2841,8 @@ passphrase_again: if ((r = sshkey_write(public, f)) != 0) error("write key failed: %s", ssh_err(r)); fprintf(f, " %s\n", comment); - fclose(f); + if (ferror(f) || fclose(f) != 0) + fatal("write public failed: %s", strerror(errno)); if (!quiet) { fp = sshkey_fingerprint(public, fingerprint_hash, |