forked from clayface/openvpn_xorpatch
-
Notifications
You must be signed in to change notification settings - Fork 0
/
openvpn_xor.patch
264 lines (255 loc) · 7.94 KB
/
openvpn_xor.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
diff -Naur openvpn_new-2.4.4/src/openvpn/forward.c openvpn-2.4.4/src/openvpn/forward.c
--- openvpn_new-2.4.4/src/openvpn/forward.c 2017-09-26 10:27:35.000000000 +0100
+++ openvpn-2.4.4/src/openvpn/forward.c 2017-12-04 19:25:15.248200599 +0000
@@ -729,7 +729,10 @@
status = link_socket_read(c->c2.link_socket,
&c->c2.buf,
- &c->c2.from);
+ &c->c2.from,
+ c->options.ce.xormethod,
+ c->options.ce.xormask,
+ c->options.ce.xormasklen);
if (socket_connection_reset(c->c2.link_socket, status))
{
@@ -1374,7 +1377,10 @@
/* Send packet */
size = link_socket_write(c->c2.link_socket,
&c->c2.to_link,
- to_addr);
+ to_addr,
+ c->options.ce.xormethod,
+ c->options.ce.xormask,
+ c->options.ce.xormasklen);
/* Undo effect of prepend */
link_socket_write_post_size_adjust(&size, size_delta, &c->c2.to_link);
diff -Naur openvpn_new-2.4.4/src/openvpn/options.c openvpn-2.4.4/src/openvpn/options.c
--- openvpn_new-2.4.4/src/openvpn/options.c 2017-09-26 10:27:37.000000000 +0100
+++ openvpn-2.4.4/src/openvpn/options.c 2017-12-04 19:31:47.245624150 +0000
@@ -811,6 +811,9 @@
o->resolve_retry_seconds = RESOLV_RETRY_INFINITE;
o->resolve_in_advance = false;
o->proto_force = -1;
+ o->ce.xormethod = 0;
+ o->ce.xormask ="\0";
+ o->ce.xormasklen = 1;
#ifdef ENABLE_OCC
o->occ = true;
#endif
@@ -972,6 +975,9 @@
setenv_str_i(es, "local_port", e->local_port, i);
setenv_str_i(es, "remote", e->remote, i);
setenv_str_i(es, "remote_port", e->remote_port, i);
+ setenv_int_i(es, "xormethod", e->xormethod, i);
+ setenv_str_i(es, "xormask", e->xormask, i);
+ setenv_int_i(es, "xormasklen", e->xormasklen, i);
if (e->http_proxy_options)
{
@@ -1475,6 +1481,9 @@
SHOW_BOOL(bind_ipv6_only);
SHOW_INT(connect_retry_seconds);
SHOW_INT(connect_timeout);
+ SHOW_INT(xormethod);
+ SHOW_STR(xormask);
+ SHOW_INT(xormasklen);
if (o->http_proxy_options)
{
@@ -5960,6 +5969,36 @@
}
options->proto_force = proto_force;
}
+ else if (streq (p[0], "scramble"))
+ {
+ VERIFY_PERMISSION (OPT_P_GENERAL|OPT_P_CONNECTION);
+ if (streq (p[1], "xormask"))
+ {
+ options->ce.xormethod = 1;
+ options->ce.xormask = p[2];
+ options->ce.xormasklen = strlen(options->ce.xormask);
+ }
+ else if (streq (p[1], "xorptrpos"))
+ {
+ options->ce.xormethod = 2;
+ }
+ else if (streq (p[1], "reverse"))
+ {
+ options->ce.xormethod = 3;
+ }
+ else if (streq (p[1], "obfuscate"))
+ {
+ options->ce.xormethod = 4;
+ options->ce.xormask = p[2];
+ options->ce.xormasklen = strlen(options->ce.xormask);
+ }
+ else
+ {
+ options->ce.xormethod = 1;
+ options->ce.xormask = p[1];
+ options->ce.xormasklen = strlen(options->ce.xormask);
+ }
+ }
else if (streq(p[0], "http-proxy") && p[1] && !p[5])
{
struct http_proxy_options *ho;
diff -Naur openvpn_new-2.4.4/src/openvpn/options.h openvpn-2.4.4/src/openvpn/options.h
--- openvpn_new-2.4.4/src/openvpn/options.h 2017-09-26 10:27:37.000000000 +0100
+++ openvpn-2.4.4/src/openvpn/options.h 2017-12-04 19:32:40.114012302 +0000
@@ -101,6 +101,9 @@
int connect_retry_seconds;
int connect_retry_seconds_max;
int connect_timeout;
+ int xormethod;
+ const char *xormask;
+ int xormasklen;
struct http_proxy_options *http_proxy_options;
const char *socks_proxy_server;
const char *socks_proxy_port;
diff -Naur openvpn_new-2.4.4/src/openvpn/socket.c openvpn-2.4.4/src/openvpn/socket.c
--- openvpn_new-2.4.4/src/openvpn/socket.c 2017-09-26 10:27:35.000000000 +0100
+++ openvpn-2.4.4/src/openvpn/socket.c 2017-12-04 19:37:44.687206193 +0000
@@ -54,6 +54,47 @@
IPv6_TCP_HEADER_SIZE,
};
+int buffer_mask (struct buffer *buf, const char *mask, int xormasklen)
+{
+ int i;
+ uint8_t *b;
+ for (i = 0, b = BPTR (buf); i < BLEN(buf); i++, b++)
+ {
+ *b = *b ^ mask[i % xormasklen];
+ }
+ return BLEN (buf);
+}
+
+int buffer_xorptrpos (struct buffer *buf)
+{
+ int i;
+ uint8_t *b;
+ for (i = 0, b = BPTR (buf); i < BLEN(buf); i++, b++)
+ {
+ *b = *b ^ i+1;
+ }
+ return BLEN (buf);
+}
+
+int buffer_reverse (struct buffer *buf)
+{
+ int len = BLEN(buf);
+ if ( len > 2 )
+ {
+ int i;
+ uint8_t *b_start = BPTR (buf) + 1;
+ uint8_t *b_end = BPTR (buf) + (len - 1);
+ uint8_t tmp;
+ for (i = 0; i < (len-1)/2; i++, b_start++, b_end--)
+ {
+ tmp = *b_start;
+ *b_start = *b_end;
+ *b_end = tmp;
+ }
+ }
+ return len;
+}
+
/*
* Convert sockflags/getaddr_flags into getaddr_flags
*/
diff -Naur openvpn_new-2.4.4/src/openvpn/socket.h openvpn-2.4.4/src/openvpn/socket.h
--- openvpn_new-2.4.4/src/openvpn/socket.h 2017-09-26 10:27:35.000000000 +0100
+++ openvpn-2.4.4/src/openvpn/socket.h 2017-12-04 19:46:06.232282981 +0000
@@ -248,6 +248,10 @@
#endif
};
+int buffer_mask (struct buffer *buf, const char *xormask, int xormasklen);
+int buffer_xorptrpos (struct buffer *buf);
+int buffer_reverse (struct buffer *buf);
+
/*
* Some Posix/Win32 differences.
*/
@@ -1053,30 +1057,52 @@
static inline int
link_socket_read(struct link_socket *sock,
struct buffer *buf,
- struct link_socket_actual *from)
+ struct link_socket_actual *from,
+ int xormethod,
+ const char *xormask,
+ int xormasklen)
{
+ int res;
if (proto_is_udp(sock->info.proto)) /* unified UDPv4 and UDPv6 */
{
- int res;
#ifdef _WIN32
res = link_socket_read_udp_win32(sock, buf, from);
#else
res = link_socket_read_udp_posix(sock, buf, from);
#endif
- return res;
}
else if (proto_is_tcp(sock->info.proto)) /* unified TCPv4 and TCPv6 */
{
/* from address was returned by accept */
addr_copy_sa(&from->dest, &sock->info.lsa->actual.dest);
- return link_socket_read_tcp(sock, buf);
+ res = link_socket_read_tcp (sock, buf);
}
else
{
ASSERT(0);
return -1; /* NOTREACHED */
}
+ switch(xormethod)
+ {
+ case 0:
+ break;
+ case 1:
+ buffer_mask(buf,xormask,xormasklen);
+ break;
+ case 2:
+ buffer_xorptrpos(buf);
+ break;
+ case 3:
+ buffer_reverse(buf);
+ break;
+ case 4:
+ buffer_mask(buf,xormask,xormasklen);
+ buffer_xorptrpos(buf);
+ buffer_reverse(buf);
+ buffer_xorptrpos(buf);
+ }
+ return res;
}
/*
@@ -1166,8 +1192,30 @@
static inline int
link_socket_write(struct link_socket *sock,
struct buffer *buf,
- struct link_socket_actual *to)
+ struct link_socket_actual *to,
+ int xormethod,
+ const char *xormask,
+ int xormasklen)
{
+ switch(xormethod)
+ {
+ case 0:
+ break;
+ case 1:
+ buffer_mask(buf,xormask,xormasklen);
+ break;
+ case 2:
+ buffer_xorptrpos(buf);
+ break;
+ case 3:
+ buffer_reverse(buf);
+ break;
+ case 4:
+ buffer_xorptrpos(buf);
+ buffer_reverse(buf);
+ buffer_xorptrpos(buf);
+ buffer_mask(buf,xormask,xormasklen);
+ }
if (proto_is_udp(sock->info.proto)) /* unified UDPv4 and UDPv6 */
{
return link_socket_write_udp(sock, buf, to);