Support for selecting AES from the GUI. In the process, I've had to

[u/mdw/putty] / ssh.h

diff --git a/ssh.h b/ssh.h
index 058c524..aafee4e 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -1,5 +1,7 @@
 #include <string.h>
 
+#include "puttymem.h"
+
 /*
  * Useful thing.
  */
@@ -18,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;
@@ -39,6 +38,12 @@ struct RSAKey {
     char *comment;
 };
 
+struct RSAAux {
+    Bignum p;
+    Bignum q;
+    Bignum iqmp;
+};
+
 int makekey(unsigned char *data, struct RSAKey *result,
            unsigned char **keystr, int order);
 int makeprivate(unsigned char *data, struct RSAKey *result);
@@ -48,6 +53,7 @@ void rsasign(unsigned char *data, int length, struct RSAKey *key);
 void rsasanitise(struct RSAKey *key);
 int rsastr_len(struct RSAKey *key);
 void rsastr_fmt(char *str, struct RSAKey *key);
+void rsa_fingerprint(char *str, int len, struct RSAKey *key);
 void freersakey(struct RSAKey *key);
 
 typedef unsigned int word32;
@@ -89,6 +95,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 */
@@ -97,6 +109,12 @@ struct ssh_cipher {
     void (*decrypt)(unsigned char *blk, int len);
     char *name;
     int blksize;
+    int keylen;
+};
+
+struct ssh2_ciphers {
+    int nciphers;
+    struct ssh2_cipher **list;
 };
 
 struct ssh_mac {
@@ -119,15 +137,27 @@ struct ssh_kex {
     char *name;
 };
 
-struct ssh_hostkey {
-    void (*setkey)(char *data, int len);
-    char *(*fmtkey)(void);
-    int (*verifysig)(char *sig, int siglen, char *data, int datalen);
+struct ssh_signkey {
+    void *(*newkey)(char *data, int len);
+    void (*freekey)(void *key);
+    char *(*fmtkey)(void *key);
+    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);
     char *name;
+    char *keytype;                     /* for host key cache */
 };
 
 struct ssh_compress {
     char *name;
+    void (*compress_init)(void);
+    int (*compress)(unsigned char *block, int len,
+                   unsigned char **outblock, int *outlen);
+    void (*decompress_init)(void);
+    int (*decompress)(unsigned char *block, int len,
+                     unsigned char **outblock, int *outlen);
 };
 
 #ifndef MSCRYPTOAPI
@@ -136,27 +166,71 @@ void SHATransform(word32 *digest, word32 *data);
 
 int random_byte(void);
 void random_add_noise(void *noise, int length);
+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);
-void modpow(Bignum base, Bignum exp, Bignum mod, Bignum result);
-void modmul(Bignum a, Bignum b, Bignum mod, Bignum result);
+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);
 int bignum_byte(Bignum bn, int i);
+int bignum_bit(Bignum bn, int i);
+void bignum_set_bit(Bignum bn, int i, int value);
 int ssh1_write_bignum(void *data, Bignum bn);
-
+Bignum biggcd(Bignum a, Bignum b);
+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);
+
+void dh_setup_group1(void);
+void dh_setup_group(Bignum pval, Bignum gval);
+void dh_cleanup(void);
 Bignum dh_create_e(void);
 Bignum dh_find_K(Bignum f);
 
-int loadrsakey(char *filename, struct RSAKey *key, char *passphrase);
+int loadrsakey(char *filename, struct RSAKey *key, struct RSAAux *aux,
+               char *passphrase);
 int rsakey_encrypted(char *filename, char **comment);
 
+int saversakey(char *filename, struct RSAKey *key, struct RSAAux *aux,
+               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);
+
+/*
+ * 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);
+Bignum primegen(int bits, int modulus, int residue,
+                int phase, progfn_t pfn, void *pfnparam);
+
+/*
+ * zlib compression.
+ */
+void zlib_compress_init(void);
+void zlib_decompress_init(void);
+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);