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.97 by root, Tue Dec 4 13:23:17 2012 UTC vs.
Revision 1.105 by root, Fri Jul 19 18:22:54 2013 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2008,2010,2011 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2010,2011,2013 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify it 7 GVPE is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
… …
43#include "conf.h" 43#include "conf.h"
44#include "slog.h" 44#include "slog.h"
45#include "device.h" 45#include "device.h"
46#include "vpn.h" 46#include "vpn.h"
47#include "connection.h" 47#include "connection.h"
48#include "hkdf.h"
48 49
49#include "netcompat.h" 50#include "netcompat.h"
50 51
51#if !HAVE_RAND_PSEUDO_BYTES
52# define RAND_pseudo_bytes RAND_bytes
53#endif
54
55#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
56#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated) 52#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic
53#define MAGIC "HUHN\xbd\xc6\xdb\x82" // 8 bytes of magic//D
57 54
58#define ULTRA_FAST 1 55#define ULTRA_FAST 1
59#define HLOG 15 56#define HLOG 15
60#include "lzf/lzf.h" 57#include "lzf/lzf.h"
61#include "lzf/lzf_c.c" 58#include "lzf/lzf_c.c"
… …
108struct crypto_ctx 105struct crypto_ctx
109{ 106{
110 EVP_CIPHER_CTX cctx; 107 EVP_CIPHER_CTX cctx;
111 HMAC_CTX hctx; 108 HMAC_CTX hctx;
112 109
113 crypto_ctx (const rsachallenge &challenge, int enc); 110 crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc);
114 ~crypto_ctx (); 111 ~crypto_ctx ();
115}; 112};
116 113
117crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 114crypto_ctx::crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc)
118{ 115{
116 ecdh_key s;
117
118 curve25519_combine (a, b, s);
119
120 {
121 u8 mac_key[MAC_KEYSIZE];
122 static const unsigned char mac_info[] = "gvpe mac key";
123
124 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
125 kdf.extract (auth1.rsa.mac_key, sizeof (auth1.rsa.mac_key));
126 kdf.extract (s, sizeof (s));
127 kdf.extract_done (HKDF_PRF_HASH ());
128 kdf.expand (mac_key, sizeof (mac_key), mac_info, sizeof (mac_info));
129
130 HMAC_CTX_init (&hctx);
131 require (HMAC_Init_ex (&hctx, mac_key, MAC_KEYSIZE, MAC_DIGEST (), 0));
132 }
133
134 {
135 u8 cipher_key[CIPHER_KEYSIZE];
136 static const unsigned char cipher_info[] = "gvpe cipher key";
137
138 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
139 kdf.extract (auth1.rsa.cipher_key, sizeof (auth1.rsa.cipher_key));
140 kdf.extract (s, sizeof (s));
141 kdf.extract_done (HKDF_PRF_HASH ());
142 kdf.expand (cipher_key, sizeof (cipher_key), cipher_info, sizeof (cipher_info));
143
119 EVP_CIPHER_CTX_init (&cctx); 144 EVP_CIPHER_CTX_init (&cctx);
120 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc)); 145 require (EVP_CipherInit_ex (&cctx, CIPHER (), 0, cipher_key, 0, enc));
121 HMAC_CTX_init (&hctx); 146 }
122 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
123} 147}
124 148
125crypto_ctx::~crypto_ctx () 149crypto_ctx::~crypto_ctx ()
126{ 150{
127 require (EVP_CIPHER_CTX_cleanup (&cctx)); 151 require (EVP_CIPHER_CTX_cleanup (&cctx));
128 HMAC_CTX_cleanup (&hctx); 152 HMAC_CTX_cleanup (&hctx);
129} 153}
130 154
155static inline void
156auth_encrypt (RSA *key, const auth_data &auth, auth_encr &encr)
157{
158 if (RSA_public_encrypt (sizeof (auth.rsa),
159 (unsigned char *)&auth.rsa, (unsigned char *)&encr.rsa,
160 key, RSA_PKCS1_OAEP_PADDING) < 0)
161 fatal ("RSA_public_encrypt error");
162
163 memcpy (&encr.ecdh, &auth.ecdh, sizeof (encr.ecdh));
164}
165
166static inline bool
167auth_decrypt (RSA *key, const auth_encr &encr, auth_data &auth)
168{
169 u8 rsa_decrypt[RSA_KEYLEN];
170
171 if (RSA_private_decrypt (sizeof (encr.rsa),
172 (const unsigned char *)&encr.rsa, (unsigned char *)rsa_decrypt,
173 key, RSA_PKCS1_OAEP_PADDING) != sizeof (auth.rsa))
174 return 0;
175
176 memcpy (&auth.rsa, rsa_decrypt, sizeof (auth.rsa));
177 memcpy (&auth.ecdh, &encr.ecdh, sizeof (auth.ecdh));
178
179 return 1;
180}
181
131static void 182static void
132rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 183auth_hash (const auth_data &auth, const ecdh_key &b, auth_mac &mac)
133{ 184{
134 EVP_MD_CTX ctx; 185 hkdf kdf (&auth.ecdh, sizeof (auth.ecdh), AUTH_DIGEST ()); // use remote ecdh b as salt
135 186 kdf.extract (&auth.rsa, sizeof (auth.rsa));
136 EVP_MD_CTX_init (&ctx); 187 kdf.extract_done ();
137 require (EVP_DigestInit (&ctx, RSA_HASH)); 188 kdf.expand (mac, sizeof mac, b, sizeof b); // use response ecdh b as info
138 require (EVP_DigestUpdate (&ctx, &chg, sizeof chg));
139 require (EVP_DigestUpdate (&ctx, &id, sizeof id));
140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
141 EVP_MD_CTX_cleanup (&ctx);
142} 189}
143 190
144struct rsa_entry 191void
192connection::generate_auth_data ()
145{ 193{
146 tstamp expire; 194 if (auth_expire < ev_now ())
147 rsaid id;
148 rsachallenge chg;
149};
150
151struct rsa_cache : list<rsa_entry>
152{
153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
154
155 bool find (const rsaid &id, rsachallenge &chg)
156 {
157 for (iterator i = begin (); i != end (); ++i)
158 { 195 {
159 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ()) 196 // request data
160 { 197 rand_fill (snd_auth.rsa);
161 memcpy (&chg, &i->chg, sizeof chg); 198 curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
162 199
163 erase (i); 200 // eventual response data
164 return true; 201 curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
165 }
166 } 202 }
167 203
168 if (!cleaner.is_active ()) 204 // every use prolongs the expiry
169 cleaner.again ();
170
171 return false;
172 }
173
174 void gen (rsaid &id, rsachallenge &chg)
175 {
176 rsa_entry e;
177
178 RAND_bytes ((unsigned char *)&id, sizeof id);
179 RAND_bytes ((unsigned char *)&chg, sizeof chg);
180
181 e.expire = ev_now () + RSA_TTL; 205 auth_expire = ev_now () + AUTH_TTL;
182 e.id = id;
183 memcpy (&e.chg, &chg, sizeof chg);
184
185 push_back (e);
186
187 if (!cleaner.is_active ())
188 cleaner.again ();
189 }
190
191 rsa_cache ()
192 {
193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
194 cleaner.set (RSA_TTL, RSA_TTL);
195 }
196
197} rsa_cache;
198
199void
200rsa_cache::cleaner_cb (ev::timer &w, int revents)
201{
202 if (empty ())
203 w.stop ();
204 else
205 {
206 for (iterator i = begin (); i != end (); )
207 if (i->expire <= ev_now ())
208 i = erase (i);
209 else
210 ++i;
211 }
212} 206}
213 207
214////////////////////////////////////////////////////////////////////////////// 208//////////////////////////////////////////////////////////////////////////////
215 209
216pkt_queue::pkt_queue (double max_ttl, int max_queue) 210pkt_queue::pkt_queue (double max_ttl, int max_queue)
… …
365 } 359 }
366} 360}
367 361
368///////////////////////////////////////////////////////////////////////////// 362/////////////////////////////////////////////////////////////////////////////
369 363
370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
371
372void 364void
373hmac_packet::hmac_gen (crypto_ctx *ctx) 365hmac_packet::hmac_gen (crypto_ctx *ctx, u8 *hmac_digest)
374{ 366{
375 unsigned int xlen;
376
377 HMAC_CTX *hctx = &ctx->hctx; 367 HMAC_CTX *hctx = &ctx->hctx;
378 368
379 HMAC_Init_ex (hctx, 0, 0, 0, 0); 369 require (HMAC_Init_ex (hctx, 0, 0, 0, 0));
380 HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), 370 require (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), len - sizeof (hmac_packet)));
381 len - sizeof (hmac_packet)); 371 require (HMAC_Final (hctx, hmac_digest, 0));
382 HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);
383} 372}
384 373
385void 374void
386hmac_packet::hmac_set (crypto_ctx *ctx) 375hmac_packet::hmac_set (crypto_ctx *ctx)
387{ 376{
388 hmac_gen (ctx); 377 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
389 378 hmac_gen (ctx, hmac_digest);
390 memcpy (hmac, hmac_digest, HMACLENGTH); 379 memcpy (hmac, hmac_digest, HMACLENGTH);
391} 380}
392 381
393bool 382bool
394hmac_packet::hmac_chk (crypto_ctx *ctx) 383hmac_packet::hmac_chk (crypto_ctx *ctx)
395{ 384{
396 hmac_gen (ctx); 385 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
397 386 hmac_gen (ctx, hmac_digest);
398 return !memcmp (hmac, hmac_digest, HMACLENGTH); 387 return !memcmp (hmac, hmac_digest, HMACLENGTH);
399} 388}
400 389
401void 390void
402vpn_packet::set_hdr (ptype type_, unsigned int dst) 391vpn_packet::set_hdr (ptype type_, unsigned int dst)
… …
451 d[1] = cl; 440 d[1] = cl;
452 } 441 }
453 } 442 }
454#endif 443#endif
455 444
456 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 445 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 1));
457 446
458 struct { 447 struct {
459#if RAND_SIZE 448#if RAND_SIZE
460 u8 rnd[RAND_SIZE]; 449 u8 rnd[RAND_SIZE];
461#endif 450#endif
462 u32 seqno; 451 u32 seqno;
463 } datahdr; 452 } datahdr;
464 453
465 datahdr.seqno = ntohl (seqno); 454 datahdr.seqno = ntohl (seqno);
466#if RAND_SIZE 455#if RAND_SIZE
467 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 456 // NB: a constant (per session) random prefix
457 // is likely enough, but we don't take any chances.
458 conn->oiv.get (datahdr.rnd, RAND_SIZE);
468#endif 459#endif
469 460
470 require (EVP_EncryptUpdate (cctx, 461 require (EVP_EncryptUpdate (cctx,
471 (unsigned char *) data + outl, &outl2, 462 (unsigned char *) data + outl, &outl2,
472 (unsigned char *) &datahdr, DATAHDR)); 463 (unsigned char *) &datahdr, DATAHDR));
… …
494 int outl = 0, outl2; 485 int outl = 0, outl2;
495 tap_packet *p = new tap_packet; 486 tap_packet *p = new tap_packet;
496 u8 *d; 487 u8 *d;
497 u32 l = len - data_hdr_size (); 488 u32 l = len - data_hdr_size ();
498 489
499 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0)); 490 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 0));
500 491
501#if ENABLE_COMPRESSION 492#if ENABLE_COMPRESSION
502 u8 cdata[MAX_MTU]; 493 u8 cdata[MAX_MTU];
503 494
504 if (type == PT_DATA_COMPRESSED) 495 if (type == PT_DATA_COMPRESSED)
505 d = cdata; 496 d = cdata;
506 else 497 else
507#endif 498#endif
508 d = &(*p)[6 + 6 - DATAHDR]; 499 d = &(*p)[6 + 6] - DATAHDR;
509 500
510 /* this overwrites part of the src mac, but we fix that later */ 501 // we play do evil games with the struct layout atm.
502 // pending better solutions, we at least do some verification.
503 // this is fine, as we left ISO territory long ago.
504 require (DATAHDR <= 16);
505 require ((u8 *)(&p->len + 1) == &(*p)[0]);
506
507 // this can overwrite the len/dst/src fields
511 require (EVP_DecryptUpdate (cctx, 508 require (EVP_DecryptUpdate (cctx,
512 d, &outl2, 509 d, &outl2,
513 (unsigned char *)&data, len - data_hdr_size ())); 510 (unsigned char *)&data, len - data_hdr_size ()));
514 outl += outl2; 511 outl += outl2;
515 512
… …
546 } 543 }
547}; 544};
548 545
549struct config_packet : vpn_packet 546struct config_packet : vpn_packet
550{ 547{
551 // actually, hmaclen cannot be checked because the hmac 548 u8 serial[SERIAL_SIZE];
552 // field comes before this data, so peers with other
553 // hmacs simply will not work.
554 u8 prot_major, prot_minor, randsize, hmaclen; 549 u8 prot_major, prot_minor, randsize;
555 u8 flags, challengelen, features, pad3; 550 u8 flags, features, pad6, pad7, pad8;
556 u32 cipher_nid, digest_nid, hmac_nid; 551 u32 cipher_nid, mac_nid, auth_nid;
557 552
558 void setup (ptype type, int dst); 553 void setup (ptype type, int dst);
559 bool chk_config () const; 554 bool chk_config (const conf_node *conf, const sockinfo &rsi) const;
560 555
561 static u8 get_features () 556 static u8 get_features ()
562 { 557 {
563 u8 f = 0; 558 u8 f = 0;
564#if ENABLE_COMPRESSION 559#if ENABLE_COMPRESSION
… …
578config_packet::setup (ptype type, int dst) 573config_packet::setup (ptype type, int dst)
579{ 574{
580 prot_major = PROTOCOL_MAJOR; 575 prot_major = PROTOCOL_MAJOR;
581 prot_minor = PROTOCOL_MINOR; 576 prot_minor = PROTOCOL_MINOR;
582 randsize = RAND_SIZE; 577 randsize = RAND_SIZE;
583 hmaclen = HMACLENGTH;
584 flags = 0; 578 flags = 0;
585 challengelen = sizeof (rsachallenge);
586 features = get_features (); 579 features = get_features ();
587 580
581 strncpy ((char *)serial, conf.serial, sizeof (serial));
582
588 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 583 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
589 digest_nid = htonl (EVP_MD_type (RSA_HASH));
590 hmac_nid = htonl (EVP_MD_type (DIGEST)); 584 mac_nid = htonl (EVP_MD_type (MAC_DIGEST ()));
585 auth_nid = htonl (EVP_MD_type (AUTH_DIGEST ()));
591 586
592 len = sizeof (*this) - sizeof (net_packet); 587 len = sizeof (*this) - sizeof (net_packet);
593 set_hdr (type, dst); 588 set_hdr (type, dst);
594} 589}
595 590
596bool 591bool
597config_packet::chk_config () const 592config_packet::chk_config (const conf_node *conf, const sockinfo &rsi) const
598{ 593{
599 if (prot_major != PROTOCOL_MAJOR) 594 if (prot_major != PROTOCOL_MAJOR)
600 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 595 slog (L_WARN, _("%s(%s): major version mismatch (remote %d <=> local %d)"),
596 conf->nodename, (const char *)rsi, prot_major, PROTOCOL_MAJOR);
601 else if (randsize != RAND_SIZE) 597 else if (randsize != RAND_SIZE)
602 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 598 slog (L_WARN, _("%s(%s): rand size mismatch (remote %d <=> local %d)"),
603 else if (hmaclen != HMACLENGTH) 599 conf->nodename, (const char *)rsi, randsize, RAND_SIZE);
604 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
605 else if (challengelen != sizeof (rsachallenge))
606 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
607 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 600 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
608 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 601 slog (L_WARN, _("%s(%s): cipher algo mismatch (remote %x <=> local %x)"),
609 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 602 conf->nodename, (const char *)rsi, ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
610 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
611 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 603 else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
612 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 604 slog (L_WARN, _("%s(%s): mac algo mismatch (remote %x <=> local %x)"),
605 conf->nodename, (const char *)rsi, ntohl (mac_nid), EVP_MD_type (MAC_DIGEST ()));
606 else if (auth_nid != htonl (EVP_MD_type (AUTH_DIGEST ())))
607 slog (L_WARN, _("%s(%s): auth algo mismatch (remote %x <=> local %x)"),
608 conf->nodename, (const char *)rsi, ntohl (auth_nid), EVP_MD_type (AUTH_DIGEST ()));
613 else 609 else
610 {
611 int cmp = memcmp (serial, ::conf.serial, sizeof (serial));
612
613 if (cmp > 0)
614 slog (L_WARN, _("%s(%s): remote serial newer than local serial - outdated config?"),
615 conf->nodename, (const char *)rsi);
616 else if (cmp == 0)
614 return true; 617 return true;
618 }
615 619
616 return false; 620 return false;
617} 621}
618 622
619struct auth_req_packet : config_packet 623struct auth_req_packet : config_packet // UNPROTECTED
620{ 624{
621 char magic[8]; 625 char magic[8];
622 u8 initiate; // false if this is just an automatic reply 626 u8 initiate; // false if this is just an automatic reply
623 u8 protocols; // supported protocols (will be patched on forward) 627 u8 protocols; // supported protocols (will be patched on forward)
624 u8 pad2, pad3; 628 u8 pad2, pad3;
625 rsaid id; 629 auth_encr encr;
626 rsaencrdata encr;
627 630
628 auth_req_packet (int dst, bool initiate_, u8 protocols_) 631 auth_req_packet (int dst, bool initiate_, u8 protocols_)
629 { 632 {
630 config_packet::setup (PT_AUTH_REQ, dst); 633 config_packet::setup (PT_AUTH_REQ, dst);
631 strncpy (magic, MAGIC_OLD, 8); 634 memcpy (magic, MAGIC, 8);
632 initiate = !!initiate_; 635 initiate = !!initiate_;
633 protocols = protocols_; 636 protocols = protocols_;
634 637
635 len = sizeof (*this) - sizeof (net_packet); 638 len = sizeof (*this) - sizeof (net_packet);
636 } 639 }
637}; 640};
638 641
639struct auth_res_packet : config_packet 642struct auth_res_packet : vpn_packet // UNPROTECTED
640{ 643{
641 rsaid id;
642 u8 pad1, pad2, pad3;
643 u8 response_len; // encrypted length
644 rsaresponse response; 644 auth_response response;
645 645
646 auth_res_packet (int dst) 646 auth_res_packet (int dst)
647 { 647 {
648 config_packet::setup (PT_AUTH_RES, dst); 648 set_hdr (PT_AUTH_RES, dst);
649 649
650 len = sizeof (*this) - sizeof (net_packet); 650 len = sizeof (*this) - sizeof (net_packet);
651 } 651 }
652}; 652};
653 653
… …
683}; 683};
684 684
685///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
686 686
687void 687void
688connection::connection_established () 688connection::connection_established (const sockinfo &rsi)
689{ 689{
690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 690 if (!have_snd_auth || !have_rcv_auth)
691 return;
691 692
693 si = rsi;
694 protocol = rsi.prot;
695
696 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
697 conf->nodename, (const char *)rsi,
698 is_direct ? "direct" : "forwarded",
699 PROTOCOL_MAJOR, prot_minor);
700
701 if (::conf.script_node_up)
702 {
703 run_script_cb *cb = new run_script_cb;
704 cb->set<connection, &connection::script_node_up> (this);
705 run_script_queued (cb, _("node-up command execution failed, continuing."));
706 }
707
708 delete ictx; ictx = new crypto_ctx (rcv_auth, snd_auth, rcv_ecdh_a, rcv_auth.ecdh, 0);
709 iseqno.reset (ntohl (rcv_auth.rsa.seqno) & 0x7fffffff);
710
711 delete octx; octx = new crypto_ctx (snd_auth, rcv_auth, snd_ecdh_a, snd_ecdh_b , 1);
712 oseqno = ntohl (snd_auth.rsa.seqno) & 0x7fffffff;
713
714 oiv.reset ();
715
716 // make sure rekeying timeouts are slightly asymmetric
717 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
718 rekey.start (rekey_interval, rekey_interval);
719
720 keepalive.start (::conf.keepalive);
721
722 // send queued packets
692 if (ictx && octx) 723 if (ictx && octx)
693 { 724 {
694 // make sure rekeying timeouts are slightly asymmetric 725 while (tap_packet *p = (tap_packet *)data_queue.get ())
695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
696 rekey.start (rekey_interval, rekey_interval);
697
698 keepalive.start (::conf.keepalive);
699
700 // send queued packets
701 if (ictx && octx)
702 { 726 {
703 while (tap_packet *p = (tap_packet *)data_queue.get ())
704 {
705 if (p->len) send_data_packet (p); 727 if (p->len) send_data_packet (p);
706 delete p; 728 delete p;
707 }
708
709 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
710 {
711 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
712 delete p;
713 }
714 } 729 }
715 730
731 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
732 {
733 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
734 delete p;
735 }
736 }
737
716 vpn->connection_established (this); 738 vpn->connection_established (this);
717 }
718 else
719 {
720 retry_cnt = 0;
721 establish_connection.start (5);
722 keepalive.stop ();
723 rekey.stop ();
724 }
725} 739}
726 740
727void 741void
728connection::reset_si () 742connection::reset_si ()
729{ 743{
… …
775 ping_packet *pkt = new ping_packet; 789 ping_packet *pkt = new ping_packet;
776 790
777 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 791 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
778 792
779 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si); 793 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
780
781 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 794 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
782 795
783 delete pkt; 796 delete pkt;
784} 797}
785 798
… …
800void 813void
801connection::send_auth_request (const sockinfo &si, bool initiate) 814connection::send_auth_request (const sockinfo &si, bool initiate)
802{ 815{
803 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 816 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
804 817
805 rsachallenge chg; 818 generate_auth_data ();
806 rsa_cache.gen (pkt->id, chg);
807 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 819 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
808 820
809 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si); 821 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
810
811 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 822 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
812 823
813 delete pkt; 824 delete pkt;
814} 825}
815 826
816void 827void
817connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 828connection::send_auth_response (const sockinfo &si)
818{ 829{
819 auth_res_packet *pkt = new auth_res_packet (conf->id); 830 auth_res_packet *pkt = new auth_res_packet (conf->id);
820 831
821 pkt->id = id; 832 memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof rcv_ecdh_b);
822 833 auth_hash (rcv_auth, rcv_ecdh_b, pkt->response.mac);
823 rsa_hash (id, chg, pkt->response);
824
825 pkt->hmac_set (octx);
826 834
827 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si); 835 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
828
829 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 836 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
830 837
831 delete pkt; 838 delete pkt;
832} 839}
833 840
… …
927 934
928 delete ictx; ictx = 0; 935 delete ictx; ictx = 0;
929 delete octx; octx = 0; 936 delete octx; octx = 0;
930 937
931 si.host = 0; 938 si.host = 0;
939
940 have_snd_auth = false;
941 have_rcv_auth = false;
942 auth_expire = 0.;
932 943
933 last_activity = 0.; 944 last_activity = 0.;
934 //last_si_change = 0.; 945 //last_si_change = 0.;
935 retry_cnt = 0; 946 retry_cnt = 0;
936 947
… …
1052 { 1063 {
1053 reset_connection (); 1064 reset_connection ();
1054 1065
1055 config_packet *p = (config_packet *) pkt; 1066 config_packet *p = (config_packet *) pkt;
1056 1067
1057 if (!p->chk_config ()) 1068 if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
1058 {
1059 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
1060 conf->nodename, (const char *)rsi);
1061 connectmode = conf_node::C_DISABLED;
1062 }
1063 else if (connectmode == conf_node::C_ALWAYS)
1064 establish_connection (); 1069 establish_connection ();
1065 } 1070 }
1066 break; 1071 break;
1067 1072
1068 case vpn_packet::PT_AUTH_REQ: 1073 case vpn_packet::PT_AUTH_REQ:
… …
1072 1077
1073 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)", 1078 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1074 conf->nodename, p->initiate ? "initiate" : "reply", 1079 conf->nodename, p->initiate ? "initiate" : "reply",
1075 p->protocols, p->features); 1080 p->protocols, p->features);
1076 1081
1082 if (memcmp (p->magic, MAGIC, 8))
1083 {
1084 slog (L_WARN, _("%s(%s): protocol magic mismatch - stray packet?"),
1085 conf->nodename, (const char *)rsi);
1086 }
1077 if (p->chk_config () 1087 else if (p->chk_config (conf, rsi))
1078 && (!memcmp (p->magic, MAGIC_OLD, 8) || !memcmp (p->magic, MAGIC, 8)))
1079 { 1088 {
1080 if (p->prot_minor != PROTOCOL_MINOR) 1089 if (p->prot_minor != PROTOCOL_MINOR)
1081 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1090 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1082 conf->nodename, (const char *)rsi, 1091 conf->nodename, (const char *)rsi,
1083 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1092 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1084 1093
1085 if (p->initiate) 1094 if (p->initiate)
1086 send_auth_request (rsi, false); 1095 send_auth_request (rsi, false);
1087 1096
1088 rsachallenge k; 1097 auth_data auth;
1089 1098
1090 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1099 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
1091 { 1100 {
1092 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1101 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
1093 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 1102 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1094 break;
1095 } 1103 }
1096 else 1104 else
1097 { 1105 {
1098 delete octx; 1106 bool chg = !have_rcv_auth || memcmp (&rcv_auth, &auth, sizeof auth);
1099 1107
1100 octx = new crypto_ctx (k, 1); 1108 rcv_auth = auth;
1101 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1109 have_rcv_auth = true;
1102 1110
1111 send_auth_response (rsi);
1112
1113 if (chg)
1114 {
1103 conf->protocols = p->protocols; 1115 conf->protocols = p->protocols;
1104 features = p->features & config_packet::get_features (); 1116 features = p->features & config_packet::get_features ();
1105 1117
1106 send_auth_response (rsi, p->id, k);
1107
1108 connection_established (); 1118 connection_established (rsi);
1109
1110 break; 1119 }
1111 } 1120 }
1121
1122 break;
1112 } 1123 }
1113 else
1114 slog (L_WARN, _("%s(%s): protocol mismatch."),
1115 conf->nodename, (const char *)rsi);
1116 1124
1117 send_reset (rsi); 1125 send_reset (rsi);
1118 } 1126 }
1119 1127
1120 break; 1128 break;
… …
1123 { 1131 {
1124 auth_res_packet *p = (auth_res_packet *)pkt; 1132 auth_res_packet *p = (auth_res_packet *)pkt;
1125 1133
1126 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename); 1134 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1127 1135
1128 if (p->chk_config ()) 1136 auth_mac local_mac;
1137 auth_hash (snd_auth, p->response.ecdh, local_mac);
1138
1139 if (memcmp (&p->response.mac, local_mac, sizeof local_mac))
1129 { 1140 {
1130 if (p->prot_minor != PROTOCOL_MINOR)
1131 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1132 conf->nodename, (const char *)rsi,
1133 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1134
1135 rsachallenge chg;
1136
1137 if (!rsa_cache.find (p->id, chg))
1138 {
1139 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."), 1141 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1140 conf->nodename, (const char *)rsi); 1142 conf->nodename, (const char *)rsi);
1141 break;
1142 } 1143 }
1143 else 1144 else if (!have_snd_auth)
1144 { 1145 {
1145 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1146 memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
1146 1147
1147 if (!p->hmac_chk (cctx)) 1148 have_snd_auth = true;
1148 {
1149 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1150 "could be an attack, or just corruption or a synchronization error."),
1151 conf->nodename, (const char *)rsi);
1152 break;
1153 }
1154 else
1155 {
1156 rsaresponse h;
1157
1158 rsa_hash (p->id, chg, h);
1159
1160 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
1161 {
1162 prot_minor = p->prot_minor;
1163
1164 delete ictx; ictx = cctx;
1165
1166 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1167
1168 si = rsi;
1169 protocol = rsi.prot;
1170
1171 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1172 conf->nodename, (const char *)rsi,
1173 is_direct ? "direct" : "forwarded",
1174 p->prot_major, p->prot_minor);
1175
1176 connection_established (); 1149 connection_established (rsi);
1177
1178 if (::conf.script_node_up)
1179 {
1180 run_script_cb *cb = new run_script_cb;
1181 cb->set<connection, &connection::script_node_up> (this);
1182 run_script_queued (cb, _("node-up command execution failed, continuing."));
1183 }
1184
1185 break;
1186 }
1187 else
1188 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1189 conf->nodename, (const char *)rsi);
1190 }
1191
1192 delete cctx;
1193 }
1194 } 1150 }
1195 } 1151 }
1196
1197 send_reset (rsi);
1198 break; 1152 break;
1199 1153
1200 case vpn_packet::PT_DATA_COMPRESSED: 1154 case vpn_packet::PT_DATA_COMPRESSED:
1201#if !ENABLE_COMPRESSION 1155#if !ENABLE_COMPRESSION
1202 send_reset (rsi); 1156 send_reset (rsi);

Diff Legend

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