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

upstream commit 

key_in_file() wrapper is no longer used
This commit is contained in:
djm@openbsd.org 2014-12-04 20:47:36 +00:00 committed by Damien Miller
parent 5e39a49930
commit a7c762e5b2
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
key.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: key.c,v 1.122 2014/07/22 01:18:50 dtucker Exp $ */ /* $OpenBSD: key.c,v 1.123 2014/12/04 20:47:36 djm Exp $ */
/* /*
* placed in the public domain * placed in the public domain
*/ */
@ -463,17 +463,3 @@ key_perm_ok(int fd, const char *filename)
return sshkey_perm_ok(fd, filename) == 0 ? 1 : 0; return sshkey_perm_ok(fd, filename) == 0 ? 1 : 0;
} }
int
key_in_file(Key *key, const char *filename, int strict_type)
{
int r;
if ((r = sshkey_in_file(key, filename, strict_type)) != 0) {
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR);
if (r == SSH_ERR_SYSTEM_ERROR && errno == ENOENT)
return 0;
error("%s: %s", __func__, ssh_err(r));
return r == SSH_ERR_KEY_NOT_FOUND ? 0 : -1;
}
return 1;
}

3
key.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: key.h,v 1.42 2014/06/24 01:13:21 djm Exp $ */ /* $OpenBSD: key.h,v 1.43 2014/12/04 20:47:36 djm Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@ -106,6 +106,5 @@ Key *key_load_private_cert(int, const char *, const char *, int *);
Key *key_load_private_type(int, const char *, const char *, char **, int *); Key *key_load_private_type(int, const char *, const char *, char **, int *);
Key *key_load_private_pem(int, int, const char *, char **); Key *key_load_private_pem(int, int, const char *, char **);
int key_perm_ok(int, const char *); int key_perm_ok(int, const char *);
int key_in_file(Key *, const char *, int);
#endif #endif