X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/222d54dc209210b6e43589c798e35e21273b4082..055817455466c8eb60392f30bb7c689763962e17:/ssh.h diff --git a/ssh.h b/ssh.h index 3320098b..9a57205d 100644 --- a/ssh.h +++ b/ssh.h @@ -55,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); @@ -67,7 +67,7 @@ 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; @@ -101,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]; @@ -163,17 +170,20 @@ struct ssh_mac { 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 { @@ -186,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); @@ -222,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; @@ -258,12 +270,15 @@ 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); + 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); @@ -280,10 +295,17 @@ 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); @@ -295,7 +317,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); @@ -320,8 +342,8 @@ char *bignum_decimal(Bignum x); void diagbn(char *prefix, Bignum md); #endif -void *dh_setup_group1(void); -void *dh_setup_group(Bignum pval, Bignum gval); +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); @@ -350,6 +372,7 @@ 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,