X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/820ebe3b54a21cfb8d42e43c567d952415c1d05d..222d54dc209210b6e43589c798e35e21273b4082:/ssh.h

diff --git a/ssh.h b/ssh.h
index e0f82f34..3320098b 100644
--- a/ssh.h
+++ b/ssh.h
@@ -73,7 +73,7 @@ void freersakey(struct RSAKey *key);
 typedef unsigned int word32;
 typedef unsigned int uint32;
 
-unsigned long crc32(const void *s, size_t len);
+unsigned long crc32_compute(const void *s, size_t len);
 unsigned long crc32_update(unsigned long crc_input, const void *s, size_t len);
 
 /* SSH CRC compensation attack detector */
@@ -250,18 +250,19 @@ int random_byte(void);
 void random_add_noise(void *noise, int length);
 void random_add_heavynoise(void *noise, int length);
 
-void logevent(void *, char *);
+void logevent(void *, const char *);
 
 /* Allocate and register a new channel for port forwarding */
 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,
-			    const Config *cfg);
+extern const char *pfd_newconnect(Socket * s, char *hostname, int port,
+				  void *c, const Config *cfg);
 /* desthost == NULL indicates dynamic (SOCKS) port forwarding */
-extern char *pfd_addforward(char *desthost, int destport, char *srcaddr,
-			    int port, void *backhandle, const Config *cfg);
+extern const char *pfd_addforward(char *desthost, int destport, char *srcaddr,
+				  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);
@@ -269,8 +270,8 @@ 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 *, const char *, int,
-		      const Config *);
+extern const 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, int);
@@ -315,6 +316,10 @@ Bignum bignum_rshift(Bignum number, int shift);
 int bignum_cmp(Bignum a, Bignum b);
 char *bignum_decimal(Bignum x);
 
+#ifdef DEBUG
+void diagbn(char *prefix, Bignum md);
+#endif
+
 void *dh_setup_group1(void);
 void *dh_setup_group(Bignum pval, Bignum gval);
 void dh_cleanup(void *);
@@ -322,9 +327,10 @@ Bignum dh_create_e(void *, int nbits);
 Bignum dh_find_K(void *, Bignum f);
 
 int loadrsakey(const Filename *filename, struct RSAKey *key,
-	       char *passphrase);
+	       char *passphrase, const char **errorstr);
 int rsakey_encrypted(const Filename *filename, char **comment);
-int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen);
+int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen,
+		   const char **errorstr);
 
 int saversakey(const Filename *filename, struct RSAKey *key, char *passphrase);
 
@@ -339,9 +345,9 @@ extern struct ssh2_userkey ssh2_wrong_passphrase;
 
 int ssh2_userkey_encrypted(const Filename *filename, char **comment);
 struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
-				       char *passphrase);
+				       char *passphrase, const char **errorstr);
 char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
-			   int *pub_blob_len);
+			   int *pub_blob_len, const char **errorstr);
 int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key,
 		      char *passphrase);