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

Diff Legend

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