--- gvpe/src/connection.C	2004/01/27 05:56:35	1.28
+++ gvpe/src/connection.C	2004/02/08 07:24:25	1.31
@@ -19,10 +19,6 @@
 
 #include "config.h"
 
-extern "C" {
-# include "lzf/lzf.h"
-}
-
 #include <cassert>
 
 #include <list>
@@ -48,6 +44,12 @@
 
 #define MAGIC "vped\xbd\xc6\xdb\x82"	// 8 bytes of magic
 
+#define ULTRA_FAST 1
+#define HLOG 15
+#include "lzf/lzf.h"
+#include "lzf/lzf_c.c"
+#include "lzf/lzf_d.c"
+
 struct crypto_ctx
 {
   EVP_CIPHER_CTX cctx;
@@ -60,14 +62,14 @@
 crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
 {
   EVP_CIPHER_CTX_init (&cctx);
-  EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc);
+  require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
   HMAC_CTX_init (&hctx);
   HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
 }
 
 crypto_ctx::~crypto_ctx ()
 {
-  EVP_CIPHER_CTX_cleanup (&cctx);
+  require (EVP_CIPHER_CTX_cleanup (&cctx));
   HMAC_CTX_cleanup (&hctx);
 }
 
@@ -77,10 +79,10 @@
   EVP_MD_CTX ctx;
 
   EVP_MD_CTX_init (&ctx);
-  EVP_DigestInit (&ctx, RSA_HASH);
-  EVP_DigestUpdate(&ctx, &chg, sizeof chg);
-  EVP_DigestUpdate(&ctx, &id, sizeof id);
-  EVP_DigestFinal (&ctx, (unsigned char *)&h, 0);
+  require (EVP_DigestInit (&ctx, RSA_HASH));
+  require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
+  require (EVP_DigestUpdate(&ctx, &id, sizeof id));
+  require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
   EVP_MD_CTX_cleanup (&ctx);
 }
 
@@ -335,21 +337,24 @@
 
 #if ENABLE_COMPRESSION
   u8 cdata[MAX_MTU];
-  u32 cl;
 
-  cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
-  if (cl)
+  if (conn->features & ENABLE_COMPRESSION)
     {
-      type = PT_DATA_COMPRESSED;
-      d = cdata;
-      l = cl + 2;
+      u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
 
-      d[0] = cl >> 8;
-      d[1] = cl;
+      if (cl)
+        {
+          type = PT_DATA_COMPRESSED;
+          d = cdata;
+          l = cl + 2;
+
+          d[0] = cl >> 8;
+          d[1] = cl;
+        }
     }
 #endif
 
-  EVP_EncryptInit_ex (cctx, 0, 0, 0, 0);
+  require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
 
   struct {
 #if RAND_SIZE
@@ -363,17 +368,17 @@
   RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
 #endif
 
-  EVP_EncryptUpdate (cctx,
+  require (EVP_EncryptUpdate (cctx,
                      (unsigned char *) data + outl, &outl2,
-                     (unsigned char *) &datahdr, DATAHDR);
+                     (unsigned char *) &datahdr, DATAHDR));
   outl += outl2;
 
-  EVP_EncryptUpdate (cctx,
+  require (EVP_EncryptUpdate (cctx,
                      (unsigned char *) data + outl, &outl2,
-                     (unsigned char *) d, l);
+                     (unsigned char *) d, l));
   outl += outl2;
 
-  EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2);
+  require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
   outl += outl2;
 
   len = outl + data_hdr_size ();
@@ -392,7 +397,7 @@
   u8 *d;
   u32 l = len - data_hdr_size ();
 
-  EVP_DecryptInit_ex (cctx, 0, 0, 0, 0);
+  require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
 
 #if ENABLE_COMPRESSION
   u8 cdata[MAX_MTU];
@@ -404,12 +409,12 @@
     d = &(*p)[6 + 6 - DATAHDR];
 
   /* this overwrites part of the src mac, but we fix that later */
-  EVP_DecryptUpdate (cctx,
+  require (EVP_DecryptUpdate (cctx,
                      d, &outl2,
-                     (unsigned char *)&data, len - data_hdr_size ());
+                     (unsigned char *)&data, len - data_hdr_size ()));
   outl += outl2;
 
-  EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2);
+  require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
   outl += outl2;
   
   seqno = ntohl (*(u32 *)(d + RAND_SIZE));
@@ -448,27 +453,25 @@
   // field comes before this data, so peers with other
   // hmacs simply will not work.
   u8 prot_major, prot_minor, randsize, hmaclen;
-  u8 flags, challengelen, pad2, pad3;
+  u8 flags, challengelen, features, pad3;
   u32 cipher_nid, digest_nid, hmac_nid;
 
-  const u8 curflags () const
-  {
-    return 0x80
-           | (ENABLE_COMPRESSION ? 0x01 : 0x00);
-  }
-
   void setup (ptype type, int dst);
   bool chk_config () const;
 };
 
+#define FEATURES ((ENABLE_COMPRESSION ? FEATURE_COMPRESSION : 0) \
+                | (ENABLE_ROHC        ? FEATURE_ROHC        : 0))
+
 void config_packet::setup (ptype type, int dst)
 {
   prot_major = PROTOCOL_MAJOR;
   prot_minor = PROTOCOL_MINOR;
   randsize = RAND_SIZE;
   hmaclen = HMACLENGTH;
-  flags = curflags ();
+  flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
   challengelen = sizeof (rsachallenge);
+  features = FEATURES;
 
   cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
   digest_nid = htonl (EVP_MD_type (RSA_HASH));
@@ -486,8 +489,10 @@
     slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
   else if (hmaclen != HMACLENGTH)
     slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
+#if 0 // this implementation should handle all flag settings
   else if (flags != curflags ())
     slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
+#endif
   else if (challengelen != sizeof (rsachallenge))
     slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
   else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
@@ -916,7 +921,11 @@
                     octx   = new crypto_ctx (k, 1);
                     oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
 
+                    // compatibility code, remove when no longer required
+                    if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
+
                     conf->protocols = p->protocols;
+                    features = p->features & FEATURES;
 
                     send_auth_response (rsi, p->id, k);