X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/06897bd7828721c71d68f28cf2df4fca57964538..c969e831c5977919d3e1c094acc86e194c50d17c:/ssh.h diff --git a/ssh.h b/ssh.h index 61de0448..e45c653f 100644 --- a/ssh.h +++ b/ssh.h @@ -190,6 +190,7 @@ struct ssh_hash { void (*bytes)(void *, void *, int); void (*final)(void *, unsigned char *); /* also frees context */ int hlen; /* output length in bytes */ + char *text_name; }; struct ssh_kex { @@ -251,6 +252,9 @@ struct ssh2_userkey { char *comment; /* the key comment */ }; +/* The maximum length of any hash algorithm used in kex. (bytes) */ +#define SSH2_KEX_MAX_HASH_LEN (32) /* SHA-256 */ + extern const struct ssh_cipher ssh_3des; extern const struct ssh_cipher ssh_des; extern const struct ssh_cipher ssh_blowfish_ssh1; @@ -383,7 +387,7 @@ 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); + char **commentptr, const char **errorstr); int saversakey(const Filename *filename, struct RSAKey *key, char *passphrase);