summaryrefslogtreecommitdiff
path: root/authfile.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-05-06 17:41:51 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-05-06 17:41:51 +1000
commit232b76f9f8b883db9ff7e7a3a9942ad7a28119e0 (patch)
treed7570bab5a189d98e81a837116c32197eae94774 /authfile.h
parentd8093e49bf06813a8c97cbc90810f4863388af77 (diff)
- dtucker@cvs.openbsd.org 2006/04/25 08:02:27
[authfile.c authfile.h sshconnect2.c ssh.c sshconnect1.c] Prevent ssh from trying to open private keys with bad permissions more than once or prompting for their passphrases (which it subsequently ignores anyway), similar to a previous change in ssh-add. bz #1186, ok djm@
Diffstat (limited to 'authfile.h')
-rw-r--r--authfile.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/authfile.h b/authfile.h
index 967f582d4..a6c74934d 100644
--- a/authfile.h
+++ b/authfile.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfile.h,v 1.12 2006/03/25 22:22:42 djm Exp $ */ 1/* $OpenBSD: authfile.h,v 1.13 2006/04/25 08:02:27 dtucker Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -19,7 +19,7 @@ int key_save_private(Key *, const char *, const char *, const char *);
19Key *key_load_public(const char *, char **); 19Key *key_load_public(const char *, char **);
20Key *key_load_public_type(int, const char *, char **); 20Key *key_load_public_type(int, const char *, char **);
21Key *key_load_private(const char *, const char *, char **); 21Key *key_load_private(const char *, const char *, char **);
22Key *key_load_private_type(int, const char *, const char *, char **); 22Key *key_load_private_type(int, const char *, const char *, char **, int *);
23Key *key_load_private_pem(int, int, const char *, char **); 23Key *key_load_private_pem(int, int, const char *, char **);
24int key_perm_ok(int, const char *); 24int key_perm_ok(int, const char *);
25 25