X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ssh.h;h=75aad70ba82beddc788da304ef1c4250c6d6b1de;hb=2eb952ca31aa13d1f6f429305fbb6f43a9a28c56;hp=db694c58424be3643dcef624ceb2ac87b21995d6;hpb=f7713d452d37e9b314af48bb295d418b185989b7;p=PuTTY.git diff --git a/ssh.h b/ssh.h index db694c58..75aad70b 100644 --- a/ssh.h +++ b/ssh.h @@ -24,6 +24,7 @@ void sshfwd_x11_is_local(struct ssh_channel *c); extern Socket ssh_connection_sharing_init(const char *host, int port, Conf *conf, Ssh ssh, void **state); +int ssh_share_test_for_upstream(const char *host, int port, Conf *conf); void share_got_pkt_from_server(void *ctx, int type, unsigned char *pkt, int pktlen); void share_activate(void *state, const char *server_verstring); @@ -319,7 +320,19 @@ struct ssh2_cipher { void (*decrypt_length) (void *, unsigned char *blk, int len, unsigned long seq); const char *name; int blksize; - int keylen; + /* real_keybits is the number of bits of entropy genuinely used by + * the cipher scheme; it's used for deciding how big a + * Diffie-Hellman group is needed to exchange a key for the + * cipher. */ + int real_keybits; + /* padded_keybytes is the number of bytes of key data expected as + * input to the setkey function; it's used for deciding how much + * data needs to be generated from the post-kex generation of key + * material. In a sensible cipher which uses all its key bytes for + * real work, this will just be real_keybits/8, but in DES-type + * ciphers which ignore one bit in each byte, it'll be slightly + * different. */ + int padded_keybytes; unsigned int flags; #define SSH_CIPHER_IS_CBC 1 #define SSH_CIPHER_SEPARATE_LENGTH 2 @@ -347,14 +360,16 @@ struct ssh_mac { void (*genresult) (void *, unsigned char *); int (*verresult) (void *, unsigned char const *); const char *name, *etm_name; - int len; + int len, keylen; const char *text_name; }; struct ssh_hash { void *(*init)(void); /* also allocates context */ + void *(*copy)(const void *); void (*bytes)(void *, const void *, int); void (*final)(void *, unsigned char *); /* also frees context */ + void (*free)(void *); int hlen; /* output length in bytes */ const char *text_name; };