diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-12-18 02:25:15 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-12-19 15:21:37 +1100 |
commit | 04c7e28f83062dc42f2380d1bb3a6bf0190852c0 (patch) | |
tree | bc2c59d39a33aba84e0576039474668ada2546d2 /monitor_wrap.h | |
parent | 931c78dfd7fe30669681a59e536bbe66535f3ee9 (diff) |
upstream commit
pass negotiated signing algorithm though to
sshkey_verify() and check that the negotiated algorithm matches the type in
the signature (only matters for RSA SHA1/SHA2 sigs). ok markus@
OpenBSD-Commit-ID: 735fb15bf4adc060d3bee9d047a4bcaaa81b1af9
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 9e032d204..f5af1e819 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.35 2017/05/31 08:09:45 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.36 2017/12/18 02:25:15 djm 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,7 @@ int mm_user_key_allowed(struct passwd *, struct sshkey *, int); | |||
51 | int mm_hostbased_key_allowed(struct passwd *, const char *, | 51 | int mm_hostbased_key_allowed(struct passwd *, const char *, |
52 | const char *, struct sshkey *); | 52 | const char *, struct sshkey *); |
53 | int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t, | 53 | int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t, |
54 | const u_char *, size_t, u_int); | 54 | const u_char *, size_t, const char *, u_int); |
55 | 55 | ||
56 | #ifdef GSSAPI | 56 | #ifdef GSSAPI |
57 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); | 57 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); |