diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-10-31 21:23:19 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-01 09:46:10 +1100 |
commit | 9a14c64c38fc14d0029f1c7bc70cf62cc7f0fdf9 (patch) | |
tree | d79bb8d66eeba8e353f18dac919cb65d0ad896c7 /monitor_wrap.h | |
parent | 07da39f71d36fb547749a5b16aa8892e621a7e4a (diff) |
upstream: Refactor signing - use sshkey_sign for everything,
including the new U2F signatures.
Don't use sshsk_ecdsa_sign() directly, instead make it reachable via
sshkey_sign() like all other signature operations. This means that
we need to add a provider argument to sshkey_sign(), so most of this
change is mechanically adding that.
Suggested by / ok markus@
OpenBSD-Commit-ID: d5193a03fcfa895085d91b2b83d984a9fde76c8c
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 191277f3a..76330fc60 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.42 2019/09/06 05:23:55 djm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.43 2019/10/31 21:23:19 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -45,7 +45,7 @@ int mm_is_monitor(void); | |||
45 | DH *mm_choose_dh(int, int, int); | 45 | DH *mm_choose_dh(int, int, int); |
46 | #endif | 46 | #endif |
47 | int mm_sshkey_sign(struct ssh *, struct sshkey *, u_char **, size_t *, | 47 | int mm_sshkey_sign(struct ssh *, struct sshkey *, u_char **, size_t *, |
48 | const u_char *, size_t, const char *, u_int compat); | 48 | const u_char *, size_t, const char *, const char *, u_int compat); |
49 | void mm_inform_authserv(char *, char *); | 49 | void mm_inform_authserv(char *, char *); |
50 | struct passwd *mm_getpwnamallow(struct ssh *, const char *); | 50 | struct passwd *mm_getpwnamallow(struct ssh *, const char *); |
51 | char *mm_auth2_read_banner(void); | 51 | char *mm_auth2_read_banner(void); |