X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/dcbde23605bb045df116a1dd522d4ddb4d9288fa..900a4ee642d891c53ba6808d2f0fb46643e64706:/ssh.h

diff --git a/ssh.h b/ssh.h
index 725569cf..b2803b98 100644
--- a/ssh.h
+++ b/ssh.h
@@ -20,12 +20,9 @@
 #define APIEXTRA 0
 #endif
 
-/*
- * A Bignum is stored as a sequence of `unsigned short' words. The
- * first tells how many remain; the remaining ones are digits, LS
- * first.
- */
-typedef unsigned short *Bignum;
+#ifndef BIGNUM_INTERNAL
+typedef void *Bignum;
+#endif
 
 struct RSAKey {
     int bits;
@@ -37,14 +34,11 @@ struct RSAKey {
     Bignum modulus;
     Bignum exponent;
     Bignum private_exponent;
-#endif
-    char *comment;
-};
-
-struct RSAAux {
     Bignum p;
     Bignum q;
     Bignum iqmp;
+#endif
+    char *comment;
 };
 
 int makekey(unsigned char *data, struct RSAKey *result,
@@ -98,6 +92,12 @@ void SHA_Simple(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);
+    int blksize;
+};
+
+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 */
@@ -106,6 +106,12 @@ struct ssh_cipher {
     void (*decrypt)(unsigned char *blk, int len);
     char *name;
     int blksize;
+    int keylen;
+};
+
+struct ssh2_ciphers {
+    int nciphers;
+    const struct ssh2_cipher *const *list;
 };
 
 struct ssh_mac {
@@ -132,11 +138,15 @@ struct ssh_signkey {
     void *(*newkey)(char *data, int len);
     void (*freekey)(void *key);
     char *(*fmtkey)(void *key);
+    unsigned char *(*public_blob)(void *key, int *len);
+    unsigned char *(*private_blob)(void *key, int *len);
+    void *(*createkey)(unsigned char *pub_blob, int pub_len,
+		       unsigned char *priv_blob, int priv_len);
+    void *(*openssh_createkey)(unsigned char **blob, int *len);
     char *(*fingerprint)(void *key);
     int (*verifysig)(void *key, char *sig, int siglen,
 		     char *data, int datalen);
-    int (*sign)(void *key, char *sig, int siglen,
-		char *data, int datalen);
+    unsigned char *(*sign)(void *key, char *data, int datalen, int *siglen);
     char *name;
     char *keytype;                     /* for host key cache */
 };
@@ -149,8 +159,34 @@ struct ssh_compress {
     void (*decompress_init)(void);
     int (*decompress)(unsigned char *block, int len,
 		      unsigned char **outblock, int *outlen);
+    int (*disable_compression)(void);
+};
+
+struct ssh2_userkey {
+    const struct ssh_signkey *alg;     /* the key algorithm */
+    void *data;			       /* the key data */
+    char *comment;		       /* the key comment */
 };
 
+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_aes;
+extern const struct ssh2_ciphers ssh2_blowfish;
+extern const struct ssh_kex ssh_diffiehellman;
+extern const struct ssh_kex ssh_diffiehellman_gex;
+extern const struct ssh_signkey ssh_dss;
+extern const struct ssh_signkey ssh_rsa;
+extern const struct ssh_mac ssh_md5;
+extern const struct ssh_mac ssh_sha1;
+extern const struct ssh_mac ssh_sha1_buggy;
+
+/*
+ * PuTTY version number formatted as an SSH version string. 
+ */
+extern char sshver[];
+
 #ifndef MSCRYPTOAPI
 void SHATransform(word32 *digest, word32 *data);
 #endif
@@ -161,14 +197,16 @@ void random_add_heavynoise(void *noise, int length);
 
 void logevent (char *);
 
-Bignum newbn(int length);
 Bignum copybn(Bignum b);
+Bignum bn_power_2(int n);
+void bn_restore_invariant(Bignum b);
 Bignum bignum_from_short(unsigned short n);
 void freebn(Bignum b);
 Bignum modpow(Bignum base, Bignum exp, Bignum mod);
 Bignum modmul(Bignum a, Bignum b, Bignum mod);
 void decbn(Bignum n);
 extern Bignum Zero, One;
+Bignum bignum_from_bytes(unsigned char *data, int nbytes);
 int ssh1_read_bignum(unsigned char *data, Bignum *result);
 int ssh1_bignum_bitcount(Bignum bn);
 int ssh1_bignum_length(Bignum bn);
@@ -181,32 +219,46 @@ unsigned short bignum_mod_short(Bignum number, unsigned short modulus);
 Bignum bignum_add_long(Bignum number, unsigned long addend);
 Bignum bigmul(Bignum a, Bignum b);
 Bignum modinv(Bignum number, Bignum modulus);
+Bignum bignum_bitmask(Bignum number);
 Bignum bignum_rshift(Bignum number, int shift);
 int bignum_cmp(Bignum a, Bignum b);
 char *bignum_decimal(Bignum x);
 
-Bignum dh_create_e(void);
+void dh_setup_group1(void);
+void dh_setup_group(Bignum pval, Bignum gval);
+void dh_cleanup(void);
+Bignum dh_create_e(int nbits);
 Bignum dh_find_K(Bignum f);
 
-int loadrsakey(char *filename, struct RSAKey *key, struct RSAAux *aux,
-               char *passphrase);
+int loadrsakey(char *filename, struct RSAKey *key, char *passphrase);
 int rsakey_encrypted(char *filename, char **comment);
 
-int saversakey(char *filename, struct RSAKey *key, struct RSAAux *aux,
-               char *passphrase);
+int saversakey(char *filename, struct RSAKey *key, char *passphrase);
+
+void base64_encode_atom(unsigned char *data, int n, char *out);
 
-void des3_decrypt_pubkey(unsigned char *key,
-                         unsigned char *blk, int len);
-void des3_encrypt_pubkey(unsigned char *key,
-                         unsigned char *blk, int len);
+/* ssh2_load_userkey can return this as an error */
+extern struct ssh2_userkey ssh2_wrong_passphrase;
+#define SSH2_WRONG_PASSPHRASE (&ssh2_wrong_passphrase)
+
+int ssh2_userkey_encrypted(char *filename, char **comment);
+struct ssh2_userkey *ssh2_load_userkey(char *filename, char *passphrase);
+char *ssh2_userkey_loadpub(char *filename, char **algorithm, int *pub_blob_len);
+int ssh2_save_userkey(char *filename, struct ssh2_userkey *key, char *passphrase);
+
+int keyfile_version(char *filename);
+
+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 aes256_encrypt_pubkey(unsigned char *key, unsigned char *blk, int len);
+void aes256_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len);
 
 /*
  * For progress updates in the key generation utility.
  */
 typedef void (*progfn_t)(void *param, int phase, int progress);
 
-int rsa_generate(struct RSAKey *key, struct RSAAux *aux, int bits,
-                 progfn_t pfn, void *pfnparam);
+int rsa_generate(struct RSAKey *key, int bits, progfn_t pfn, void *pfnparam);
 Bignum primegen(int bits, int modulus, int residue,
                 int phase, progfn_t pfn, void *pfnparam);
 
@@ -219,3 +271,31 @@ int zlib_compress_block(unsigned char *block, int len,
 			unsigned char **outblock, int *outlen);
 int zlib_decompress_block(unsigned char *block, int len,
 			  unsigned char **outblock, int *outlen);
+
+/*
+ * SSH1 agent messages.
+ */
+#define SSH1_AGENTC_REQUEST_RSA_IDENTITIES    1
+#define SSH1_AGENT_RSA_IDENTITIES_ANSWER      2
+#define SSH1_AGENTC_RSA_CHALLENGE             3
+#define SSH1_AGENT_RSA_RESPONSE               4
+#define SSH1_AGENTC_ADD_RSA_IDENTITY          7
+#define SSH1_AGENTC_REMOVE_RSA_IDENTITY       8
+#define SSH1_AGENTC_REMOVE_ALL_RSA_IDENTITIES 9   /* openssh private? */
+
+/*
+ * Messages common to SSH1 and OpenSSH's SSH2.
+ */
+#define SSH_AGENT_FAILURE                    5
+#define SSH_AGENT_SUCCESS                    6
+
+/*
+ * OpenSSH's SSH2 agent messages.
+ */
+#define SSH2_AGENTC_REQUEST_IDENTITIES          11
+#define SSH2_AGENT_IDENTITIES_ANSWER            12
+#define SSH2_AGENTC_SIGN_REQUEST                13
+#define SSH2_AGENT_SIGN_RESPONSE                14
+#define SSH2_AGENTC_ADD_IDENTITY                17
+#define SSH2_AGENTC_REMOVE_IDENTITY             18
+#define SSH2_AGENTC_REMOVE_ALL_IDENTITIES       19