ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.h
(Generate patch)

Comparing gvpe/src/connection.h (file contents):
Revision 1.31 by pcg, Thu Aug 7 17:30:28 2008 UTC vs.
Revision 1.40 by root, Fri Oct 11 04:07:24 2013 UTC

1/* 1/*
2 connection.h -- header for connection.C 2 connection.h -- header for connection.C
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,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 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#ifndef GVPE_CONNECTION_H__ 32#ifndef GVPE_CONNECTION_H__
23#define GVPE_CONNECTION_H__ 33#define GVPE_CONNECTION_H__
24 34
… …
27#include "global.h" 37#include "global.h"
28#include "conf.h" 38#include "conf.h"
29#include "sockinfo.h" 39#include "sockinfo.h"
30#include "util.h" 40#include "util.h"
31#include "device.h" 41#include "device.h"
42#include "curve25519.h"
43#include "iv_gen.h"
32 44
33struct vpn; 45struct vpn;
34 46
35// called after HUP etc. to (re-)initialize global data structures 47// called after HUP etc. to (re-)initialize global data structures
36void connection_init (); 48void connection_init ();
37 49
50typedef curve25519_key ecdh_key;
51
38struct rsaid 52struct rsa_data
39{ 53{
40 u8 id[RSA_IDLEN]; // the challenge id 54 u32 seqno; // (ictx) initial sequence nr (31 bits)
55 u8 mac_key[MAC_IKMSIZE]; // (ictx) used to generate hmac key
56 u8 cipher_key[CIPHER_IKMSIZE]; // (ictx) used to generate cipher key
57 u8 hkdf_salt[HKDF_SALT]; // (octx) used as hkdf salt
58 u8 extra_auth[ // (ictx) additional auth randomness
59 (RSABITS >> 3)
60 - RSA_OAEP_SIZE
61 - sizeof (u32) // seqno
62 - MAC_IKMSIZE
63 - CIPHER_IKMSIZE
64 - HKDF_SALT
65 - 3 // struct alignment...
66 ];
41}; 67};
42 68
43typedef rsaclear rsachallenge; // challenge data; 69struct auth_data
44typedef rsacrypt rsaencrdata; // encrypted challenge 70{
45typedef u8 rsaresponse[RSA_RESLEN]; // the encrypted ripemd160 hash 71 rsa_data rsa;
72 ecdh_key ecdh;
73};
74
75typedef u8 rsa_crypt[RSA_KEYLEN]; // encrypted challenge
76
77struct auth_encr
78{
79 rsa_crypt rsa;
80 ecdh_key ecdh;
81};
82
83typedef u8 auth_mac[AUTH_SIZE];
84
85struct auth_response
86{
87 auth_mac mac;
88 ecdh_key ecdh;
89};
46 90
47//////////////////////////////////////////////////////////////////////////////////////// 91////////////////////////////////////////////////////////////////////////////////////////
48 92
49struct crypto_ctx; 93struct crypto_ctx;
50 94
… …
54 98
55 void hmac_set (crypto_ctx * ctx); 99 void hmac_set (crypto_ctx * ctx);
56 bool hmac_chk (crypto_ctx * ctx); 100 bool hmac_chk (crypto_ctx * ctx);
57 101
58private: 102private:
59 static unsigned char hmac_digest[EVP_MAX_MD_SIZE];
60
61 void hmac_gen (crypto_ctx * ctx); 103 void hmac_gen (crypto_ctx * ctx, u8 *hmac_digest);
62}; 104};
63 105
64struct vpn_packet : hmac_packet 106struct vpn_packet : hmac_packet
65{ 107{
66 enum ptype 108 enum ptype
… …
142 184
143 sockinfo si; // the current(!) destination ip to send packets to 185 sockinfo si; // the current(!) destination ip to send packets to
144 int retry_cnt; 186 int retry_cnt;
145 187
146 tstamp last_activity; // time of last packet received 188 tstamp last_activity; // time of last packet received
147 tstamp last_establish_attempt; 189 tstamp last_establish_attempt;
190 //tstamp last_si_change; // time we last changed the socket address
148 191
149 u32 oseqno; 192 u32 oseqno;
150 sliding_window iseqno; 193 sliding_window iseqno;
151 194
152 u8 protocol; 195 u8 protocol;
153 u8 features; 196 u8 features;
154 197
155 pkt_queue data_queue, vpn_queue; 198 pkt_queue data_queue, vpn_queue;
156 199
157 crypto_ctx *octx, *ictx; 200 crypto_ctx *octx, *ictx;
201 iv_gen oiv; // generator for random byte prefix
202
203 void generate_auth_data ();
204
205 ev_tstamp auth_expire; // when the snd_* and *_ecdh values expire
206 ev_tstamp hmac_error; // time of first hmac error in a series
207
208 // send auth data - used for octx
209 auth_data snd_auth;
210 ecdh_key snd_ecdh_a; // the secret ecdh key we used for our request
211 ecdh_key snd_ecdh_b; // the public ecdh key we received in the response
212 bool have_snd_auth; // received response for our req
213
214 // receive auth data - used for ictx
215 auth_data rcv_auth;
216 ecdh_key rcv_ecdh_a; // the secret ecdh key we used for our response
217 ecdh_key rcv_ecdh_b; // the public ecdh key we sent in our response
218 bool have_rcv_auth; // received auth from other side
158 219
159#if ENABLE_DNS 220#if ENABLE_DNS
160 struct dns_connection *dns; 221 struct dns_connection *dns;
161
162 void dnsv4_reset_connection ();
163#endif 222#endif
164 223
165 enum conf_node::connectmode connectmode; 224 enum conf_node::connectmode connectmode;
166 u8 prot_minor; // minor number of other side 225 u8 prot_minor; // minor number of other side
167 226
168 void reset_si (); 227 void reset_si ();
169 const sockinfo &forward_si (const sockinfo &si) const; 228 const sockinfo &forward_si (const sockinfo &si) const;
170 229
171 void shutdown (); 230 void shutdown ();
172 void connection_established (); 231 void connection_established (const sockinfo &rsi);
173 void reset_connection (); 232 void reset_connection (const char *reason);
174 233
175 void establish_connection_cb (ev::timer &w, int revents); ev::timer establish_connection; 234 void establish_connection_cb (ev::timer &w, int revents); ev::timer establish_connection;
176 void rekey_cb (ev::timer &w, int revents); ev::timer rekey; // next rekying (actually current reset + reestablishing) 235 void rekey_cb (ev::timer &w, int revents); ev::timer rekey; // next rekeying (actually current reset + reestablishing)
177 void keepalive_cb (ev::timer &w, int revents); ev::timer keepalive; // next keepalive probe 236 void keepalive_cb (ev::timer &w, int revents); ev::timer keepalive; // next keepalive probe
178 237
179 void send_connect_request (int id); 238 void send_connect_request (int id);
180 void send_auth_request (const sockinfo &si, bool initiate); 239 void send_auth_request (const sockinfo &si, bool initiate);
181 void send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg); 240 void send_auth_response (const sockinfo &si);
182 void send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols); 241 void send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols);
183 void send_reset (const sockinfo &dsi); 242 void send_reset (const sockinfo &dsi);
184 void send_ping (const sockinfo &dsi, u8 pong = 0); 243 void send_ping (const sockinfo &dsi, u8 pong = 0);
185 void send_data_packet (tap_packet *pkt); 244 void send_data_packet (tap_packet *pkt);
186 245
… …
192 void send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0); 251 void send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0);
193 252
194 void script_init_env (const char *ext); 253 void script_init_env (const char *ext);
195 void script_init_connect_env (); 254 void script_init_connect_env ();
196 const char *script_node_up (); 255 const char *script_node_up ();
256 const char *script_node_change ();
197 const char *script_node_down (); 257 const char *script_node_down ();
198 258
199 void dump_status (); 259 void dump_status ();
200 260
201 connection (struct vpn *vpn, conf_node *conf); 261 connection (struct vpn *vpn, conf_node *conf);

Diff Legend

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