X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/371e569c350575d3f9b41c71e2ff51de9ef62483..055817455466c8eb60392f30bb7c689763962e17:/ssh.h diff --git a/ssh.h b/ssh.h index a99b6336..9a57205d 100644 --- a/ssh.h +++ b/ssh.h @@ -1,8 +1,10 @@ +#include #include #include "puttymem.h" #include "network.h" #include "int64.h" +#include "misc.h" struct ssh_channel; @@ -53,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); @@ -65,17 +67,20 @@ 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 */ -int detect_attack(unsigned char *buf, uint32 len, unsigned char *IV); +void *crcda_make_context(void); +void crcda_free_context(void *handle); +int detect_attack(void *handle, unsigned char *buf, uint32 len, + unsigned char *IV); typedef struct { uint32 h[4]; @@ -96,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, unsigned char const *key, int len); +void hmacmd5_do_hmac(void *handle, unsigned char const *blk, int len, + unsigned char *hmac); typedef struct { uint32 h[5]; @@ -151,23 +163,27 @@ struct ssh2_ciphers { }; struct ssh_mac { - void (*setcskey) (unsigned char *key); - void (*setsckey) (unsigned char *key); - void (*generate) (unsigned char *blk, int len, unsigned long seq); - int (*verify) (unsigned char *blk, int len, unsigned long seq); + void *(*make_context)(void); + void (*free_context)(void *); + void (*setkey) (void *, unsigned char *key); + void (*generate) (void *, unsigned char *blk, int len, unsigned long seq); + int (*verify) (void *, unsigned char *blk, int len, unsigned long seq); char *name; int len; + char *text_name; }; 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; }; struct ssh_signkey { @@ -180,6 +196,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); @@ -191,13 +208,16 @@ struct ssh_signkey { struct ssh_compress { char *name; - void (*compress_init) (void); - int (*compress) (unsigned char *block, int len, + void *(*compress_init) (void); + void (*compress_cleanup) (void *); + int (*compress) (void *, unsigned char *block, int len, unsigned char **outblock, int *outlen); - void (*decompress_init) (void); - int (*decompress) (unsigned char *block, int len, + void *(*decompress_init) (void); + void (*decompress_cleanup) (void *); + int (*decompress) (void *, unsigned char *block, int len, unsigned char **outblock, int *outlen); - int (*disable_compression) (void); + int (*disable_compression) (void *); + char *text_name; }; struct ssh2_userkey { @@ -213,7 +233,8 @@ 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 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; @@ -241,12 +262,50 @@ int random_byte(void); void random_add_noise(void *noise, int length); void random_add_heavynoise(void *noise, int length); -void logevent(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 *handle, void *channel, - char *hostname, int port, char *org); +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, + 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 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); + +/* 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); @@ -257,8 +316,8 @@ 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); +Bignum bignum_from_bytes(const unsigned char *data, int nbytes); +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); @@ -279,30 +338,41 @@ 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(int nbits); -Bignum dh_find_K(Bignum f); +#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); -void base64_encode_atom(unsigned char *data, int n, char *out); +extern int base64_decode_atom(char *atom, unsigned char *out); +extern int base64_lines(int datalen); +extern void base64_encode_atom(unsigned char *data, int n, char *out); +extern void base64_encode(FILE *fp, unsigned char *data, int datalen, int cpl); /* 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, +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, @@ -310,16 +380,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); +struct ssh2_userkey *import_ssh2(const Filename *filename, int type, + char *passphrase); +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); @@ -333,6 +406,9 @@ void aes256_encrypt_pubkey(unsigned char *key, unsigned char *blk, void aes256_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len); +void des_encrypt_xdmauth(unsigned char *key, unsigned char *blk, int len); +void des_decrypt_xdmauth(unsigned char *key, unsigned char *blk, int len); + /* * For progress updates in the key generation utility. */ @@ -355,11 +431,13 @@ Bignum primegen(int bits, int modulus, int residue, Bignum factor, /* * zlib compression. */ -void zlib_compress_init(void); -void zlib_decompress_init(void); -int zlib_compress_block(unsigned char *block, int len, +void *zlib_compress_init(void); +void zlib_compress_cleanup(void *); +void *zlib_decompress_init(void); +void zlib_decompress_cleanup(void *); +int zlib_compress_block(void *, unsigned char *block, int len, unsigned char **outblock, int *outlen); -int zlib_decompress_block(unsigned char *block, int len, +int zlib_decompress_block(void *, unsigned char *block, int len, unsigned char **outblock, int *outlen); /*