X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/fda2feb1b6e51994fef214de385874f9f6715c3b..8154b6022bd42b4aba03fc9adcbabd4f588b6575:/ssh.h

diff --git a/ssh.h b/ssh.h
index cd0f883f..a557cf09 100644
--- a/ssh.h
+++ b/ssh.h
@@ -105,7 +105,7 @@ void MD5Simple(void const *p, unsigned len, unsigned char output[16]);
 
 void *hmacmd5_make_context(void);
 void hmacmd5_free_context(void *handle);
-void hmacmd5_key(void *handle, unsigned char const *key, int len);
+void hmacmd5_key(void *handle, void const *key, int len);
 void hmacmd5_do_hmac(void *handle, unsigned char const *blk, int len,
 		     unsigned char *hmac);
 
@@ -270,11 +270,13 @@ void ssh_send_port_open(void *channel, char *hostname, int port, char *org);
 
 /* Exports from portfwd.c */
 extern const char *pfd_newconnect(Socket * s, char *hostname, int port,
-				  void *c, const Config *cfg);
+				  void *c, const Config *cfg,
+				  int addressfamily);
 /* desthost == NULL indicates dynamic (SOCKS) port forwarding */
 extern const char *pfd_addforward(char *desthost, int destport, char *srcaddr,
 				  int port, void *backhandle,
-				  const Config *cfg, void **sockdata);
+				  const Config *cfg, void **sockdata,
+				  int address_family);
 extern void pfd_close(Socket s);
 extern void pfd_terminate(void *sockdata);
 extern int pfd_send(Socket s, char *data, int len);
@@ -385,9 +387,9 @@ int import_possible(int type);
 int import_target_type(int type);
 int import_encrypted(const Filename *filename, int type, char **comment);
 int import_ssh1(const Filename *filename, int type,
-		struct RSAKey *key, char *passphrase);
+		struct RSAKey *key, char *passphrase, const char **errmsg_p);
 struct ssh2_userkey *import_ssh2(const Filename *filename, int type,
-				 char *passphrase);
+				 char *passphrase, const char **errmsg_p);
 int export_ssh1(const Filename *filename, int type,
 		struct RSAKey *key, char *passphrase);
 int export_ssh2(const Filename *filename, int type,