diff options
| author |   djm <djm@openbsd.org> | 2020-01-25 23:02:13 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-01-25 23:02:13 +0000 |
| commit | 62af228467135ddff4a44e5f7a48ca2a03bc8ba3 (patch) | |
| tree | 6a573e8d853ae4e7bde4b8fbf2cf5f3203bb0a6e /usr.bin/ssh/ssh-add.c | |
| parent | Minor cleanup, no functional change: (diff) | |
| download | wireguard-openbsd-62af228467135ddff4a44e5f7a48ca2a03bc8ba3.tar.xz wireguard-openbsd-62af228467135ddff4a44e5f7a48ca2a03bc8ba3.zip | |
factor out reading/writing sshbufs to dedicated functions;
feedback and ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-add.c')
| -rw-r--r-- | usr.bin/ssh/ssh-add.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c index 80d3a1e067a..641b6cf2faf 100644 --- a/usr.bin/ssh/ssh-add.c +++ b/usr.bin/ssh/ssh-add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.150 2020/01/17 20:13:47 naddy Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.151 2020/01/25 23:02:13 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -217,9 +217,7 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag, return -1; } } - if ((keyblob = sshbuf_new()) == NULL) - fatal("%s: sshbuf_new failed", __func__); - if ((r = sshkey_load_file(fd, keyblob)) != 0) { + if ((r = sshbuf_load_fd(fd, &keyblob)) != 0) { fprintf(stderr, "Error loading key \"%s\": %s\n", filename, ssh_err(r)); sshbuf_free(keyblob); |