X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7c7f68933f946bc20ddc5842b7c61d82fd7ebce7..514702987c9252fcb0ab98882a6603b3bd0505ce:/ssh.h diff --git a/ssh.h b/ssh.h index a12aed30..59a7b460 100644 --- a/ssh.h +++ b/ssh.h @@ -64,12 +64,18 @@ int rsastr_len(struct RSAKey *key); void rsastr_fmt(char *str, struct RSAKey *key); void rsa_fingerprint(char *str, int len, struct RSAKey *key); int rsa_verify(struct RSAKey *key); +unsigned char *rsa_public_blob(struct RSAKey *key, int *len); +int rsa_public_blob_len(void *data); void freersakey(struct RSAKey *key); typedef unsigned int word32; typedef unsigned int uint32; unsigned long crc32(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 */ +int detect_attack(unsigned char *buf, uint32 len, unsigned char *IV); typedef struct { uint32 h[4]; @@ -200,6 +206,7 @@ extern const struct ssh_cipher ssh_3des; extern const struct ssh_cipher ssh_des; extern const struct ssh_cipher ssh_blowfish_ssh1; extern const struct ssh2_ciphers ssh2_3des; +extern const struct ssh2_ciphers ssh2_des; extern const struct ssh2_ciphers ssh2_aes; extern const struct ssh2_ciphers ssh2_blowfish; extern const struct ssh_kex ssh_diffiehellman; @@ -220,7 +227,7 @@ extern char sshver[]; * that fails. This variable is the means by which scp.c can reach * into the SSH code and find out which one it got. */ -extern int ssh_fallback_cmd; +extern int ssh_fallback_cmd(void *handle); #ifndef MSCRYPTOAPI void SHATransform(word32 * digest, word32 * data); @@ -231,8 +238,11 @@ void random_add_noise(void *noise, int length); void random_add_heavynoise(void *noise, int length); void logevent(char *); -void *new_sock_channel(Socket s); // allocates and register a new channel for port forwarding -void ssh_send_port_open(void *channel, char *hostname, int port, char *org); + +/* Allocate and register a new channel for port forwarding */ +void *new_sock_channel(void *handle, Socket s); +void ssh_send_port_open(void *handle, void *channel, + char *hostname, int port, char *org); Bignum copybn(Bignum b); Bignum bn_power_2(int n); @@ -273,6 +283,7 @@ Bignum dh_find_K(Bignum f); int loadrsakey(char *filename, struct RSAKey *key, char *passphrase); int rsakey_encrypted(char *filename, char **comment); +int rsakey_pubblob(char *filename, void **blob, int *bloblen); int saversakey(char *filename, struct RSAKey *key, char *passphrase); @@ -289,10 +300,30 @@ char *ssh2_userkey_loadpub(char *filename, char **algorithm, int ssh2_save_userkey(char *filename, struct ssh2_userkey *key, char *passphrase); -int keyfile_version(char *filename); +enum { + SSH_KEYTYPE_UNOPENABLE, + SSH_KEYTYPE_UNKNOWN, + SSH_KEYTYPE_SSH1, SSH_KEYTYPE_SSH2, + SSH_KEYTYPE_OPENSSH, SSH_KEYTYPE_SSHCOM +}; +int key_type(char *filename); +char *key_type_to_str(int type); + +int import_possible(int type); +int import_target_type(int type); +int import_encrypted(char *filename, int type, char **comment); +int import_ssh1(char *filename, int type, struct RSAKey *key,char *passphrase); +struct ssh2_userkey *import_ssh2(char *filename, int type, char *passphrase); +int export_ssh1(char *filename, int type, struct RSAKey *key,char *passphrase); +int export_ssh2(char *filename, int type, + struct ssh2_userkey *key, char *passphrase); void des3_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len); void des3_encrypt_pubkey(unsigned char *key, unsigned char *blk, int len); +void des3_decrypt_pubkey_ossh(unsigned char *key, unsigned char *iv, + unsigned char *blk, int len); +void des3_encrypt_pubkey_ossh(unsigned char *key, unsigned char *iv, + unsigned char *blk, int len); void aes256_encrypt_pubkey(unsigned char *key, unsigned char *blk, int len); void aes256_decrypt_pubkey(unsigned char *key, unsigned char *blk, @@ -354,3 +385,9 @@ int zlib_decompress_block(unsigned char *block, int len, #define SSH2_AGENTC_ADD_IDENTITY 17 #define SSH2_AGENTC_REMOVE_IDENTITY 18 #define SSH2_AGENTC_REMOVE_ALL_IDENTITIES 19 + +/* + * Need this to warn about support for the original SSH2 keyfile + * format. + */ +void old_keyfile_warning(void);