X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/df3c4460d6b01d4f8b33119c795c1f7ca09bee1e..c85623f918b8a6c639afc15604414f9b113bb20d:/ssh.h diff --git a/ssh.h b/ssh.h index 659a5431..29c3c40a 100644 --- a/ssh.h +++ b/ssh.h @@ -256,9 +256,10 @@ void *new_sock_channel(void *handle, Socket s); void ssh_send_port_open(void *channel, char *hostname, int port, char *org); /* Exports from portfwd.c */ -extern char *pfd_newconnect(Socket * s, char *hostname, int port, void *c); +extern char *pfd_newconnect(Socket * s, char *hostname, int port, void *c, + const Config *cfg); extern char *pfd_addforward(char *desthost, int destport, char *srcaddr, - int port, void *backhandle); + int port, void *backhandle, const Config *cfg); extern void pfd_close(Socket s); extern int pfd_send(Socket s, char *data, int len); extern void pfd_confirm(Socket s); @@ -266,13 +267,19 @@ extern void pfd_unthrottle(Socket s); extern void pfd_override_throttle(Socket s, int enable); /* Exports from x11fwd.c */ -extern char *x11_init(Socket *, char *, void *, void *); +extern char *x11_init(Socket *, char *, void *, void *, const char *, int, + const Config *); extern void x11_close(Socket); extern int x11_send(Socket, char *, int); -extern void *x11_invent_auth(char *, int, char *, int); +extern void *x11_invent_auth(char *, int, char *, int, int); extern void x11_unthrottle(Socket s); extern void x11_override_throttle(Socket s, int enable); extern int x11_get_screen_number(char *display); +void x11_get_real_auth(void *authv, char *display); + +/* Platfdorm-dependent X11 function */ +extern void platform_get_x11_auth(char *display, int *proto, + unsigned char *data, int *datalen); Bignum copybn(Bignum b); Bignum bn_power_2(int n); @@ -362,6 +369,9 @@ void aes256_encrypt_pubkey(unsigned char *key, unsigned char *blk, void aes256_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len); +void des_encrypt_xdmauth(unsigned char *key, unsigned char *blk, int len); +void des_decrypt_xdmauth(unsigned char *key, unsigned char *blk, int len); + /* * For progress updates in the key generation utility. */