summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2017-05-30 08:52:19 +0000
committerDamien Miller <djm@mindrot.org>2017-05-31 10:47:31 +1000
commit54d90ace1d3535b44d92a8611952dc109a74a031 (patch)
tree1b5ff69321b88b32fba058fe2c966bf177c95b28 /monitor.c
parentc221219b1fbee47028dcaf66613f4f8d6b7640e9 (diff)
upstream commit
switch from Key typedef with struct sshkey; ok djm@ Upstream-ID: 3067d33e04efbe5131ce8f70668c47a58e5b7a1f
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/monitor.c b/monitor.c
index 96d22b7e4..cd4089398 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.167 2017/02/03 23:05:57 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.168 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>
@@ -1119,7 +1119,7 @@ mm_answer_pam_free_ctx(int sock, Buffer *m)
1119int 1119int
1120mm_answer_keyallowed(int sock, Buffer *m) 1120mm_answer_keyallowed(int sock, Buffer *m)
1121{ 1121{
1122 Key *key; 1122 struct sshkey *key;
1123 char *cuser, *chost; 1123 char *cuser, *chost;
1124 u_char *blob; 1124 u_char *blob;
1125 u_int bloblen, pubkey_auth_attempt; 1125 u_int bloblen, pubkey_auth_attempt;
@@ -1332,7 +1332,7 @@ monitor_valid_hostbasedblob(u_char *data, u_int datalen, char *cuser,
1332int 1332int
1333mm_answer_keyverify(int sock, Buffer *m) 1333mm_answer_keyverify(int sock, Buffer *m)
1334{ 1334{
1335 Key *key; 1335 struct sshkey *key;
1336 u_char *signature, *data, *blob; 1336 u_char *signature, *data, *blob;
1337 u_int signaturelen, datalen, bloblen; 1337 u_int signaturelen, datalen, bloblen;
1338 int verified = 0; 1338 int verified = 0;