X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/9a3a93a5c6a879994d61da8a146142a6555fd5d0..e0e1a00d471c4970f88b2a87f7f54d6c2c97c7f4:/ssh.h

diff --git a/ssh.h b/ssh.h
index 7857f152..28dd6dd1 100644
--- a/ssh.h
+++ b/ssh.h
@@ -123,22 +123,26 @@ void SHA512_Final(SHA512_State * s, unsigned char *output);
 void SHA512_Simple(const void *p, int len, unsigned char *output);
 
 struct ssh_cipher {
-    void (*sesskey) (unsigned char *key);	/* for ssh 1 */
-    void (*encrypt) (unsigned char *blk, int len);
-    void (*decrypt) (unsigned char *blk, int len);
+    void *(*make_context)(void);
+    void (*free_context)(void *);
+    void (*sesskey) (void *, unsigned char *key);	/* for ssh 1 */
+    void (*encrypt) (void *, unsigned char *blk, int len);
+    void (*decrypt) (void *, unsigned char *blk, int len);
     int blksize;
+    char *text_name;
 };
 
 struct ssh2_cipher {
-    void (*setcsiv) (unsigned char *key);	/* for ssh 2 */
-    void (*setcskey) (unsigned char *key);	/* for ssh 2 */
-    void (*setsciv) (unsigned char *key);	/* for ssh 2 */
-    void (*setsckey) (unsigned char *key);	/* for ssh 2 */
-    void (*encrypt) (unsigned char *blk, int len);
-    void (*decrypt) (unsigned char *blk, int len);
+    void *(*make_context)(void);
+    void (*free_context)(void *);
+    void (*setiv) (void *, unsigned char *key);	/* for ssh 2 */
+    void (*setkey) (void *, unsigned char *key);/* for ssh 2 */
+    void (*encrypt) (void *, unsigned char *blk, int len);
+    void (*decrypt) (void *, unsigned char *blk, int len);
     char *name;
     int blksize;
     int keylen;
+    char *text_name;
 };
 
 struct ssh2_ciphers {
@@ -147,10 +151,11 @@ struct ssh2_ciphers {
 };
 
 struct ssh_mac {
-    void (*setcskey) (unsigned char *key);
-    void (*setsckey) (unsigned char *key);
-    void (*generate) (unsigned char *blk, int len, unsigned long seq);
-    int (*verify) (unsigned char *blk, int len, unsigned long seq);
+    void *(*make_context)(void);
+    void (*free_context)(void *);
+    void (*setkey) (void *, unsigned char *key);
+    void (*generate) (void *, unsigned char *blk, int len, unsigned long seq);
+    int (*verify) (void *, unsigned char *blk, int len, unsigned long seq);
     char *name;
     int len;
 };
@@ -227,7 +232,7 @@ extern char sshver[];
  * that fails. This variable is the means by which scp.c can reach
  * into the SSH code and find out which one it got.
  */
-extern int ssh_fallback_cmd;
+extern int ssh_fallback_cmd(void *handle);
 
 #ifndef MSCRYPTOAPI
 void SHATransform(word32 * digest, word32 * data);
@@ -238,8 +243,11 @@ void random_add_noise(void *noise, int length);
 void random_add_heavynoise(void *noise, int length);
 
 void logevent(char *);
-void *new_sock_channel(Socket s); // allocates and register a new channel for port forwarding
-void ssh_send_port_open(void *channel, char *hostname, int port, char *org);
+
+/* Allocate and register a new channel for port forwarding */
+void *new_sock_channel(void *handle, Socket s);
+void ssh_send_port_open(void *handle, void *channel,
+			char *hostname, int port, char *org);
 
 Bignum copybn(Bignum b);
 Bignum bn_power_2(int n);
@@ -297,10 +305,30 @@ char *ssh2_userkey_loadpub(char *filename, char **algorithm,
 int ssh2_save_userkey(char *filename, struct ssh2_userkey *key,
 		      char *passphrase);
 
-int keyfile_version(char *filename);
+enum {
+    SSH_KEYTYPE_UNOPENABLE,
+    SSH_KEYTYPE_UNKNOWN,
+    SSH_KEYTYPE_SSH1, SSH_KEYTYPE_SSH2,
+    SSH_KEYTYPE_OPENSSH, SSH_KEYTYPE_SSHCOM
+};
+int key_type(char *filename);
+char *key_type_to_str(int type);
+
+int import_possible(int type);
+int import_target_type(int type);
+int import_encrypted(char *filename, int type, char **comment);
+int import_ssh1(char *filename, int type, struct RSAKey *key,char *passphrase);
+struct ssh2_userkey *import_ssh2(char *filename, int type, char *passphrase);
+int export_ssh1(char *filename, int type, struct RSAKey *key,char *passphrase);
+int export_ssh2(char *filename, int type,
+                struct ssh2_userkey *key, char *passphrase);
 
 void des3_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len);
 void des3_encrypt_pubkey(unsigned char *key, unsigned char *blk, int len);
+void des3_decrypt_pubkey_ossh(unsigned char *key, unsigned char *iv,
+			      unsigned char *blk, int len);
+void des3_encrypt_pubkey_ossh(unsigned char *key, unsigned char *iv,
+			      unsigned char *blk, int len);
 void aes256_encrypt_pubkey(unsigned char *key, unsigned char *blk,
 			   int len);
 void aes256_decrypt_pubkey(unsigned char *key, unsigned char *blk,