Improvements to PuTTYgen error reporting:

[u/mdw/putty] / ssh.h

diff --git a/ssh.h b/ssh.h
index 9a57205..a557cf0 100644 (file)
--- 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);
 
@@ -387,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,