tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2013/02/15 00:21:01 

[sshconnect2.c]
     Warn more loudly if an IdentityFile provided by the user cannot be read.
     bz #1981, ok djm@
This commit is contained in:
Damien Miller 2013-02-15 12:18:32 +11:00
parent 8e6fb780e5
commit 5ceddc31cd
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -11,6 +11,10 @@
[auth2-pubkey.c] [auth2-pubkey.c]
Correct error message that had a typo and was logging the wrong thing; Correct error message that had a typo and was logging the wrong thing;
patch from Petr Lautrbach patch from Petr Lautrbach
- dtucker@cvs.openbsd.org 2013/02/15 00:21:01
[sshconnect2.c]
Warn more loudly if an IdentityFile provided by the user cannot be read.
bz #1981, ok djm@
20130214 20130214
- (djm) [regress/krl.sh] Don't use ecdsa keys in environment that lack ECC. - (djm) [regress/krl.sh] Don't use ecdsa keys in environment that lack ECC.

19
sshconnect2.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect2.c,v 1.190 2012/12/02 20:26:11 djm Exp $ */ /* $OpenBSD: sshconnect2.c,v 1.191 2013/02/15 00:21:01 dtucker Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved.
@ -248,6 +248,7 @@ struct identity {
char *filename; /* comment for agent-only keys */ char *filename; /* comment for agent-only keys */
int tried; int tried;
int isprivate; /* key points to the private key */ int isprivate; /* key points to the private key */
int userprovided;
}; };
TAILQ_HEAD(idlist, identity); TAILQ_HEAD(idlist, identity);
@ -312,7 +313,7 @@ void userauth(Authctxt *, char *);
static int sign_and_send_pubkey(Authctxt *, Identity *); static int sign_and_send_pubkey(Authctxt *, Identity *);
static void pubkey_prepare(Authctxt *); static void pubkey_prepare(Authctxt *);
static void pubkey_cleanup(Authctxt *); static void pubkey_cleanup(Authctxt *);
static Key *load_identity_file(char *); static Key *load_identity_file(char *, int);
static Authmethod *authmethod_get(char *authlist); static Authmethod *authmethod_get(char *authlist);
static Authmethod *authmethod_lookup(const char *name); static Authmethod *authmethod_lookup(const char *name);
@ -1186,7 +1187,7 @@ identity_sign(Identity *id, u_char **sigp, u_int *lenp,
if (id->isprivate || (id->key->flags & KEY_FLAG_EXT)) if (id->isprivate || (id->key->flags & KEY_FLAG_EXT))
return (key_sign(id->key, sigp, lenp, data, datalen)); return (key_sign(id->key, sigp, lenp, data, datalen));
/* load the private key from the file */ /* load the private key from the file */
if ((prv = load_identity_file(id->filename)) == NULL) if ((prv = load_identity_file(id->filename, id->userprovided)) == NULL)
return (-1); return (-1);
ret = key_sign(prv, sigp, lenp, data, datalen); ret = key_sign(prv, sigp, lenp, data, datalen);
key_free(prv); key_free(prv);
@ -1311,7 +1312,7 @@ send_pubkey_test(Authctxt *authctxt, Identity *id)
} }
static Key * static Key *
load_identity_file(char *filename) load_identity_file(char *filename, int userprovided)
{ {
Key *private; Key *private;
char prompt[300], *passphrase; char prompt[300], *passphrase;
@ -1319,7 +1320,8 @@ load_identity_file(char *filename)
struct stat st; struct stat st;
if (stat(filename, &st) < 0) { if (stat(filename, &st) < 0) {
debug3("no such identity: %s", filename); (userprovided ? logit : debug3)("no such identity: %s: %s",
filename, strerror(errno));
return NULL; return NULL;
} }
private = key_load_private_type(KEY_UNSPEC, filename, "", NULL, &perm_ok); private = key_load_private_type(KEY_UNSPEC, filename, "", NULL, &perm_ok);
@ -1382,6 +1384,7 @@ pubkey_prepare(Authctxt *authctxt)
id = xcalloc(1, sizeof(*id)); id = xcalloc(1, sizeof(*id));
id->key = key; id->key = key;
id->filename = xstrdup(options.identity_files[i]); id->filename = xstrdup(options.identity_files[i]);
id->userprovided = 1;
TAILQ_INSERT_TAIL(&files, id, next); TAILQ_INSERT_TAIL(&files, id, next);
} }
/* Prefer PKCS11 keys that are explicitly listed */ /* Prefer PKCS11 keys that are explicitly listed */
@ -1446,7 +1449,8 @@ pubkey_prepare(Authctxt *authctxt)
TAILQ_INSERT_TAIL(preferred, id, next); TAILQ_INSERT_TAIL(preferred, id, next);
} }
TAILQ_FOREACH(id, preferred, next) { TAILQ_FOREACH(id, preferred, next) {
debug2("key: %s (%p)", id->filename, id->key); debug2("key: %s (%p),%s", id->filename, id->key,
id->userprovided ? " explicit" : "");
} }
} }
@ -1491,7 +1495,8 @@ userauth_pubkey(Authctxt *authctxt)
sent = send_pubkey_test(authctxt, id); sent = send_pubkey_test(authctxt, id);
} else if (id->key == NULL) { } else if (id->key == NULL) {
debug("Trying private key: %s", id->filename); debug("Trying private key: %s", id->filename);
id->key = load_identity_file(id->filename); id->key = load_identity_file(id->filename,
id->userprovided);
if (id->key != NULL) { if (id->key != NULL) {
id->isprivate = 1; id->isprivate = 1;
sent = sign_and_send_pubkey(authctxt, id); sent = sign_and_send_pubkey(authctxt, id);