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.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.30 by pcg, Thu Jan 29 19:22:05 2004 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
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" { 22#include <cassert>
23# include "lzf/lzf.h"
24}
25 23
26#include <list> 24#include <list>
27 25
28#include <openssl/rand.h> 26#include <openssl/rand.h>
29#include <openssl/evp.h> 27#include <openssl/evp.h>
… …
44# define RAND_pseudo_bytes RAND_bytes 42# define RAND_pseudo_bytes RAND_bytes
45#endif 43#endif
46 44
47#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
48 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"
52
49struct crypto_ctx 53struct crypto_ctx
50{ 54{
51 EVP_CIPHER_CTX cctx; 55 EVP_CIPHER_CTX cctx;
52 HMAC_CTX hctx; 56 HMAC_CTX hctx;
53 57
… …
56}; 60};
57 61
58crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 62crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
59{ 63{
60 EVP_CIPHER_CTX_init (&cctx); 64 EVP_CIPHER_CTX_init (&cctx);
61 EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc); 65 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
62 HMAC_CTX_init (&hctx); 66 HMAC_CTX_init (&hctx);
63 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); 67 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
64} 68}
65 69
66crypto_ctx::~crypto_ctx () 70crypto_ctx::~crypto_ctx ()
67{ 71{
68 EVP_CIPHER_CTX_cleanup (&cctx); 72 require (EVP_CIPHER_CTX_cleanup (&cctx));
69 HMAC_CTX_cleanup (&hctx); 73 HMAC_CTX_cleanup (&hctx);
70} 74}
71 75
72static void 76static void
73rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 77rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
74{ 78{
75 EVP_MD_CTX ctx; 79 EVP_MD_CTX ctx;
76 80
77 EVP_MD_CTX_init (&ctx); 81 EVP_MD_CTX_init (&ctx);
78 EVP_DigestInit (&ctx, RSA_HASH); 82 require (EVP_DigestInit (&ctx, RSA_HASH));
79 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 83 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
80 EVP_DigestUpdate(&ctx, &id, sizeof id); 84 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
81 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
82 EVP_MD_CTX_cleanup (&ctx); 86 EVP_MD_CTX_cleanup (&ctx);
83} 87}
84 88
85struct rsa_entry { 89struct rsa_entry {
86 tstamp expire; 90 tstamp expire;
… …
134 138
135} rsa_cache; 139} rsa_cache;
136 140
137void rsa_cache::cleaner_cb (time_watcher &w) 141void rsa_cache::cleaner_cb (time_watcher &w)
138{ 142{
139 if (empty ()) 143 if (!empty ())
140 w.at = TSTAMP_CANCEL;
141 else
142 { 144 {
143 w.at = NOW + RSA_TTL; 145 w.start (NOW + RSA_TTL);
144 146
145 for (iterator i = begin (); i != end (); ) 147 for (iterator i = begin (); i != end (); )
146 if (i->expire <= NOW) 148 if (i->expire <= NOW)
147 i = erase (i); 149 i = erase (i);
148 else 150 else
… …
310} 312}
311 313
312#define MAXVPNDATA (MAX_MTU - 6 - 6) 314#define MAXVPNDATA (MAX_MTU - 6 - 6)
313#define DATAHDR (sizeof (u32) + RAND_SIZE) 315#define DATAHDR (sizeof (u32) + RAND_SIZE)
314 316
315struct vpndata_packet:vpn_packet 317struct vpndata_packet : vpn_packet
316 { 318 {
317 u8 data[MAXVPNDATA + DATAHDR]; // seqno 319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
318 320
319 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 321 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
320 tap_packet *unpack (connection *conn, u32 &seqno); 322 tap_packet *unpack (connection *conn, u32 &seqno);
… …
347 d[0] = cl >> 8; 349 d[0] = cl >> 8;
348 d[1] = cl; 350 d[1] = cl;
349 } 351 }
350#endif 352#endif
351 353
352 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 354 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
353 355
354 struct { 356 struct {
355#if RAND_SIZE 357#if RAND_SIZE
356 u8 rnd[RAND_SIZE]; 358 u8 rnd[RAND_SIZE];
357#endif 359#endif
… …
361 datahdr.seqno = ntohl (seqno); 363 datahdr.seqno = ntohl (seqno);
362#if RAND_SIZE 364#if RAND_SIZE
363 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 365 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
364#endif 366#endif
365 367
366 EVP_EncryptUpdate (cctx, 368 require (EVP_EncryptUpdate (cctx,
367 (unsigned char *) data + outl, &outl2, 369 (unsigned char *) data + outl, &outl2,
368 (unsigned char *) &datahdr, DATAHDR); 370 (unsigned char *) &datahdr, DATAHDR));
369 outl += outl2; 371 outl += outl2;
370 372
371 EVP_EncryptUpdate (cctx, 373 require (EVP_EncryptUpdate (cctx,
372 (unsigned char *) data + outl, &outl2, 374 (unsigned char *) data + outl, &outl2,
373 (unsigned char *) d, l); 375 (unsigned char *) d, l));
374 outl += outl2; 376 outl += outl2;
375 377
376 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 378 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
377 outl += outl2; 379 outl += outl2;
378 380
379 len = outl + data_hdr_size (); 381 len = outl + data_hdr_size ();
380 382
381 set_hdr (type, dst); 383 set_hdr (type, dst);
… …
390 int outl = 0, outl2; 392 int outl = 0, outl2;
391 tap_packet *p = new tap_packet; 393 tap_packet *p = new tap_packet;
392 u8 *d; 394 u8 *d;
393 u32 l = len - data_hdr_size (); 395 u32 l = len - data_hdr_size ();
394 396
395 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 397 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
396 398
397#if ENABLE_COMPRESSION 399#if ENABLE_COMPRESSION
398 u8 cdata[MAX_MTU]; 400 u8 cdata[MAX_MTU];
399 401
400 if (type == PT_DATA_COMPRESSED) 402 if (type == PT_DATA_COMPRESSED)
… …
402 else 404 else
403#endif 405#endif
404 d = &(*p)[6 + 6 - DATAHDR]; 406 d = &(*p)[6 + 6 - DATAHDR];
405 407
406 /* this overwrites part of the src mac, but we fix that later */ 408 /* this overwrites part of the src mac, but we fix that later */
407 EVP_DecryptUpdate (cctx, 409 require (EVP_DecryptUpdate (cctx,
408 d, &outl2, 410 d, &outl2,
409 (unsigned char *)&data, len - data_hdr_size ()); 411 (unsigned char *)&data, len - data_hdr_size ()));
410 outl += outl2; 412 outl += outl2;
411 413
412 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 414 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
413 outl += outl2; 415 outl += outl2;
414 416
415 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 417 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
416 418
417 id2mac (dst () ? dst() : THISNODE->id, p->dst); 419 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
479} 481}
480 482
481bool config_packet::chk_config () const 483bool config_packet::chk_config () const
482{ 484{
483 if (prot_major != PROTOCOL_MAJOR) 485 if (prot_major != PROTOCOL_MAJOR)
484 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); 486 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
485 else if (randsize != RAND_SIZE) 487 else if (randsize != RAND_SIZE)
486 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 488 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
487 else if (hmaclen != HMACLENGTH) 489 else if (hmaclen != HMACLENGTH)
488 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 490 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
489 else if (flags != curflags ()) 491 else if (flags != curflags ())
490 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ()); 492 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
491 else if (challengelen != sizeof (rsachallenge)) 493 else if (challengelen != sizeof (rsachallenge))
492 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge)); 494 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
493 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 495 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
494 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 496 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))) 497 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
496 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); 498 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
497 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 499 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
498 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 500 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
499 else 501 else
500 return true; 502 return true;
501 503
502 return false; 504 return false;
503} 505}
504 506
505struct auth_req_packet : config_packet 507struct auth_req_packet : config_packet
506{ 508{
507 char magic[8]; 509 char magic[8];
508 u8 initiate; // false if this is just an automatic reply 510 u8 initiate; // false if this is just an automatic reply
509 u8 protocols; // supported protocols (will get patches on forward) 511 u8 protocols; // supported protocols (will be patched on forward)
510 u8 pad2, pad3; 512 u8 pad2, pad3;
511 rsaid id; 513 rsaid id;
512 rsaencrdata encr; 514 rsaencrdata encr;
513 515
514 auth_req_packet (int dst, bool initiate_, u8 protocols_) 516 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
598 } 600 }
599 else 601 else
600 { 602 {
601 retry_cnt = 0; 603 retry_cnt = 0;
602 establish_connection.start (NOW + 5); 604 establish_connection.start (NOW + 5);
603 keepalive.reset (); 605 keepalive.stop ();
604 rekey.reset (); 606 rekey.stop ();
605 } 607 }
606} 608}
607 609
608void 610void
609connection::reset_si () 611connection::reset_si ()
… …
675connection::send_auth_request (const sockinfo &si, bool initiate) 677connection::send_auth_request (const sockinfo &si, bool initiate)
676{ 678{
677 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 679 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
678 680
679 rsachallenge chg; 681 rsachallenge chg;
680
681 rsa_cache.gen (pkt->id, chg); 682 rsa_cache.gen (pkt->id, chg);
682 683 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
683 if (0 > RSA_public_encrypt (sizeof chg,
684 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
685 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
686 fatal ("RSA_public_encrypt error");
687 684
688 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 685 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
689 686
690 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 687 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
691 688
… …
725} 722}
726 723
727void 724void
728connection::establish_connection_cb (time_watcher &w) 725connection::establish_connection_cb (time_watcher &w)
729{ 726{
730 if (ictx || conf == THISNODE 727 if (!ictx
728 && conf != THISNODE
731 || connectmode == conf_node::C_NEVER 729 && connectmode != conf_node::C_NEVER
732 || connectmode == conf_node::C_DISABLED) 730 && connectmode != conf_node::C_DISABLED
733 w.at = TSTAMP_CANCEL; 731 && NOW > w.at)
734 else if (w.at <= NOW)
735 { 732 {
736 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
737 734
738 if (retry_int < 3600 * 8) 735 if (retry_int < 3600 * 8)
739 retry_cnt++; 736 retry_cnt++;
740 737
741 w.at = NOW + retry_int; 738 w.start (NOW + retry_int);
742 739
743 reset_si (); 740 reset_si ();
744 741
745 if (si.prot && !si.host) 742 if (si.prot && !si.host)
746 vpn->send_connect_request (conf->id); 743 vpn->send_connect_request (conf->id);
… …
777 si.host= 0; 774 si.host= 0;
778 775
779 last_activity = 0; 776 last_activity = 0;
780 retry_cnt = 0; 777 retry_cnt = 0;
781 778
782 rekey.reset (); 779 rekey.stop ();
783 keepalive.reset (); 780 keepalive.stop ();
784 establish_connection.reset (); 781 establish_connection.stop ();
785} 782}
786 783
787void 784void
788connection::shutdown () 785connection::shutdown ()
789{ 786{
… …
794} 791}
795 792
796void 793void
797connection::rekey_cb (time_watcher &w) 794connection::rekey_cb (time_watcher &w)
798{ 795{
799 w.at = TSTAMP_CANCEL;
800
801 reset_connection (); 796 reset_connection ();
802 establish_connection (); 797 establish_connection ();
803} 798}
804 799
805void 800void
… …
839{ 834{
840 if (ictx && octx) 835 if (ictx && octx)
841 send_vpn_packet (pkt, si, tos); 836 send_vpn_packet (pkt, si, tos);
842 else 837 else
843 { 838 {
844 vpn_queue.put (new vpn_packet (*pkt)); 839 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
845 840
846 establish_connection (); 841 establish_connection ();
847 } 842 }
848} 843}
849 844
… …
908 if (p->initiate) 903 if (p->initiate)
909 send_auth_request (rsi, false); 904 send_auth_request (rsi, false);
910 905
911 rsachallenge k; 906 rsachallenge k;
912 907
913 if (0 > RSA_private_decrypt (sizeof (p->encr), 908 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
914 (unsigned char *)&p->encr, (unsigned char *)&k, 909 {
915 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
916 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 910 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
917 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 911 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
912 break;
913 }
918 else 914 else
919 { 915 {
920 delete octx; 916 delete octx;
921 917
922 octx = new crypto_ctx (k, 1); 918 octx = new crypto_ctx (k, 1);
… …
966 crypto_ctx *cctx = new crypto_ctx (chg, 0); 962 crypto_ctx *cctx = new crypto_ctx (chg, 0);
967 963
968 if (!p->hmac_chk (cctx)) 964 if (!p->hmac_chk (cctx))
969 { 965 {
970 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 966 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
971 "could be an attack, or just corruption or an synchronization error"), 967 "could be an attack, or just corruption or a synchronization error"),
972 conf->nodename, (const char *)rsi); 968 conf->nodename, (const char *)rsi);
973 break; 969 break;
974 } 970 }
975 else 971 else
976 { 972 {
… …
1025 { 1021 {
1026 vpndata_packet *p = (vpndata_packet *)pkt; 1022 vpndata_packet *p = (vpndata_packet *)pkt;
1027 1023
1028 if (!p->hmac_chk (ictx)) 1024 if (!p->hmac_chk (ictx))
1029 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1025 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1030 "could be an attack, or just corruption or an synchronization error"), 1026 "could be an attack, or just corruption or a synchronization error"),
1031 conf->nodename, (const char *)rsi); 1027 conf->nodename, (const char *)rsi);
1032 else 1028 else
1033 { 1029 {
1034 u32 seqno; 1030 u32 seqno;
1035 tap_packet *d = p->unpack (this, seqno); 1031 tap_packet *d = p->unpack (this, seqno);
… …
1118 { 1114 {
1119 reset_connection (); 1115 reset_connection ();
1120 establish_connection (); 1116 establish_connection ();
1121 } 1117 }
1122 else if (NOW < last_activity + ::conf.keepalive) 1118 else if (NOW < last_activity + ::conf.keepalive)
1123 w.at = last_activity + ::conf.keepalive; 1119 w.start (last_activity + ::conf.keepalive);
1124 else if (conf->connectmode != conf_node::C_ONDEMAND 1120 else if (conf->connectmode != conf_node::C_ONDEMAND
1125 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1121 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1126 { 1122 {
1127 send_ping (si); 1123 send_ping (si);
1128 w.at = NOW + 5; 1124 w.start (NOW + 5);
1129 } 1125 }
1130 else if (NOW < last_activity + ::conf.keepalive + 10) 1126 else if (NOW < last_activity + ::conf.keepalive + 10)
1131 // hold ondemand connections implicitly a few seconds longer 1127 // hold ondemand connections implicitly a few seconds longer
1132 // should delete octx, though, or something like that ;) 1128 // should delete octx, though, or something like that ;)
1133 w.at = last_activity + ::conf.keepalive + 10; 1129 w.start (last_activity + ::conf.keepalive + 10);
1134 else 1130 else
1135 reset_connection (); 1131 reset_connection ();
1136} 1132}
1137 1133
1138void connection::send_connect_request (int id) 1134void connection::send_connect_request (int id)

Diff Legend

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