~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Close the host keys file after use. Well spotted Theo Markettos.
[sgt/putty]
/
ssh.h
diff --git
a/ssh.h
b/ssh.h
index
9760093
..
3320098
100644
(file)
--- a/
ssh.h
+++ b/
ssh.h
@@
-73,7
+73,7
@@
void freersakey(struct RSAKey *key);
typedef unsigned int word32;
typedef unsigned int uint32;
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 */
unsigned long crc32_update(unsigned long crc_input, const void *s, size_t len);
/* SSH CRC compensation attack detector */
@@
-327,9
+327,10
@@
Bignum dh_create_e(void *, int nbits);
Bignum dh_find_K(void *, Bignum f);
int loadrsakey(const Filename *filename, struct RSAKey *key,
Bignum dh_find_K(void *, Bignum f);
int loadrsakey(const Filename *filename, struct RSAKey *key,
- char *passphrase);
+ char *passphrase
, const char **errorstr
);
int rsakey_encrypted(const Filename *filename, char **comment);
int rsakey_encrypted(const Filename *filename, char **comment);
-int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen);
+int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen,
+ const char **errorstr);
int saversakey(const Filename *filename, struct RSAKey *key, char *passphrase);
int saversakey(const Filename *filename, struct RSAKey *key, char *passphrase);
@@
-344,9
+345,9
@@
extern struct ssh2_userkey ssh2_wrong_passphrase;
int ssh2_userkey_encrypted(const Filename *filename, char **comment);
struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
int ssh2_userkey_encrypted(const Filename *filename, char **comment);
struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
- char *passphrase);
+ char *passphrase
, const char **errorstr
);
char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
- int *pub_blob_len);
+ int *pub_blob_len
, const char **errorstr
);
int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key,
char *passphrase);
int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key,
char *passphrase);