diff options
| author |   djm <djm@openbsd.org> | 2014-12-04 20:47:36 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2014-12-04 20:47:36 +0000 |
| commit | 0df4bcd89abd775880e25eba4669ce64bbdbf80a (patch) | |
| tree | 2b19315f909168e3b2a9d3df4ff60d9f39e3c8c0 | |
| parent | correctly store .Dt and .TH information in the names table (diff) | |
| download | wireguard-openbsd-0df4bcd89abd775880e25eba4669ce64bbdbf80a.tar.xz wireguard-openbsd-0df4bcd89abd775880e25eba4669ce64bbdbf80a.zip | |
key_in_file() wrapper is no longer used
| -rw-r--r-- | usr.bin/ssh/key.c | 16 | ||||
| -rw-r--r-- | usr.bin/ssh/key.h | 3 |
2 files changed, 2 insertions, 17 deletions
diff --git a/usr.bin/ssh/key.c b/usr.bin/ssh/key.c index 50627f6f9f1..d8703adc3b2 100644 --- a/usr.bin/ssh/key.c +++ b/usr.bin/ssh/key.c @@ -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 */ @@ -461,17 +461,3 @@ key_perm_ok(int fd, const char *filename) 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; -} diff --git a/usr.bin/ssh/key.h b/usr.bin/ssh/key.h index 4be4fedd6f3..24aa8da6a80 100644 --- a/usr.bin/ssh/key.h +++ b/usr.bin/ssh/key.h @@ -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. @@ -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_pem(int, int, const char *, char **); int key_perm_ok(int, const char *); -int key_in_file(Key *, const char *, int); #endif |