diff options
| author |   dtucker <dtucker@openbsd.org> | 2019-08-05 11:50:33 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2019-08-05 11:50:33 +0000 |
| commit | b0c328c8f066f6689874bef7f338179145ce58d0 (patch) | |
| tree | 21b68b2099dcaca751488f1464d8bb39e31ec277 /usr.bin/ssh/sshconnect2.c | |
| parent | try to be more compliant with the spec by implementing marker responses. (diff) | |
| download | wireguard-openbsd-b0c328c8f066f6689874bef7f338179145ce58d0.tar.xz wireguard-openbsd-b0c328c8f066f6689874bef7f338179145ce58d0.zip | |
Remove now-redundant perm_ok arg since sshkey_load_private_type will
now return SSH_ERR_KEY_BAD_PERMISSIONS in that case. Patch from
jitendra.sharma at intel.com, ok djm@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 5c33a74ad31..d0a73d7e389 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.307 2019/07/07 01:05:00 dtucker Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.308 2019/08/05 11:50:33 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1396,7 +1396,7 @@ load_identity_file(Identity *id) { struct sshkey *private = NULL; char prompt[300], *passphrase, *comment; - int r, perm_ok = 0, quit = 0, i; + int r, quit = 0, i; struct stat st; if (stat(id->filename, &st) == -1) { @@ -1418,7 +1418,7 @@ load_identity_file(Identity *id) } } switch ((r = sshkey_load_private_type(KEY_UNSPEC, id->filename, - passphrase, &private, &comment, &perm_ok))) { + passphrase, &private, &comment))) { case 0: break; case SSH_ERR_KEY_WRONG_PASSPHRASE: |