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.96 by root, Thu Mar 24 21:52:48 2011 UTC vs.
Revision 1.101 by root, Wed Jul 17 16:40:57 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 "PORN\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 (auth2.rsa.ikm, sizeof (auth2.rsa.ikm));
126 kdf.extract (auth1.rsa.mac_key, sizeof (auth1.rsa.mac_key));
127 kdf.extract (s, sizeof (s));
128 kdf.extract_done (HKDF_PRF_HASH ());
129 kdf.expand (mac_key, sizeof (mac_key), mac_info, sizeof (mac_info));
130
131 HMAC_CTX_init (&hctx);
132 require (HMAC_Init_ex (&hctx, mac_key, MAC_KEYSIZE, MAC_DIGEST (), 0));
133 }
134
135 {
136 u8 cipher_key[CIPHER_KEYSIZE];
137 static const unsigned char cipher_info[] = "gvpe cipher key";
138
139 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
140 kdf.extract (auth2.rsa.ikm, sizeof (auth2.rsa.ikm));
141 kdf.extract (auth1.rsa.cipher_key, sizeof (auth1.rsa.cipher_key));
142 kdf.extract (s, sizeof (s));
143 kdf.extract_done (HKDF_PRF_HASH ());
144 kdf.expand (cipher_key, sizeof (cipher_key), cipher_info, sizeof (cipher_info));
145
119 EVP_CIPHER_CTX_init (&cctx); 146 EVP_CIPHER_CTX_init (&cctx);
120 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc)); 147 require (EVP_CipherInit_ex (&cctx, CIPHER (), 0, cipher_key, 0, enc));
121 HMAC_CTX_init (&hctx); 148 }
122 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
123} 149}
124 150
125crypto_ctx::~crypto_ctx () 151crypto_ctx::~crypto_ctx ()
126{ 152{
127 require (EVP_CIPHER_CTX_cleanup (&cctx)); 153 require (EVP_CIPHER_CTX_cleanup (&cctx));
128 HMAC_CTX_cleanup (&hctx); 154 HMAC_CTX_cleanup (&hctx);
129} 155}
130 156
157static inline void
158auth_encrypt (RSA *key, const auth_data &auth, auth_encr &encr)
159{
160 if (RSA_public_encrypt (sizeof (auth.rsa),
161 (unsigned char *)&auth.rsa, (unsigned char *)&encr.rsa,
162 key, RSA_PKCS1_OAEP_PADDING) < 0)
163 fatal ("RSA_public_encrypt error");
164
165 memcpy (&encr.ecdh, &auth.ecdh, sizeof (encr.ecdh));
166}
167
168static inline bool
169auth_decrypt (RSA *key, const auth_encr &encr, auth_data &auth)
170{
171 u8 rsa_decrypt[RSA_KEYLEN];
172
173 if (RSA_private_decrypt (sizeof (encr.rsa),
174 (const unsigned char *)&encr.rsa, (unsigned char *)rsa_decrypt,
175 key, RSA_PKCS1_OAEP_PADDING) != sizeof (auth.rsa))
176 return 0;
177
178 memcpy (&auth.rsa, rsa_decrypt, sizeof (auth.rsa));
179 memcpy (&auth.ecdh, &encr.ecdh, sizeof (auth.ecdh));
180
181 return 1;
182}
183
131static void 184static void
132rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 185auth_hash (const auth_data &auth, auth_mac &mac)
133{ 186{
134 EVP_MD_CTX ctx; 187 HMAC_CTX ctx;
135 188
136 EVP_MD_CTX_init (&ctx); 189 HMAC_CTX_init (&ctx);
137 require (EVP_DigestInit (&ctx, RSA_HASH)); 190 require (HMAC_Init_ex (&ctx, auth.rsa.auth_key, sizeof (auth.rsa.auth_key), AUTH_DIGEST (), 0));
138 require (EVP_DigestUpdate (&ctx, &chg, sizeof chg)); 191 require (HMAC_Update (&ctx, (const unsigned char *)&auth, sizeof auth));
139 require (EVP_DigestUpdate (&ctx, &id, sizeof id));
140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 192 require (HMAC_Final (&ctx, (unsigned char *)&mac, 0));
141 EVP_MD_CTX_cleanup (&ctx); 193 HMAC_CTX_cleanup (&ctx);
142} 194}
143 195
144struct rsa_entry 196void
197connection::generate_auth_data ()
145{ 198{
146 tstamp expire; 199 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 { 200 {
159 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ()) 201 // request data
160 { 202 rand_fill (snd_auth.rsa);
161 memcpy (&chg, &i->chg, sizeof chg); 203 curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
204 auth_hash (snd_auth, snd_auth_mac);
162 205
163 erase (i); 206 // eventual response data
164 return true; 207 curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
165 }
166 } 208 }
167 209
168 if (!cleaner.is_active ()) 210 // 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; 211 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} 212}
213 213
214////////////////////////////////////////////////////////////////////////////// 214//////////////////////////////////////////////////////////////////////////////
215 215
216pkt_queue::pkt_queue (double max_ttl, int max_queue) 216pkt_queue::pkt_queue (double max_ttl, int max_queue)
… …
374{ 374{
375 unsigned int xlen; 375 unsigned int xlen;
376 376
377 HMAC_CTX *hctx = &ctx->hctx; 377 HMAC_CTX *hctx = &ctx->hctx;
378 378
379 HMAC_Init_ex (hctx, 0, 0, 0, 0); 379 require (HMAC_Init_ex (hctx, 0, 0, 0, 0));
380 HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), 380 require (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet),
381 len - sizeof (hmac_packet)); 381 len - sizeof (hmac_packet)));
382 HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen); 382 require (HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen));
383} 383}
384 384
385void 385void
386hmac_packet::hmac_set (crypto_ctx *ctx) 386hmac_packet::hmac_set (crypto_ctx *ctx)
387{ 387{
… …
451 d[1] = cl; 451 d[1] = cl;
452 } 452 }
453 } 453 }
454#endif 454#endif
455 455
456 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 456 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 1));
457 457
458 struct { 458 struct {
459#if RAND_SIZE 459#if RAND_SIZE
460 u8 rnd[RAND_SIZE]; 460 u8 rnd[RAND_SIZE];
461#endif 461#endif
462 u32 seqno; 462 u32 seqno;
463 } datahdr; 463 } datahdr;
464 464
465 datahdr.seqno = ntohl (seqno); 465 datahdr.seqno = ntohl (seqno);
466#if RAND_SIZE 466#if RAND_SIZE
467 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 467 require (RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE) >= 0);
468#endif 468#endif
469 469
470 require (EVP_EncryptUpdate (cctx, 470 require (EVP_EncryptUpdate (cctx,
471 (unsigned char *) data + outl, &outl2, 471 (unsigned char *) data + outl, &outl2,
472 (unsigned char *) &datahdr, DATAHDR)); 472 (unsigned char *) &datahdr, DATAHDR));
… …
494 int outl = 0, outl2; 494 int outl = 0, outl2;
495 tap_packet *p = new tap_packet; 495 tap_packet *p = new tap_packet;
496 u8 *d; 496 u8 *d;
497 u32 l = len - data_hdr_size (); 497 u32 l = len - data_hdr_size ();
498 498
499 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0)); 499 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 0));
500 500
501#if ENABLE_COMPRESSION 501#if ENABLE_COMPRESSION
502 u8 cdata[MAX_MTU]; 502 u8 cdata[MAX_MTU];
503 503
504 if (type == PT_DATA_COMPRESSED) 504 if (type == PT_DATA_COMPRESSED)
505 d = cdata; 505 d = cdata;
506 else 506 else
507#endif 507#endif
508 d = &(*p)[6 + 6 - DATAHDR]; 508 d = &(*p)[6 + 6] - DATAHDR;
509 509
510 /* this overwrites part of the src mac, but we fix that later */ 510 // we play do evil games with the struct layout atm.
511 // pending better solutions, we at least do some verification.
512 // this is fine, as we left ISO territory long ago.
513 require (DATAHDR <= 16);
514 require ((u8 *)(&p->len + 1) == &(*p)[0]);
515
516 // this can overwrite the len/dst/src fields
511 require (EVP_DecryptUpdate (cctx, 517 require (EVP_DecryptUpdate (cctx,
512 d, &outl2, 518 d, &outl2,
513 (unsigned char *)&data, len - data_hdr_size ())); 519 (unsigned char *)&data, len - data_hdr_size ()));
514 outl += outl2; 520 outl += outl2;
515 521
… …
546 } 552 }
547}; 553};
548 554
549struct config_packet : vpn_packet 555struct config_packet : vpn_packet
550{ 556{
551 // actually, hmaclen cannot be checked because the hmac
552 // field comes before this data, so peers with other
553 // hmacs simply will not work.
554 u8 prot_major, prot_minor, randsize, hmaclen; 557 u8 prot_major, prot_minor, randsize;
555 u8 flags, challengelen, features, pad3; 558 u8 flags, features, pad6, pad7, pad8;
556 u32 cipher_nid, digest_nid, hmac_nid; 559 u32 cipher_nid, mac_nid, auth_nid;
557 560
558 void setup (ptype type, int dst); 561 void setup (ptype type, int dst);
559 bool chk_config () const; 562 bool chk_config () const;
560 563
561 static u8 get_features () 564 static u8 get_features ()
… …
578config_packet::setup (ptype type, int dst) 581config_packet::setup (ptype type, int dst)
579{ 582{
580 prot_major = PROTOCOL_MAJOR; 583 prot_major = PROTOCOL_MAJOR;
581 prot_minor = PROTOCOL_MINOR; 584 prot_minor = PROTOCOL_MINOR;
582 randsize = RAND_SIZE; 585 randsize = RAND_SIZE;
583 hmaclen = HMACLENGTH;
584 flags = 0; 586 flags = 0;
585 challengelen = sizeof (rsachallenge);
586 features = get_features (); 587 features = get_features ();
587 588
588 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 589 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
589 digest_nid = htonl (EVP_MD_type (RSA_HASH));
590 hmac_nid = htonl (EVP_MD_type (DIGEST)); 590 mac_nid = htonl (EVP_MD_type (MAC_DIGEST ()));
591 auth_nid = htonl (EVP_MD_type (AUTH_DIGEST ()));
591 592
592 len = sizeof (*this) - sizeof (net_packet); 593 len = sizeof (*this) - sizeof (net_packet);
593 set_hdr (type, dst); 594 set_hdr (type, dst);
594} 595}
595 596
… …
598{ 599{
599 if (prot_major != PROTOCOL_MAJOR) 600 if (prot_major != PROTOCOL_MAJOR)
600 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 601 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
601 else if (randsize != RAND_SIZE) 602 else if (randsize != RAND_SIZE)
602 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 603 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
603 else if (hmaclen != HMACLENGTH)
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))) 604 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)); 605 slog (L_WARN, _("cipher algo mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
609 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
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))) 606 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)); 607 slog (L_WARN, _("mac algo mismatch (remote %x <=> local %x)"), ntohl (mac_nid), EVP_MD_type (MAC_DIGEST ()));
608 else if (auth_nid != htonl (EVP_MD_type (AUTH_DIGEST ())))
609 slog (L_WARN, _("auth algo mismatch (remote %x <=> local %x)"), ntohl (auth_nid), EVP_MD_type (AUTH_DIGEST ()));
613 else 610 else
614 return true; 611 return true;
615 612
616 return false; 613 return false;
617} 614}
618 615
619struct auth_req_packet : config_packet 616struct auth_req_packet : config_packet // UNPROTECTED
620{ 617{
621 char magic[8]; 618 char magic[8];
622 u8 initiate; // false if this is just an automatic reply 619 u8 initiate; // false if this is just an automatic reply
623 u8 protocols; // supported protocols (will be patched on forward) 620 u8 protocols; // supported protocols (will be patched on forward)
624 u8 pad2, pad3; 621 u8 pad2, pad3;
625 rsaid id; 622 auth_encr encr;
626 rsaencrdata encr;
627 623
628 auth_req_packet (int dst, bool initiate_, u8 protocols_) 624 auth_req_packet (int dst, bool initiate_, u8 protocols_)
629 { 625 {
630 config_packet::setup (PT_AUTH_REQ, dst); 626 config_packet::setup (PT_AUTH_REQ, dst);
631 strncpy (magic, MAGIC_OLD, 8); 627 memcpy (magic, MAGIC, 8);
632 initiate = !!initiate_; 628 initiate = !!initiate_;
633 protocols = protocols_; 629 protocols = protocols_;
634 630
635 len = sizeof (*this) - sizeof (net_packet); 631 len = sizeof (*this) - sizeof (net_packet);
636 } 632 }
637}; 633};
638 634
639struct auth_res_packet : config_packet 635struct auth_res_packet : config_packet // UNPROTECTED
640{ 636{
641 rsaid id;
642 u8 pad1, pad2, pad3;
643 u8 response_len; // encrypted length
644 rsaresponse response; 637 auth_response response;
645 638
646 auth_res_packet (int dst) 639 auth_res_packet (int dst)
647 { 640 {
648 config_packet::setup (PT_AUTH_RES, dst); 641 config_packet::setup (PT_AUTH_RES, dst);
649 642
… …
683}; 676};
684 677
685///////////////////////////////////////////////////////////////////////////// 678/////////////////////////////////////////////////////////////////////////////
686 679
687void 680void
688connection::connection_established () 681connection::connection_established (const sockinfo &rsi)
689{ 682{
690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 683 if (!have_snd_auth || !have_rcv_auth)
684 return;
685
686 si = rsi;
687 protocol = rsi.prot;
688
689 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
690 conf->nodename, (const char *)rsi,
691 is_direct ? "direct" : "forwarded",
692 PROTOCOL_MAJOR, prot_minor);
693
694 if (::conf.script_node_up)
695 {
696 run_script_cb *cb = new run_script_cb;
697 cb->set<connection, &connection::script_node_up> (this);
698 run_script_queued (cb, _("node-up command execution failed, continuing."));
699 }
700
701 delete ictx; ictx = new crypto_ctx (rcv_auth, snd_auth, rcv_ecdh_a, rcv_auth.ecdh, 0);
702 iseqno.reset (ntohl (rcv_auth.rsa.seqno) & 0x7fffffff);
703
704 delete octx; octx = new crypto_ctx (snd_auth, rcv_auth, snd_ecdh_a, snd_ecdh_b , 1);
705 oseqno = ntohl (snd_auth.rsa.seqno) & 0x7fffffff;
691 706
692 if (ictx && octx) 707 if (ictx && octx)
693 { 708 {
694 // make sure rekeying timeouts are slightly asymmetric 709 // make sure rekeying timeouts are slightly asymmetric
695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 710 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
696 rekey.start (rekey_interval, rekey_interval); 711 rekey.start (rekey_interval, rekey_interval);
712
697 keepalive.start (::conf.keepalive); 713 keepalive.start (::conf.keepalive);
698 714
699 // send queued packets 715 // send queued packets
700 if (ictx && octx) 716 if (ictx && octx)
701 { 717 {
… …
712 } 728 }
713 } 729 }
714 730
715 vpn->connection_established (this); 731 vpn->connection_established (this);
716 } 732 }
733#if 0
717 else 734 else
718 { 735 {
719 retry_cnt = 0; 736 retry_cnt = 0;
720 establish_connection.start (5); 737 establish_connection.start (5);
721 keepalive.stop (); 738 keepalive.stop ();
722 rekey.stop (); 739 rekey.stop ();
723 } 740 }
741#endif
724} 742}
725 743
726void 744void
727connection::reset_si () 745connection::reset_si ()
728{ 746{
… …
774 ping_packet *pkt = new ping_packet; 792 ping_packet *pkt = new ping_packet;
775 793
776 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 794 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
777 795
778 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si); 796 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
779
780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 797 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
781 798
782 delete pkt; 799 delete pkt;
783} 800}
784 801
… …
799void 816void
800connection::send_auth_request (const sockinfo &si, bool initiate) 817connection::send_auth_request (const sockinfo &si, bool initiate)
801{ 818{
802 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 819 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
803 820
804 rsachallenge chg; 821 generate_auth_data ();
805 rsa_cache.gen (pkt->id, chg);
806 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 822 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
807 823
808 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si); 824 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
809
810 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 825 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
811 826
812 delete pkt; 827 delete pkt;
813} 828}
814 829
815void 830void
816connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 831connection::send_auth_response (const sockinfo &si)
817{ 832{
818 auth_res_packet *pkt = new auth_res_packet (conf->id); 833 auth_res_packet *pkt = new auth_res_packet (conf->id);
819 834
820 pkt->id = id; 835 auth_hash (rcv_auth, pkt->response.mac);
821 836 memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof (rcv_ecdh_b));
822 rsa_hash (id, chg, pkt->response);
823
824 pkt->hmac_set (octx);
825 837
826 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si); 838 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
827
828 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 839 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
829 840
830 delete pkt; 841 delete pkt;
831} 842}
832 843
… …
926 937
927 delete ictx; ictx = 0; 938 delete ictx; ictx = 0;
928 delete octx; octx = 0; 939 delete octx; octx = 0;
929 940
930 si.host = 0; 941 si.host = 0;
942
943 have_snd_auth = false;
944 have_rcv_auth = false;
945 auth_expire = 0.;
931 946
932 last_activity = 0.; 947 last_activity = 0.;
933 //last_si_change = 0.; 948 //last_si_change = 0.;
934 retry_cnt = 0; 949 retry_cnt = 0;
935 950
… …
1071 1086
1072 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)", 1087 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1073 conf->nodename, p->initiate ? "initiate" : "reply", 1088 conf->nodename, p->initiate ? "initiate" : "reply",
1074 p->protocols, p->features); 1089 p->protocols, p->features);
1075 1090
1076 if (p->chk_config () 1091 if (p->chk_config () && !memcmp (p->magic, MAGIC, 8))
1077 && (!memcmp (p->magic, MAGIC_OLD, 8) || !memcmp (p->magic, MAGIC, 8)))
1078 { 1092 {
1079 if (p->prot_minor != PROTOCOL_MINOR) 1093 if (p->prot_minor != PROTOCOL_MINOR)
1080 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1094 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1081 conf->nodename, (const char *)rsi, 1095 conf->nodename, (const char *)rsi,
1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1096 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1083 1097
1084 if (p->initiate) 1098 if (p->initiate)
1085 send_auth_request (rsi, false); 1099 send_auth_request (rsi, false);
1086 1100
1087 rsachallenge k; 1101 auth_data auth;
1088 1102
1089 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1103 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
1090 { 1104 {
1091 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1105 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
1092 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 1106 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1093 break;
1094 } 1107 }
1095 else 1108 else
1096 { 1109 {
1097 delete octx; 1110 bool chg = !have_rcv_auth || memcmp (&rcv_auth, &auth, sizeof auth);
1098 1111
1099 octx = new crypto_ctx (k, 1); 1112 rcv_auth = auth;
1100 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1113 have_rcv_auth = true;
1101 1114
1115 send_auth_response (rsi);
1116
1117 if (chg)
1118 {
1102 conf->protocols = p->protocols; 1119 conf->protocols = p->protocols;
1103 features = p->features & config_packet::get_features (); 1120 features = p->features & config_packet::get_features ();
1104 1121
1105 send_auth_response (rsi, p->id, k);
1106
1107 connection_established (); 1122 connection_established (rsi);
1108
1109 break; 1123 }
1110 } 1124 }
1125
1126 break;
1111 } 1127 }
1112 else 1128 else
1113 slog (L_WARN, _("%s(%s): protocol mismatch."), 1129 slog (L_WARN, _("%s(%s): protocol mismatch."),
1114 conf->nodename, (const char *)rsi); 1130 conf->nodename, (const char *)rsi);
1115 1131
… …
1124 1140
1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename); 1141 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1126 1142
1127 if (p->chk_config ()) 1143 if (p->chk_config ())
1128 { 1144 {
1129 if (p->prot_minor != PROTOCOL_MINOR) 1145 if (memcmp (&p->response.mac, snd_auth_mac, sizeof (snd_auth_mac)))
1130 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1131 conf->nodename, (const char *)rsi,
1132 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1133
1134 rsachallenge chg;
1135
1136 if (!rsa_cache.find (p->id, chg))
1137 { 1146 {
1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."), 1147 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1139 conf->nodename, (const char *)rsi); 1148 conf->nodename, (const char *)rsi);
1140 break;
1141 } 1149 }
1142 else 1150 else if (!have_snd_auth)
1143 { 1151 {
1144 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1152 if (p->prot_minor != PROTOCOL_MINOR)
1145 1153 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1146 if (!p->hmac_chk (cctx))
1147 {
1148 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1149 "could be an attack, or just corruption or a synchronization error."),
1150 conf->nodename, (const char *)rsi); 1154 conf->nodename, (const char *)rsi,
1151 break; 1155 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1152 }
1153 else
1154 {
1155 rsaresponse h;
1156 1156
1157 rsa_hash (p->id, chg, h);
1158
1159 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
1160 {
1161 prot_minor = p->prot_minor; 1157 prot_minor = p->prot_minor;
1158 memcpy (snd_ecdh_b, p->response.ecdh, sizeof (snd_ecdh_b));
1162 1159
1163 delete ictx; ictx = cctx; 1160 have_snd_auth = true;
1164
1165 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1166
1167 si = rsi;
1168 protocol = rsi.prot;
1169
1170 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1171 conf->nodename, (const char *)rsi,
1172 is_direct ? "direct" : "forwarded",
1173 p->prot_major, p->prot_minor);
1174
1175 connection_established (); 1161 connection_established (rsi);
1176
1177 if (::conf.script_node_up)
1178 {
1179 run_script_cb *cb = new run_script_cb;
1180 cb->set<connection, &connection::script_node_up> (this);
1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1182 }
1183
1184 break;
1185 }
1186 else
1187 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1188 conf->nodename, (const char *)rsi);
1189 }
1190
1191 delete cctx;
1192 } 1162 }
1163
1164 break;
1193 } 1165 }
1194 } 1166 }
1195 1167
1196 send_reset (rsi); 1168 send_reset (rsi);
1197 break; 1169 break;
… …
1345} 1317}
1346 1318
1347inline void 1319inline void
1348connection::keepalive_cb (ev::timer &w, int revents) 1320connection::keepalive_cb (ev::timer &w, int revents)
1349{ 1321{
1350 if (ev_now () >= last_activity + ::conf.keepalive + 15) 1322 ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
1323
1324 if (when >= 0)
1325 w.start (when);
1326 else if (when < -15)
1351 { 1327 {
1352 reset_connection (); 1328 reset_connection ();
1353 establish_connection (); 1329 establish_connection ();
1354 } 1330 }
1355 else if (ev_now () < last_activity + ::conf.keepalive)
1356 w.start (last_activity + ::conf.keepalive - ev::now ());
1357 else if (conf->connectmode != conf_node::C_ONDEMAND 1331 else if (conf->connectmode != conf_node::C_ONDEMAND
1358 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1332 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1359 { 1333 {
1334 w.start (3);
1360 send_ping (si); 1335 send_ping (si);
1361 w.start (3);
1362 } 1336 }
1363 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1337 else if (when >= -10)
1364 // hold ondemand connections implicitly a few seconds longer 1338 // hold ondemand connections implicitly a few seconds longer
1365 // should delete octx, though, or something like that ;) 1339 // should delete octx, though, or something like that ;)
1366 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1340 w.start (when + 10);
1367 else 1341 else
1368 reset_connection (); 1342 reset_connection ();
1369} 1343}
1370 1344
1371void 1345void

Diff Legend

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