projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rationalised host key storage. Also started code reorg: persistent-state
[u/mdw/putty]
/
ssh.h
diff --git
a/ssh.h
b/ssh.h
index
a2b6401
..
6a49863
100644
(file)
--- a/
ssh.h
+++ b/
ssh.h
@@
-48,6
+48,7
@@
void rsasign(unsigned char *data, int length, struct RSAKey *key);
void rsasanitise(struct RSAKey *key);
int rsastr_len(struct RSAKey *key);
void rsastr_fmt(char *str, struct RSAKey *key);
void rsasanitise(struct RSAKey *key);
int rsastr_len(struct RSAKey *key);
void rsastr_fmt(char *str, struct RSAKey *key);
+void rsa_fingerprint(char *str, int len, struct RSAKey *key);
void freersakey(struct RSAKey *key);
typedef unsigned int word32;
void freersakey(struct RSAKey *key);
typedef unsigned int word32;
@@
-122,8
+123,10
@@
struct ssh_kex {
struct ssh_hostkey {
void (*setkey)(char *data, int len);
char *(*fmtkey)(void);
struct ssh_hostkey {
void (*setkey)(char *data, int len);
char *(*fmtkey)(void);
+ char *(*fingerprint)(void);
int (*verifysig)(char *sig, int siglen, char *data, int datalen);
char *name;
int (*verifysig)(char *sig, int siglen, char *data, int datalen);
char *name;
+ char *keytype; /* for host key cache */
};
struct ssh_compress {
};
struct ssh_compress {
@@
-156,7
+159,7
@@
Bignum dh_create_e(void);
Bignum dh_find_K(Bignum f);
int loadrsakey(char *filename, struct RSAKey *key, char *passphrase);
Bignum dh_find_K(Bignum f);
int loadrsakey(char *filename, struct RSAKey *key, char *passphrase);
-int rsakey_encrypted(char *filename);
+int rsakey_encrypted(char *filename
, char **comment
);
void des3_decrypt_pubkey(unsigned char *key,
unsigned char *blk, int len);
void des3_decrypt_pubkey(unsigned char *key,
unsigned char *blk, int len);