diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-08-05 11:50:33 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-08-08 16:40:09 +1000 |
commit | 6b39a7b49ebacec4e70e24bfc8ea2f11057aac22 (patch) | |
tree | 5b43a6b0e136280a269f1161fad9a07b8a2af827 /sshconnect2.c | |
parent | d46075b923bf25e6f25959a3f5b458852161cb3e (diff) |
upstream: 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@
OpenBSD-Commit-ID: 07916a17ed0a252591b71e7fb4be2599cb5b0c77
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index cb8d2193d..87fa70a40 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.307 2019/07/07 01:05:00 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.308 2019/08/05 11:50:33 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1404,7 +1404,7 @@ load_identity_file(Identity *id) | |||
1404 | { | 1404 | { |
1405 | struct sshkey *private = NULL; | 1405 | struct sshkey *private = NULL; |
1406 | char prompt[300], *passphrase, *comment; | 1406 | char prompt[300], *passphrase, *comment; |
1407 | int r, perm_ok = 0, quit = 0, i; | 1407 | int r, quit = 0, i; |
1408 | struct stat st; | 1408 | struct stat st; |
1409 | 1409 | ||
1410 | if (stat(id->filename, &st) == -1) { | 1410 | if (stat(id->filename, &st) == -1) { |
@@ -1426,7 +1426,7 @@ load_identity_file(Identity *id) | |||
1426 | } | 1426 | } |
1427 | } | 1427 | } |
1428 | switch ((r = sshkey_load_private_type(KEY_UNSPEC, id->filename, | 1428 | switch ((r = sshkey_load_private_type(KEY_UNSPEC, id->filename, |
1429 | passphrase, &private, &comment, &perm_ok))) { | 1429 | passphrase, &private, &comment))) { |
1430 | case 0: | 1430 | case 0: |
1431 | break; | 1431 | break; |
1432 | case SSH_ERR_KEY_WRONG_PASSPHRASE: | 1432 | case SSH_ERR_KEY_WRONG_PASSPHRASE: |