Preliminary support for RSA user authentication in SSH2! Most of the

[u/mdw/putty] / ssh.h

diff --git a/ssh.h b/ssh.h
index 6584029..ca9e550 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -34,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,
@@ -95,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 +109,11 @@ struct ssh_cipher {
     int keylen;
 };
 
+struct ssh2_ciphers {
+    int nciphers;
+    const struct ssh2_cipher *const *list;
+};
+
 struct ssh_mac {
     void (*setcskey)(unsigned char *key);
     void (*setsckey)(unsigned char *key);
@@ -130,11 +138,14 @@ 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);
     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,6 +160,26 @@ struct ssh_compress {
                      unsigned char **outblock, int *outlen);
 };
 
+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;
+
 #ifndef MSCRYPTOAPI
 void SHATransform(word32 *digest, word32 *data);
 #endif
@@ -187,29 +218,40 @@ 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, 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);
+
+/* 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 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);