diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2016-08-13 17:47:40 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-08-14 11:19:14 +1000 |
| commit | 6cb6dcffe1a2204ba9006de20f73255c268fcb6b (patch) | |
| tree | 235267a1264f9363c39c4c0b11b59384e9acbdcf /monitor_wrap.h | |
| parent | 42d47adc5ad1187f22c726cbc52e71d6b1767ca2 (diff) | |
| download | openssh-git-6cb6dcffe1a2204ba9006de20f73255c268fcb6b.tar.gz | |
upstream commit
remove ssh1 server code; ok djm@
Upstream-ID: c24c0c32c49b91740d5a94ae914fb1898ea5f534
Diffstat (limited to 'monitor_wrap.h')
| -rw-r--r-- | monitor_wrap.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 9fd02b30..1bc76aff 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.h,v 1.30 2016/03/07 19:02:43 djm Exp $ */ +/* $OpenBSD: monitor_wrap.h,v 1.31 2016/08/13 17:47:41 markus Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> @@ -31,7 +31,7 @@ extern int use_privsep; #define PRIVSEP(x) (use_privsep ? mm_##x : x) -enum mm_keytype {MM_NOKEY, MM_HOSTKEY, MM_USERKEY, MM_RSAHOSTKEY, MM_RSAUSERKEY}; +enum mm_keytype { MM_NOKEY, MM_HOSTKEY, MM_USERKEY }; struct monitor; struct mm_master; @@ -49,12 +49,7 @@ int mm_key_allowed(enum mm_keytype, const char *, const char *, Key *, int); int mm_user_key_allowed(struct passwd *, Key *, int); int mm_hostbased_key_allowed(struct passwd *, const char *, const char *, Key *); -int mm_auth_rhosts_rsa_key_allowed(struct passwd *, const char *, - const char *, Key *); int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int); -int mm_auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **); -int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *); -BIGNUM *mm_auth_rsa_generate_challenge(Key *); #ifdef GSSAPI OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); @@ -84,10 +79,6 @@ void mm_terminate(void); int mm_pty_allocate(int *, int *, char *, size_t); void mm_session_pty_cleanup2(struct Session *); -/* SSHv1 interfaces */ -void mm_ssh1_session_id(u_char *); -int mm_ssh1_session_key(BIGNUM *); - /* Key export functions */ struct newkeys *mm_newkeys_from_blob(u_char *, int); int mm_newkeys_to_blob(int, u_char **, u_int *); |