Introduce framework for authenticating with the local X server.

[u/mdw/putty] / ssh.h

diff --git a/ssh.h b/ssh.h
index ce58435..0a38e94 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <string.h>
 
 #include "puttymem.h"
@@ -248,12 +249,31 @@ int random_byte(void);
 void random_add_noise(void *noise, int length);
 void random_add_heavynoise(void *noise, int length);
 
-void logevent(char *);
+void logevent(void *, char *);
 
 /* Allocate and register a new channel for port forwarding */
 void *new_sock_channel(void *handle, Socket s);
-void ssh_send_port_open(void *handle, void *channel,
-                       char *hostname, int port, char *org);
+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_addforward(char *desthost, int destport, char *srcaddr,
+                           int port, void *backhandle);
+extern void pfd_close(Socket s);
+extern int pfd_send(Socket s, char *data, int len);
+extern void pfd_confirm(Socket s);
+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 void x11_close(Socket);
+extern int x11_send(Socket, char *, int);
+extern void *x11_invent_auth(char *, int, char *, 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);
 
 Bignum copybn(Bignum b);
 Bignum bn_power_2(int n);
@@ -298,7 +318,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;