diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 14:10:53 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:47:31 +1000 |
commit | 00ed75c92d1f95fe50032835106c368fa22f0f02 (patch) | |
tree | f66d7d747d708528011ae1d7ca553b39ed63bd82 /monitor_wrap.h | |
parent | 54d90ace1d3535b44d92a8611952dc109a74a031 (diff) |
upstream commit
switch auth2-pubkey.c to modern APIs; with & ok djm@
Upstream-ID: 8f08d4316eb1b0c4ffe4a206c05cdd45ed1daf07
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index a1552d0c9..958cdbc92 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.33 2017/05/30 08:52:19 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.34 2017/05/30 14:10:53 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -51,7 +51,8 @@ int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *, | |||
51 | int mm_user_key_allowed(struct passwd *, struct sshkey *, int); | 51 | int mm_user_key_allowed(struct passwd *, struct sshkey *, int); |
52 | int mm_hostbased_key_allowed(struct passwd *, const char *, | 52 | int mm_hostbased_key_allowed(struct passwd *, const char *, |
53 | const char *, struct sshkey *); | 53 | const char *, struct sshkey *); |
54 | int mm_key_verify(struct sshkey *, u_char *, u_int, u_char *, u_int); | 54 | int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t, |
55 | const u_char *, size_t, u_int); | ||
55 | 56 | ||
56 | #ifdef GSSAPI | 57 | #ifdef GSSAPI |
57 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); | 58 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); |