d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge upstream patch to silence spurious "no such identity file" warnings.

Browse Source
This commit is contained in:
Dag-Erling Smørgrav 2013-04-02 11:44:55 +00:00
commit fa67e83c67
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=249016
4 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crypto/openssh/readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.194 2011/09/23 07:45:05 markus Exp $ */ /* $OpenBSD: readconf.c,v 1.195 2013/02/17 23:16:57 dtucker Exp $ */
/* $FreeBSD$ */ /* $FreeBSD$ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -356,6 +356,26 @@ clear_forwardings(Options *options)
options->tun_open = SSH_TUNMODE_NO; options->tun_open = SSH_TUNMODE_NO;
} }
void
add_identity_file(Options *options, const char *dir, const char *filename,
int userprovided)
{
char *path;
if (options->num_identity_files >= SSH_MAX_IDENTITY_FILES)
fatal("Too many identity files specified (max %d)",
SSH_MAX_IDENTITY_FILES);
if (dir == NULL) /* no dir, filename is absolute */
path = xstrdup(filename);
else
(void)xasprintf(&path, "%.100s%.100s", dir, filename);
options->identity_file_userprovided[options->num_identity_files] =
userprovided;
options->identity_files[options->num_identity_files++] = path;
}
/* /*
* Returns the number of the token pointed to by cp or oBadOption. * Returns the number of the token pointed to by cp or oBadOption.
*/ */
@ -616,9 +636,7 @@ process_config_line(Options *options, const char *host,
if (*intptr >= SSH_MAX_IDENTITY_FILES) if (*intptr >= SSH_MAX_IDENTITY_FILES)
fatal("%.200s line %d: Too many identity files specified (max %d).", fatal("%.200s line %d: Too many identity files specified (max %d).",
filename, linenum, SSH_MAX_IDENTITY_FILES); filename, linenum, SSH_MAX_IDENTITY_FILES);
charptr = &options->identity_files[*intptr]; add_identity_file(options, NULL, arg, 1);
*charptr = xstrdup(arg);
*intptr = *intptr + 1;
} }
break; break;

4
crypto/openssh/readconf.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.h,v 1.91 2011/09/23 07:45:05 markus Exp $ */ /* $OpenBSD: readconf.h,v 1.92 2013/02/17 23:16:57 dtucker Exp $ */
/* $FreeBSD$ */ /* $FreeBSD$ */
/* /*
@ -97,6 +97,7 @@ typedef struct {
int num_identity_files; /* Number of files for RSA/DSA identities. */ int num_identity_files; /* Number of files for RSA/DSA identities. */
char *identity_files[SSH_MAX_IDENTITY_FILES]; char *identity_files[SSH_MAX_IDENTITY_FILES];
int identity_file_userprovided[SSH_MAX_IDENTITY_FILES];
Key *identity_keys[SSH_MAX_IDENTITY_FILES]; Key *identity_keys[SSH_MAX_IDENTITY_FILES];
/* Local TCP/IP forward requests. */ /* Local TCP/IP forward requests. */
@ -172,5 +173,6 @@ process_config_line(Options *, const char *, char *, const char *, int, int *);
void add_local_forward(Options *, const Forward *); void add_local_forward(Options *, const Forward *);
void add_remote_forward(Options *, const Forward *); void add_remote_forward(Options *, const Forward *);
void add_identity_file(Options *, const char *, const char *, int);
#endif /* READCONF_H */ #endif /* READCONF_H */

9
crypto/openssh/ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.370 2012/07/06 01:47:38 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.371 2013/02/17 23:16:57 dtucker Exp $ */
/* $FreeBSD$ */ /* $FreeBSD$ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -407,12 +407,7 @@ main(int ac, char **av)
strerror(errno)); strerror(errno));
break; break;
} }
if (options.num_identity_files >= add_identity_file(&options, NULL, optarg, 1);
SSH_MAX_IDENTITY_FILES)
fatal("Too many identity files specified "
"(max %d)", SSH_MAX_IDENTITY_FILES);
options.identity_files[options.num_identity_files++] =
xstrdup(optarg);
break; break;
case 'I': case 'I':
#ifdef ENABLE_PKCS11 #ifdef ENABLE_PKCS11

4
crypto/openssh/sshconnect2.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect2.c,v 1.191 2013/02/15 00:21:01 dtucker Exp $ */ /* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */
/* $FreeBSD$ */ /* $FreeBSD$ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
@ -1418,7 +1418,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; id->userprovided = options.identity_file_userprovided[i];
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 */