--- gvpe/src/connection.C 2003/10/14 03:22:09 1.19 +++ gvpe/src/connection.C 2004/02/08 07:24:25 1.31 @@ -1,5 +1,6 @@ /* connection.C -- manage a single connection + Copyright (C) 2003-2004 Marc Lehmann This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +19,7 @@ #include "config.h" -extern "C" { -# include "lzf/lzf.h" -} +#include #include @@ -37,22 +36,7 @@ #include "vpn.h" #include "connection.h" -#include -#ifdef HAVE_NETINET_IN_H -# include -#endif -#include -#include -#ifdef HAVE_NETINET_IN_SYSTM_H -# include -#endif -#ifdef HAVE_NETINET_IP_H -# include -#endif - -#ifndef IPTOS_TOS_MASK -# define IPTOS_TOS_MASK (IPTOS_LOWDELAY | IPTOS_THROUGHPUT | IPTOS_RELIABILITY | IPTOS_MINCOST) -#endif +#include "netcompat.h" #if !HAVE_RAND_PSEUDO_BYTES # define RAND_pseudo_bytes RAND_bytes @@ -60,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; @@ -72,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); } @@ -89,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); } @@ -150,11 +140,9 @@ void rsa_cache::cleaner_cb (time_watcher &w) { - if (empty ()) - w.at = TSTAMP_CANCEL; - else + if (!empty ()) { - w.at = NOW + RSA_TTL; + w.start (NOW + RSA_TTL); for (iterator i = begin (); i != end (); ) if (i->expire <= NOW) @@ -326,7 +314,7 @@ #define MAXVPNDATA (MAX_MTU - 6 - 6) #define DATAHDR (sizeof (u32) + RAND_SIZE) -struct vpndata_packet:vpn_packet +struct vpndata_packet : vpn_packet { u8 data[MAXVPNDATA + DATAHDR]; // seqno @@ -349,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); + + if (cl) + { + type = PT_DATA_COMPRESSED; + d = cdata; + l = cl + 2; - d[0] = cl >> 8; - d[1] = cl; + 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 @@ -377,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 (); @@ -406,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]; @@ -418,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)); @@ -462,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)); @@ -495,21 +484,23 @@ bool config_packet::chk_config () const { if (prot_major != PROTOCOL_MAJOR) - slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); + slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); else if (randsize != RAND_SIZE) - slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); + slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); else if (hmaclen != HMACLENGTH) - slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), 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 (%x <=> %x)"), 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 (%d <=> %d)"), 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))) - slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); + slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) - slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); + slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) - slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); + slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); else return true; @@ -520,7 +511,7 @@ { char magic[8]; u8 initiate; // false if this is just an automatic reply - u8 protocols; // supported protocols (will get patches on forward) + u8 protocols; // supported protocols (will be patched on forward) u8 pad2, pad3; rsaid id; rsaencrdata encr; @@ -614,8 +605,8 @@ { retry_cnt = 0; establish_connection.start (NOW + 5); - keepalive.reset (); - rekey.reset (); + keepalive.stop (); + rekey.stop (); } } @@ -691,13 +682,8 @@ auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); rsachallenge chg; - rsa_cache.gen (pkt->id, chg); - - if (0 > RSA_public_encrypt (sizeof chg, - (unsigned char *)&chg, (unsigned char *)&pkt->encr, - conf->rsa_key, RSA_PKCS1_OAEP_PADDING)) - fatal ("RSA_public_encrypt error"); + rsa_encrypt (conf->rsa_key, chg, pkt->encr); slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); @@ -741,18 +727,18 @@ void connection::establish_connection_cb (time_watcher &w) { - if (ictx || conf == THISNODE - || connectmode == conf_node::C_NEVER - || connectmode == conf_node::C_DISABLED) - w.at = TSTAMP_CANCEL; - else if (w.at <= NOW) + if (!ictx + && conf != THISNODE + && connectmode != conf_node::C_NEVER + && connectmode != conf_node::C_DISABLED + && NOW > w.at) { double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; if (retry_int < 3600 * 8) retry_cnt++; - w.at = NOW + retry_int; + w.start (NOW + retry_int); reset_si (); @@ -793,9 +779,9 @@ last_activity = 0; retry_cnt = 0; - rekey.reset (); - keepalive.reset (); - establish_connection.reset (); + rekey.stop (); + keepalive.stop (); + establish_connection.stop (); } void @@ -810,25 +796,21 @@ void connection::rekey_cb (time_watcher &w) { - w.at = TSTAMP_CANCEL; - reset_connection (); establish_connection (); } void -connection::send_data_packet (tap_packet *pkt, bool broadcast) +connection::send_data_packet (tap_packet *pkt) { vpndata_packet *p = new vpndata_packet; int tos = 0; // I am not hilarious about peeking into packets, but so be it. - if (conf->inherit_tos - && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP - && ((*pkt)[14] & 0xf0) == 0x40) // IPv4 + if (conf->inherit_tos && pkt->is_ipv4 ()) tos = (*pkt)[15] & IPTOS_TOS_MASK; - p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs + p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs send_vpn_packet (p, si, tos); delete p; @@ -838,10 +820,10 @@ } void -connection::inject_data_packet (tap_packet *pkt, bool broadcast) +connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) { if (ictx && octx) - send_data_packet (pkt, broadcast); + send_data_packet (pkt); else { if (!broadcast)//DDDD @@ -857,7 +839,7 @@ send_vpn_packet (pkt, si, tos); else { - vpn_queue.put (new vpn_packet (*pkt)); + vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); establish_connection (); } @@ -926,11 +908,12 @@ rsachallenge k; - if (0 > RSA_private_decrypt (sizeof (p->encr), - (unsigned char *)&p->encr, (unsigned char *)&k, - ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING)) - slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), - conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); + if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) + { + slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), + conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); + break; + } else { delete octx; @@ -938,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); @@ -984,7 +971,7 @@ if (!p->hmac_chk (cctx)) { slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" - "could be an attack, or just corruption or an synchronization error"), + "could be an attack, or just corruption or a synchronization error"), conf->nodename, (const char *)rsi); break; } @@ -1043,7 +1030,7 @@ if (!p->hmac_chk (ictx)) slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" - "could be an attack, or just corruption or an synchronization error"), + "could be an attack, or just corruption or a synchronization error"), conf->nodename, (const char *)rsi); else { @@ -1054,15 +1041,6 @@ { vpn->tap->send (d); - if (p->dst () == 0) // re-broadcast - for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i) - { - connection *c = *i; - - if (c->conf != THISNODE && c->conf != conf) - c->inject_data_packet (d); - } - if (si != rsi) { // fast re-sync on connection changes, useful especially for tcp/ip @@ -1145,17 +1123,17 @@ establish_connection (); } else if (NOW < last_activity + ::conf.keepalive) - w.at = last_activity + ::conf.keepalive; + w.start (last_activity + ::conf.keepalive); else if (conf->connectmode != conf_node::C_ONDEMAND || THISNODE->connectmode != conf_node::C_ONDEMAND) { send_ping (si); - w.at = NOW + 5; + w.start (NOW + 5); } else if (NOW < last_activity + ::conf.keepalive + 10) // hold ondemand connections implicitly a few seconds longer // should delete octx, though, or something like that ;) - w.at = last_activity + ::conf.keepalive + 10; + w.start (last_activity + ::conf.keepalive + 10); else reset_connection (); }