X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/c2524e4ee3ee57fd5b3b6d44a2026ee742573c3d..062e58118f35e04a9a899e2957545e7593ca5dfc:/ssh.h diff --git a/ssh.h b/ssh.h index 56f9f261..45405d3e 100644 --- a/ssh.h +++ b/ssh.h @@ -4,6 +4,7 @@ #include "puttymem.h" #include "network.h" #include "int64.h" +#include "misc.h" struct ssh_channel; @@ -54,10 +55,10 @@ struct dss_key { Bignum p, q, g, y, x; }; -int makekey(unsigned char *data, struct RSAKey *result, +int makekey(unsigned char *data, int len, struct RSAKey *result, unsigned char **keystr, int order); -int makeprivate(unsigned char *data, struct RSAKey *result); -void rsaencrypt(unsigned char *data, int length, struct RSAKey *key); +int makeprivate(unsigned char *data, int len, struct RSAKey *result); +int rsaencrypt(unsigned char *data, int length, struct RSAKey *key); Bignum rsadecrypt(Bignum input, struct RSAKey *key); void rsasign(unsigned char *data, int length, struct RSAKey *key); void rsasanitise(struct RSAKey *key); @@ -66,13 +67,13 @@ void rsastr_fmt(char *str, struct RSAKey *key); void rsa_fingerprint(char *str, int len, struct RSAKey *key); int rsa_verify(struct RSAKey *key); unsigned char *rsa_public_blob(struct RSAKey *key, int *len); -int rsa_public_blob_len(void *data); +int rsa_public_blob_len(void *data, int maxlen); void freersakey(struct RSAKey *key); typedef unsigned int word32; typedef unsigned int uint32; -unsigned long crc32(const void *s, size_t len); +unsigned long crc32_compute(const void *s, size_t len); unsigned long crc32_update(unsigned long crc_input, const void *s, size_t len); /* SSH CRC compensation attack detector */ @@ -100,6 +101,13 @@ void MD5Init(struct MD5Context *context); void MD5Update(struct MD5Context *context, unsigned char const *buf, unsigned len); void MD5Final(unsigned char digest[16], struct MD5Context *context); +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, void const *key, int len); +void hmacmd5_do_hmac(void *handle, unsigned char const *blk, int len, + unsigned char *hmac); typedef struct { uint32 h[5]; @@ -114,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]; @@ -129,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; @@ -139,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; }; @@ -162,17 +182,28 @@ struct ssh_mac { int (*verify) (void *, unsigned char *blk, int len, unsigned long seq); char *name; int len; + 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, * so it's hard to abstract them into nice little structures - * like this. Hence, for the moment, this is just a - * placeholder. I claim justification in the fact that OpenSSH - * does this too :-) + * like this. Fortunately, all our KEXes are basically + * Diffie-Hellman at the moment, so in this structure I simply + * parametrise the DH exchange a bit. */ - char *name; + char *name, *groupname; + const unsigned char *pdata, *gdata;/* NULL means use group exchange */ + int plen, glen; + const struct ssh_hash *hash; }; struct ssh_signkey { @@ -185,6 +216,7 @@ struct ssh_signkey { unsigned char *priv_blob, int priv_len); void *(*openssh_createkey) (unsigned char **blob, int *len); int (*openssh_fmtkey) (void *key, unsigned char *blob, int len); + int (*pubkey_bits) (void *blob, int len); char *(*fingerprint) (void *key); int (*verifysig) (void *key, char *sig, int siglen, char *data, int datalen); @@ -221,13 +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 ssh_kex ssh_diffiehellman; +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. @@ -249,35 +286,50 @@ int random_byte(void); void random_add_noise(void *noise, int length); void random_add_heavynoise(void *noise, int length); -void logevent(void *, char *); +void logevent(void *, const char *); /* Allocate and register a new channel for port forwarding */ void *new_sock_channel(void *handle, Socket s); void ssh_send_port_open(void *channel, char *hostname, int port, char *org); /* Exports from portfwd.c */ -extern char *pfd_newconnect(Socket * s, char *hostname, int port, void *c); -extern char *pfd_addforward(char *desthost, int destport, char *srcaddr, - int port, void *backhandle, int acceptall); +extern const char *pfd_newconnect(Socket * s, char *hostname, int port, + 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, + 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); extern void pfd_confirm(Socket s); extern void pfd_unthrottle(Socket s); extern void pfd_override_throttle(Socket s, int enable); /* Exports from x11fwd.c */ -extern char *x11_init(Socket *, char *, void *, void *, const char *, int); +extern const char *x11_init(Socket *, char *, void *, void *, const char *, + int, const Config *); extern void x11_close(Socket); extern int x11_send(Socket, char *, int); extern void *x11_invent_auth(char *, int, char *, int, int); +extern void x11_free_auth(void *); extern void x11_unthrottle(Socket s); extern void x11_override_throttle(Socket s, int enable); extern int x11_get_screen_number(char *display); void x11_get_real_auth(void *authv, char *display); +char *x11_display(const char *display); -/* Platfdorm-dependent X11 function */ +/* Platform-dependent X11 functions */ extern void platform_get_x11_auth(char *display, int *proto, unsigned char *data, int *datalen); +extern const char platform_x11_best_transport[]; +/* best X11 hostname for this platform if none specified */ +SockAddr platform_get_x11_unix_address(int displaynum, char **canonicalname); +/* make up a SockAddr naming the address for displaynum */ +char *platform_get_x_display(void); +/* allocated local X display string, if any */ Bignum copybn(Bignum b); Bignum bn_power_2(int n); @@ -289,7 +341,7 @@ Bignum modmul(Bignum a, Bignum b, Bignum mod); void decbn(Bignum n); extern Bignum Zero, One; Bignum bignum_from_bytes(const unsigned char *data, int nbytes); -int ssh1_read_bignum(const unsigned char *data, Bignum * result); +int ssh1_read_bignum(const unsigned char *data, int len, Bignum * result); int bignum_bitcount(Bignum bn); int ssh1_bignum_length(Bignum bn); int ssh2_bignum_length(Bignum bn); @@ -310,17 +362,23 @@ 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); +#ifdef DEBUG +void diagbn(char *prefix, Bignum md); +#endif + +void *dh_setup_group(const struct ssh_kex *kex); +void *dh_setup_gex(Bignum pval, Bignum gval); void dh_cleanup(void *); Bignum dh_create_e(void *, int nbits); Bignum dh_find_K(void *, Bignum f); -int loadrsakey(char *filename, struct RSAKey *key, char *passphrase); -int rsakey_encrypted(char *filename, char **comment); -int rsakey_pubblob(char *filename, void **blob, int *bloblen); +int loadrsakey(const Filename *filename, struct RSAKey *key, + char *passphrase, const char **errorstr); +int rsakey_encrypted(const Filename *filename, char **comment); +int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen, + const char **errorstr); -int saversakey(char *filename, struct RSAKey *key, char *passphrase); +int saversakey(const Filename *filename, struct RSAKey *key, char *passphrase); extern int base64_decode_atom(char *atom, unsigned char *out); extern int base64_lines(int datalen); @@ -331,12 +389,14 @@ extern void base64_encode(FILE *fp, unsigned char *data, int datalen, int cpl); 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, +int ssh2_userkey_encrypted(const Filename *filename, char **comment); +struct ssh2_userkey *ssh2_load_userkey(const Filename *filename, + char *passphrase, const char **errorstr); +char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm, + int *pub_blob_len, const char **errorstr); +int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key, char *passphrase); +const struct ssh_signkey *find_pubkey_alg(const char *name); enum { SSH_KEYTYPE_UNOPENABLE, @@ -344,16 +404,19 @@ enum { SSH_KEYTYPE_SSH1, SSH_KEYTYPE_SSH2, SSH_KEYTYPE_OPENSSH, SSH_KEYTYPE_SSHCOM }; -int key_type(char *filename); +int key_type(const Filename *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, +int import_encrypted(const Filename *filename, int type, char **comment); +int import_ssh1(const Filename *filename, int type, + struct RSAKey *key, char *passphrase, const char **errmsg_p); +struct ssh2_userkey *import_ssh2(const Filename *filename, int type, + 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, struct ssh2_userkey *key, char *passphrase); void des3_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len); @@ -402,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 @@ -413,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 @@ -430,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);