X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/3455765983d7c609f6720fff879c8f1a273442f9..55fb297890fbd83482db2d2516a9392befb3eb21:/ssh.h?ds=inline diff --git a/ssh.h b/ssh.h index 43060c92..d0543cd9 100644 --- a/ssh.h +++ b/ssh.h @@ -269,6 +269,8 @@ extern const struct ssh_signkey ssh_rsa; 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; +extern const struct ssh_mac ssh_hmac_sha1_96; +extern const struct ssh_mac ssh_hmac_sha1_96_buggy; /* @@ -381,7 +383,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); @@ -398,7 +400,8 @@ 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 *pub_blob_len, char **commentptr, + 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);