Tweak to make it more obvious that the System menu is only available from

[u/mdw/putty] / ssh.h

diff --git a/ssh.h b/ssh.h
index e0f82f3..07cdc7e 100644 (file)
--- 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 */
@@ -186,6 +186,7 @@ struct ssh_signkey {
                        unsigned char *priv_blob, int priv_len);
     void *(*openssh_createkey) (unsigned char **blob, int *len);
     int (*openssh_fmtkey) (void *key, unsigned char *blob, int len);
+    int (*pubkey_bits) (void *blob, int len);
     char *(*fingerprint) (void *key);
     int (*verifysig) (void *key, char *sig, int siglen,
                      char *data, int datalen);
@@ -250,18 +251,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 +271,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);
@@ -279,10 +281,15 @@ 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);
+char *x11_display(const char *display);
 
-/* Platfdorm-dependent X11 function */
+/* Platform-dependent X11 functions */
 extern void platform_get_x11_auth(char *display, int *proto,
                                   unsigned char *data, int *datalen);
+extern const char platform_x11_best_transport[];
+/* best X11 hostname for this platform if none specified */
+SockAddr platform_get_x11_unix_address(int displaynum, char **canonicalname);
+/* make up a SockAddr naming the address for displaynum */
 
 Bignum copybn(Bignum b);
 Bignum bn_power_2(int n);
@@ -315,6 +322,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 +333,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,11 +351,12 @@ 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);
+const struct ssh_signkey *find_pubkey_alg(const char *name);
 
 enum {
     SSH_KEYTYPE_UNOPENABLE,