[openssh-commits] [openssh] 04/06: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit a7c762e5b2c1093542c0bc1df25ccec0b4cf479f
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Dec 4 20:47:36 2014 +0000

    upstream commit
    
    key_in_file() wrapper is no longer used
---
 key.c | 16 +---------------
 key.h |  3 +--
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/key.c b/key.c
index 2060761..dd0f448 100644
--- a/key.c
+++ b/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
  */
@@ -463,17 +463,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/key.h b/key.h
index c6401a5..212a169 100644
--- a/key.h
+++ b/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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.