diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 08:52:19 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:47:31 +1000 |
commit | 54d90ace1d3535b44d92a8611952dc109a74a031 (patch) | |
tree | 1b5ff69321b88b32fba058fe2c966bf177c95b28 /monitor_wrap.c | |
parent | c221219b1fbee47028dcaf66613f4f8d6b7640e9 (diff) |
upstream commit
switch from Key typedef with struct sshkey; ok djm@
Upstream-ID: 3067d33e04efbe5131ce8f70668c47a58e5b7a1f
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index f2eec5a77..0710a10b0 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.90 2017/05/17 01:24:17 djm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.91 2017/05/30 08:52:19 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -216,7 +216,7 @@ mm_choose_dh(int min, int nbits, int max) | |||
216 | #endif | 216 | #endif |
217 | 217 | ||
218 | int | 218 | int |
219 | mm_key_sign(Key *key, u_char **sigp, u_int *lenp, | 219 | mm_key_sign(struct sshkey *key, u_char **sigp, u_int *lenp, |
220 | const u_char *data, u_int datalen, const char *hostkey_alg) | 220 | const u_char *data, u_int datalen, const char *hostkey_alg) |
221 | { | 221 | { |
222 | struct kex *kex = *pmonitor->m_pkex; | 222 | struct kex *kex = *pmonitor->m_pkex; |
@@ -375,7 +375,8 @@ mm_auth_password(Authctxt *authctxt, char *password) | |||
375 | } | 375 | } |
376 | 376 | ||
377 | int | 377 | int |
378 | mm_user_key_allowed(struct passwd *pw, Key *key, int pubkey_auth_attempt) | 378 | mm_user_key_allowed(struct passwd *pw, struct sshkey *key, |
379 | int pubkey_auth_attempt) | ||
379 | { | 380 | { |
380 | return (mm_key_allowed(MM_USERKEY, NULL, NULL, key, | 381 | return (mm_key_allowed(MM_USERKEY, NULL, NULL, key, |
381 | pubkey_auth_attempt)); | 382 | pubkey_auth_attempt)); |
@@ -383,14 +384,14 @@ mm_user_key_allowed(struct passwd *pw, Key *key, int pubkey_auth_attempt) | |||
383 | 384 | ||
384 | int | 385 | int |
385 | mm_hostbased_key_allowed(struct passwd *pw, const char *user, const char *host, | 386 | mm_hostbased_key_allowed(struct passwd *pw, const char *user, const char *host, |
386 | Key *key) | 387 | struct sshkey *key) |
387 | { | 388 | { |
388 | return (mm_key_allowed(MM_HOSTKEY, user, host, key, 0)); | 389 | return (mm_key_allowed(MM_HOSTKEY, user, host, key, 0)); |
389 | } | 390 | } |
390 | 391 | ||
391 | int | 392 | int |
392 | mm_key_allowed(enum mm_keytype type, const char *user, const char *host, | 393 | mm_key_allowed(enum mm_keytype type, const char *user, const char *host, |
393 | Key *key, int pubkey_auth_attempt) | 394 | struct sshkey *key, int pubkey_auth_attempt) |
394 | { | 395 | { |
395 | Buffer m; | 396 | Buffer m; |
396 | u_char *blob; | 397 | u_char *blob; |
@@ -435,7 +436,8 @@ mm_key_allowed(enum mm_keytype type, const char *user, const char *host, | |||
435 | */ | 436 | */ |
436 | 437 | ||
437 | int | 438 | int |
438 | mm_key_verify(Key *key, u_char *sig, u_int siglen, u_char *data, u_int datalen) | 439 | mm_key_verify(struct sshkey *key, u_char *sig, u_int siglen, u_char *data, |
440 | u_int datalen) | ||
439 | { | 441 | { |
440 | Buffer m; | 442 | Buffer m; |
441 | u_char *blob; | 443 | u_char *blob; |