X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/fda2feb1b6e51994fef214de385874f9f6715c3b..6052bb76c709bb61dc90a876f459988f772e88ed:/ssh.h diff --git a/ssh.h b/ssh.h index cd0f883f..45405d3e 100644 --- a/ssh.h +++ b/ssh.h @@ -105,7 +105,7 @@ void MD5Simple(void const *p, unsigned len, unsigned char output[16]); void *hmacmd5_make_context(void); void hmacmd5_free_context(void *handle); -void hmacmd5_key(void *handle, unsigned char const *key, int len); +void hmacmd5_key(void *handle, void const *key, int len); void hmacmd5_do_hmac(void *handle, unsigned char const *blk, int len, unsigned char *hmac); @@ -122,6 +122,16 @@ void SHA_Simple(void *p, int len, unsigned char *output); void hmac_sha1_simple(void *key, int keylen, void *data, int datalen, unsigned char *output); +typedef struct { + uint32 h[8]; + unsigned char block[64]; + int blkused; + uint32 lenhi, lenlo; +} SHA256_State; +void SHA256_Init(SHA256_State * s); +void SHA256_Bytes(SHA256_State * s, const void *p, int len); +void SHA256_Final(SHA256_State * s, unsigned char *output); +void SHA256_Simple(const void *p, int len, unsigned char *output); typedef struct { uint64 h[8]; @@ -137,7 +147,7 @@ void SHA512_Simple(const void *p, int len, unsigned char *output); struct ssh_cipher { void *(*make_context)(void); void (*free_context)(void *); - void (*sesskey) (void *, unsigned char *key); /* for ssh 1 */ + 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; @@ -147,13 +157,15 @@ struct ssh_cipher { struct ssh2_cipher { 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 (*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; + unsigned int flags; +#define SSH_CIPHER_IS_CBC 1 char *text_name; }; @@ -173,6 +185,13 @@ struct ssh_mac { char *text_name; }; +struct ssh_hash { + void *(*init)(void); /* also allocates context */ + void (*bytes)(void *, void *, int); + void (*final)(void *, unsigned char *); /* also frees context */ + int hlen; /* output length in bytes */ +}; + struct ssh_kex { /* * Plugging in another KEX algorithm requires structural chaos, @@ -184,6 +203,7 @@ struct ssh_kex { char *name, *groupname; const unsigned char *pdata, *gdata;/* NULL means use group exchange */ int plen, glen; + const struct ssh_hash *hash; }; struct ssh_signkey { @@ -233,14 +253,18 @@ 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 ssh2_ciphers ssh2_arcfour; +extern const struct ssh_hash ssh_sha1; +extern const struct ssh_hash ssh_sha256; extern const struct ssh_kex ssh_diffiehellman_group1; extern const struct ssh_kex ssh_diffiehellman_group14; 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; +extern const struct ssh_mac ssh_hmac_md5; +extern const struct ssh_mac ssh_hmac_sha1; +extern const struct ssh_mac ssh_hmac_sha1_buggy; + /* * PuTTY version number formatted as an SSH version string. @@ -270,11 +294,13 @@ void ssh_send_port_open(void *channel, char *hostname, int port, char *org); /* Exports from portfwd.c */ extern const char *pfd_newconnect(Socket * s, char *hostname, int port, - void *c, const Config *cfg); + void *c, const Config *cfg, + int addressfamily); /* desthost == NULL indicates dynamic (SOCKS) port forwarding */ extern const char *pfd_addforward(char *desthost, int destport, char *srcaddr, int port, void *backhandle, - const Config *cfg, void **sockdata); + const Config *cfg, void **sockdata, + int address_family); extern void pfd_close(Socket s); extern void pfd_terminate(void *sockdata); extern int pfd_send(Socket s, char *data, int len); @@ -385,9 +411,9 @@ int import_possible(int type); int import_target_type(int type); int import_encrypted(const Filename *filename, int type, char **comment); int import_ssh1(const Filename *filename, int type, - struct RSAKey *key, char *passphrase); + struct RSAKey *key, char *passphrase, const char **errmsg_p); struct ssh2_userkey *import_ssh2(const Filename *filename, int type, - char *passphrase); + char *passphrase, const char **errmsg_p); int export_ssh1(const Filename *filename, int type, struct RSAKey *key, char *passphrase); int export_ssh2(const Filename *filename, int type, @@ -439,7 +465,7 @@ int zlib_decompress_block(void *, unsigned char *block, int len, unsigned char **outblock, int *outlen); /* - * SSH1 agent messages. + * SSH-1 agent messages. */ #define SSH1_AGENTC_REQUEST_RSA_IDENTITIES 1 #define SSH1_AGENT_RSA_IDENTITIES_ANSWER 2 @@ -450,13 +476,13 @@ int zlib_decompress_block(void *, unsigned char *block, int len, #define SSH1_AGENTC_REMOVE_ALL_RSA_IDENTITIES 9 /* openssh private? */ /* - * Messages common to SSH1 and OpenSSH's SSH2. + * Messages common to SSH-1 and OpenSSH's SSH-2. */ #define SSH_AGENT_FAILURE 5 #define SSH_AGENT_SUCCESS 6 /* - * OpenSSH's SSH2 agent messages. + * OpenSSH's SSH-2 agent messages. */ #define SSH2_AGENTC_REQUEST_IDENTITIES 11 #define SSH2_AGENT_IDENTITIES_ANSWER 12 @@ -467,7 +493,7 @@ int zlib_decompress_block(void *, unsigned char *block, int len, #define SSH2_AGENTC_REMOVE_ALL_IDENTITIES 19 /* - * Need this to warn about support for the original SSH2 keyfile + * Need this to warn about support for the original SSH-2 keyfile * format. */ void old_keyfile_warning(void);