X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ssh.h;h=c05c78c8f013ab436b01254f1dd3722aa37ba97f;hb=382ffaf0262c8b552cf5bd32dbf922ceacbf921d;hp=0d9613b03e4f76f60bc1e54a531e432e28d4509e;hpb=d345ebc2a5a0b599be5ce4462ef6d7a9b510497a;p=PuTTY.git

diff --git a/ssh.h b/ssh.h
index 0d9613b0..c05c78c8 100644
--- a/ssh.h
+++ b/ssh.h
@@ -200,6 +200,7 @@ extern const struct ssh_cipher ssh_3des;
 extern const struct ssh_cipher ssh_des;
 extern const struct ssh_cipher ssh_blowfish_ssh1;
 extern const struct ssh2_ciphers ssh2_3des;
+extern const struct ssh2_ciphers ssh2_des;
 extern const struct ssh2_ciphers ssh2_aes;
 extern const struct ssh2_ciphers ssh2_blowfish;
 extern const struct ssh_kex ssh_diffiehellman;
@@ -301,11 +302,12 @@ void aes256_decrypt_pubkey(unsigned char *key, unsigned char *blk,
 /*
  * For progress updates in the key generation utility.
  */
-#define PROGFN_LIN_PHASE 1
-#define PROGFN_EXP_PHASE 2
-#define PROGFN_PHASE_EXTENT 3
-#define PROGFN_READY 4
-#define PROGFN_PROGRESS 5
+#define PROGFN_INITIALISE 1
+#define PROGFN_LIN_PHASE 2
+#define PROGFN_EXP_PHASE 3
+#define PROGFN_PHASE_EXTENT 4
+#define PROGFN_READY 5
+#define PROGFN_PROGRESS 6
 typedef void (*progfn_t) (void *param, int action, int phase, int progress);
 
 int rsa_generate(struct RSAKey *key, int bits, progfn_t pfn,
@@ -353,3 +355,9 @@ int zlib_decompress_block(unsigned char *block, int len,
 #define SSH2_AGENTC_ADD_IDENTITY                17
 #define SSH2_AGENTC_REMOVE_IDENTITY             18
 #define SSH2_AGENTC_REMOVE_ALL_IDENTITIES       19
+
+/*
+ * Need this to warn about support for the original SSH2 keyfile
+ * format.
+ */
+void old_keyfile_warning(void);