proxy.c now no longer refers to `cfg'. Instead, each of the three

[u/mdw/putty] / ssh.h

diff --git a/ssh.h b/ssh.h
index 41cc503..29c3c40 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <string.h>
 
 #include "puttymem.h"
@@ -255,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);
@@ -265,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);
@@ -316,7 +324,10 @@ int rsakey_pubblob(char *filename, void **blob, int *bloblen);
 
 int saversakey(char *filename, struct RSAKey *key, char *passphrase);
 
-void base64_encode_atom(unsigned char *data, int n, char *out);
+extern int base64_decode_atom(char *atom, unsigned char *out);
+extern int base64_lines(int datalen);
+extern void base64_encode_atom(unsigned char *data, int n, char *out);
+extern void base64_encode(FILE *fp, unsigned char *data, int datalen, int cpl);
 
 /* ssh2_load_userkey can return this as an error */
 extern struct ssh2_userkey ssh2_wrong_passphrase;
@@ -358,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.
  */