Fix bugtraq 1949: server could open an agent forwarding channel even

[u/mdw/putty] / ssh.h

diff --git a/ssh.h b/ssh.h
index 5fe33c3..3d89dee 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -137,6 +137,12 @@ struct ssh_hostkey {
 
 struct ssh_compress {
     char *name;
+    void (*compress_init)(void);
+    int (*compress)(unsigned char *block, int len,
+                   unsigned char **outblock, int *outlen);
+    void (*decompress_init)(void);
+    int (*decompress)(unsigned char *block, int len,
+                     unsigned char **outblock, int *outlen);
 };
 
 #ifndef MSCRYPTOAPI
@@ -153,8 +159,8 @@ Bignum newbn(int length);
 Bignum copybn(Bignum b);
 Bignum bignum_from_short(unsigned short n);
 void freebn(Bignum b);
-void modpow(Bignum base, Bignum exp, Bignum mod, Bignum result);
-void modmul(Bignum a, Bignum b, Bignum mod, Bignum result);
+Bignum modpow(Bignum base, Bignum exp, Bignum mod);
+Bignum modmul(Bignum a, Bignum b, Bignum mod);
 void decbn(Bignum n);
 extern Bignum Zero, One;
 int ssh1_read_bignum(unsigned char *data, Bignum *result);
@@ -197,3 +203,13 @@ int rsa_generate(struct RSAKey *key, struct RSAAux *aux, int bits,
                  progfn_t pfn, void *pfnparam);
 Bignum primegen(int bits, int modulus, int residue,
                 int phase, progfn_t pfn, void *pfnparam);
+
+/*
+ * zlib compression.
+ */
+void zlib_compress_init(void);
+void zlib_decompress_init(void);
+int zlib_compress_block(unsigned char *block, int len,
+                       unsigned char **outblock, int *outlen);
+int zlib_decompress_block(unsigned char *block, int len,
+                         unsigned char **outblock, int *outlen);