diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2015-01-19 19:52:16 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-20 09:13:01 +1100 |
| commit | 091c302829210c41e7f57c3f094c7b9c054306f0 (patch) | |
| tree | 800de5dc85b877a85d1f269ae5bb09b0dc3fa7a7 /monitor_wrap.h | |
| parent | 4e62cc68ce4ba20245d208b252e74e91d3785b74 (diff) | |
| download | openssh-git-091c302829210c41e7f57c3f094c7b9c054306f0.tar.gz | |
upstream commit
update packet.c & isolate, introduce struct ssh a) switch
packet.c to buffer api and isolate per-connection info into struct ssh b)
(de)serialization of the state is moved from monitor to packet.c c) the old
packet.c API is implemented in opacket.[ch] d) compress.c/h is removed and
integrated into packet.c with and ok djm@
Diffstat (limited to 'monitor_wrap.h')
| -rw-r--r-- | monitor_wrap.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 18c25010..d97e8db1 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.h,v 1.24 2014/01/29 06:18:35 djm Exp $ */ +/* $OpenBSD: monitor_wrap.h,v 1.25 2015/01/19 19:52:16 markus Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> @@ -87,7 +87,7 @@ 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); +struct newkeys *mm_newkeys_from_blob(u_char *, int); int mm_newkeys_to_blob(int, u_char **, u_int *); void monitor_apply_keystate(struct monitor *); @@ -103,9 +103,6 @@ int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); int mm_skey_respond(void *, u_int, char **); /* zlib allocation hooks */ - -void *mm_zalloc(struct mm_master *, u_int, u_int); -void mm_zfree(struct mm_master *, void *); void mm_init_compression(struct mm_master *); #endif /* _MM_WRAP_H_ */ |