ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

Comparing gvpe/src/connection.C (file contents):
Revision 1.29 by pcg, Thu Jan 29 18:55:10 2004 UTC vs.
Revision 1.31 by pcg, Sun Feb 8 07:24:25 2004 UTC

… …
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 18*/
19 19
20#include "config.h" 20#include "config.h"
21 21
22extern "C" {
23# include "lzf/lzf.h"
24}
25
26#include <cassert> 22#include <cassert>
27 23
28#include <list> 24#include <list>
29 25
30#include <openssl/rand.h> 26#include <openssl/rand.h>
… …
45#if !HAVE_RAND_PSEUDO_BYTES 41#if !HAVE_RAND_PSEUDO_BYTES
46# define RAND_pseudo_bytes RAND_bytes 42# define RAND_pseudo_bytes RAND_bytes
47#endif 43#endif
48 44
49#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
46
47#define ULTRA_FAST 1
48#define HLOG 15
49#include "lzf/lzf.h"
50#include "lzf/lzf_c.c"
51#include "lzf/lzf_d.c"
50 52
51struct crypto_ctx 53struct crypto_ctx
52{ 54{
53 EVP_CIPHER_CTX cctx; 55 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 56 HMAC_CTX hctx;
… …
333 int outl = 0, outl2; 335 int outl = 0, outl2;
334 ptype type = PT_DATA_UNCOMPRESSED; 336 ptype type = PT_DATA_UNCOMPRESSED;
335 337
336#if ENABLE_COMPRESSION 338#if ENABLE_COMPRESSION
337 u8 cdata[MAX_MTU]; 339 u8 cdata[MAX_MTU];
338 u32 cl;
339 340
341 if (conn->features & ENABLE_COMPRESSION)
342 {
340 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344
341 if (cl) 345 if (cl)
342 { 346 {
343 type = PT_DATA_COMPRESSED; 347 type = PT_DATA_COMPRESSED;
344 d = cdata; 348 d = cdata;
345 l = cl + 2; 349 l = cl + 2;
346 350
347 d[0] = cl >> 8; 351 d[0] = cl >> 8;
348 d[1] = cl; 352 d[1] = cl;
353 }
349 } 354 }
350#endif 355#endif
351 356
352 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 357 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
353 358
… …
446{ 451{
447 // actually, hmaclen cannot be checked because the hmac 452 // actually, hmaclen cannot be checked because the hmac
448 // field comes before this data, so peers with other 453 // field comes before this data, so peers with other
449 // hmacs simply will not work. 454 // hmacs simply will not work.
450 u8 prot_major, prot_minor, randsize, hmaclen; 455 u8 prot_major, prot_minor, randsize, hmaclen;
451 u8 flags, challengelen, pad2, pad3; 456 u8 flags, challengelen, features, pad3;
452 u32 cipher_nid, digest_nid, hmac_nid; 457 u32 cipher_nid, digest_nid, hmac_nid;
453
454 const u8 curflags () const
455 {
456 return 0x80
457 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
458 }
459 458
460 void setup (ptype type, int dst); 459 void setup (ptype type, int dst);
461 bool chk_config () const; 460 bool chk_config () const;
462}; 461};
462
463#define FEATURES ((ENABLE_COMPRESSION ? FEATURE_COMPRESSION : 0) \
464 | (ENABLE_ROHC ? FEATURE_ROHC : 0))
463 465
464void config_packet::setup (ptype type, int dst) 466void config_packet::setup (ptype type, int dst)
465{ 467{
466 prot_major = PROTOCOL_MAJOR; 468 prot_major = PROTOCOL_MAJOR;
467 prot_minor = PROTOCOL_MINOR; 469 prot_minor = PROTOCOL_MINOR;
468 randsize = RAND_SIZE; 470 randsize = RAND_SIZE;
469 hmaclen = HMACLENGTH; 471 hmaclen = HMACLENGTH;
470 flags = curflags (); 472 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
471 challengelen = sizeof (rsachallenge); 473 challengelen = sizeof (rsachallenge);
474 features = FEATURES;
472 475
473 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 476 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
474 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 477 digest_nid = htonl (EVP_MD_type (RSA_HASH));
475 hmac_nid = htonl (EVP_MD_type (DIGEST)); 478 hmac_nid = htonl (EVP_MD_type (DIGEST));
476 479
… …
484 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 487 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
485 else if (randsize != RAND_SIZE) 488 else if (randsize != RAND_SIZE)
486 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 489 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
487 else if (hmaclen != HMACLENGTH) 490 else if (hmaclen != HMACLENGTH)
488 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 491 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
492#if 0 // this implementation should handle all flag settings
489 else if (flags != curflags ()) 493 else if (flags != curflags ())
490 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ()); 494 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
495#endif
491 else if (challengelen != sizeof (rsachallenge)) 496 else if (challengelen != sizeof (rsachallenge))
492 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 497 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
493 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 498 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
494 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 499 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
495 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 500 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
914 delete octx; 919 delete octx;
915 920
916 octx = new crypto_ctx (k, 1); 921 octx = new crypto_ctx (k, 1);
917 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
918 923
924 // compatibility code, remove when no longer required
925 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
926
919 conf->protocols = p->protocols; 927 conf->protocols = p->protocols;
928 features = p->features & FEATURES;
920 929
921 send_auth_response (rsi, p->id, k); 930 send_auth_response (rsi, p->id, k);
922 931
923 connection_established (); 932 connection_established ();
924 933

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines