Add ability for ssh2_userkey_loadpub() to return the key comment.

[PuTTY.git] / unix / uxcons.c

diff --git a/unix/uxcons.c b/unix/uxcons.c
index ef2866ccca5b56918b05928e4834be7cb96d684d..7652e23ddf526b56dad859c8c7ece27d79dc6567 100644 (file)
--- a/unix/uxcons.c
+++ b/unix/uxcons.c
@@ -198,7 +198,8 @@ int askalg(void *frontend, const char *algtype, const char *algname,
  * Ask whether to wipe a session log file before writing to it.
  * Returns 2 for wipe, 1 for append, 0 for cancel (don't log).
  */
-int askappend(void *frontend, Filename filename)
+int askappend(void *frontend, Filename filename,
+             void (*callback)(void *ctx, int result), void *ctx)
 {
     static const char msgtemplate[] =
        "The session log file \"%.*s\" already exists.\n"
@@ -255,7 +256,7 @@ int askappend(void *frontend, Filename filename)
 void old_keyfile_warning(void)
 {
     static const char message[] =
-       "You are loading an SSH 2 private key which has an\n"
+       "You are loading an SSH-2 private key which has an\n"
        "old version of the file format. This means your key\n"
        "file is not fully tamperproof. Future versions of\n"
        "PuTTY may stop supporting this private key format,\n"