svn merge ^/branches/released .

1 files changed, 13 insertions, 1 deletions

diff --git a/tools/plink/ssh.h b/tools/plink/ssh.h
index 814939c2b..86c402965 100644
--- a/tools/plink/ssh.h
+++ b/tools/plink/ssh.h
@@ -71,8 +71,12 @@ unsigned char *rsa_public_blob(struct RSAKey *key, int *len);
 int rsa_public_blob_len(void *data, int maxlen);

 void freersakey(struct RSAKey *key);

 

-typedef unsigned int word32;

+#ifndef PUTTY_UINT32_DEFINED

+/* This makes assumptions about the int type. */

 typedef unsigned int uint32;

+#define PUTTY_UINT32_DEFINED

+#endif

+typedef uint32 word32;

 

 unsigned long crc32_compute(const void *s, size_t len);

 unsigned long crc32_update(unsigned long crc_input, const void *s, size_t len);

@@ -290,6 +294,14 @@ 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;

 

+void *aes_make_context(void);

+void aes_free_context(void *handle);

+void aes128_key(void *handle, unsigned char *key);

+void aes192_key(void *handle, unsigned char *key);

+void aes256_key(void *handle, unsigned char *key);

+void aes_iv(void *handle, unsigned char *iv);

+void aes_ssh2_encrypt_blk(void *handle, unsigned char *blk, int len);

+void aes_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len);

 

 /*

  * PuTTY version number formatted as an SSH version string.