summaryrefslogtreecommitdiff
path: root/auth.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-04 21:53:35 +1100
committerDamien Miller <djm@mindrot.org>2010-03-04 21:53:35 +1100
commit1aed65eb27feec505997c98621bdf158f9ab8b99 (patch)
tree81c2d0b9aff3c2211388ba00cde544e0618750d2 /auth.h
parent2befbad9b3c8fc6e4e564c062870229bc722734c (diff)
- djm@cvs.openbsd.org 2010/03/04 10:36:03
[auth-rh-rsa.c auth-rsa.c auth.c auth.h auth2-hostbased.c auth2-pubkey.c] [authfile.c authfile.h hostfile.c hostfile.h servconf.c servconf.h] [ssh-keygen.c ssh.1 sshconnect.c sshd_config.5] Add a TrustedUserCAKeys option to sshd_config to specify CA keys that are trusted to authenticate users (in addition than doing it per-user in authorized_keys). Add a RevokedKeys option to sshd_config and a @revoked marker to known_hosts to allow keys to me revoked and banned for user or host authentication. feedback and ok markus@
Diffstat (limited to 'auth.h')
-rw-r--r--auth.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/auth.h b/auth.h
index 117485ca9..a65b87dd1 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.h,v 1.64 2010/02/26 20:29:54 djm Exp $ */ 1/* $OpenBSD: auth.h,v 1.65 2010/03/04 10:36:03 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -171,6 +171,7 @@ char *authorized_keys_file(struct passwd *);
171char *authorized_keys_file2(struct passwd *); 171char *authorized_keys_file2(struct passwd *);
172 172
173FILE *auth_openkeyfile(const char *, struct passwd *, int); 173FILE *auth_openkeyfile(const char *, struct passwd *, int);
174int auth_key_is_revoked(Key *);
174 175
175HostStatus 176HostStatus
176check_key_in_hostfiles(struct passwd *, Key *, const char *, 177check_key_in_hostfiles(struct passwd *, Key *, const char *,