aboutsummaryrefslogtreecommitdiff
path: root/tools/plink/ssh.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-11-19 13:13:51 +0000
committermarha <marha@users.sourceforge.net>2010-11-19 13:13:51 +0000
commitbd5413c3a7e500fa8c8ccd68a33d2fcc4c172e28 (patch)
treeb77dfbc85a3ad280e488b7840ac42221785e0831 /tools/plink/ssh.h
parent87e3509a1a9724e6115385686d9121f6c4a0f473 (diff)
parent773752eab55047c33bad0d88006bb69f5c601502 (diff)
downloadvcxsrv-bd5413c3a7e500fa8c8ccd68a33d2fcc4c172e28.tar.gz
vcxsrv-bd5413c3a7e500fa8c8ccd68a33d2fcc4c172e28.tar.bz2
vcxsrv-bd5413c3a7e500fa8c8ccd68a33d2fcc4c172e28.zip
svn merge ^/branches/released .
Diffstat (limited to 'tools/plink/ssh.h')
-rw-r--r--tools/plink/ssh.h14
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.