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
|
commit c5a5b27e4d48d0c588f02041b3324d5a1cbaf327
Author: Chris West (Faux) <git@goeswhere.com>
Date: Sun May 28 14:44:55 2017 +0000
fix lfd_encrypt.c for openssl 1.1
--- vtun-3.0.3.orig/lfd_encrypt.c
+++ vtun-3.0.3/lfd_encrypt.c
@@ -96,11 +96,11 @@ static unsigned long sequence_num;
static char * pkey;
static char * iv_buf;
-static EVP_CIPHER_CTX ctx_enc; /* encrypt */
-static EVP_CIPHER_CTX ctx_dec; /* decrypt */
+static EVP_CIPHER_CTX *ctx_enc; /* encrypt */
+static EVP_CIPHER_CTX *ctx_dec; /* decrypt */
-static EVP_CIPHER_CTX ctx_enc_ecb; /* sideband ecb encrypt */
-static EVP_CIPHER_CTX ctx_dec_ecb; /* sideband ecb decrypt */
+static EVP_CIPHER_CTX *ctx_enc_ecb; /* sideband ecb encrypt */
+static EVP_CIPHER_CTX *ctx_dec_ecb; /* sideband ecb decrypt */
static int send_msg(int len, char *in, char **out);
static int send_ib_mesg(int *len, char **in);
@@ -157,6 +157,11 @@ int alloc_encrypt(struct vtun_host *host
EVP_CIPHER_CTX *pctx_enc;
EVP_CIPHER_CTX *pctx_dec;
+ ctx_enc = EVP_CIPHER_CTX_new();
+ ctx_dec = EVP_CIPHER_CTX_new();
+ ctx_enc_ecb = EVP_CIPHER_CTX_new();
+ ctx_dec_ecb = EVP_CIPHER_CTX_new();
+
enc_init_first_time = 1;
dec_init_first_time = 1;
@@ -183,15 +188,15 @@ int alloc_encrypt(struct vtun_host *host
keysize = 32;
sb_init = 1;
cipher_type = EVP_aes_256_ecb();
- pctx_enc = &ctx_enc_ecb;
- pctx_dec = &ctx_dec_ecb;
+ pctx_enc = ctx_enc_ecb;
+ pctx_dec = ctx_dec_ecb;
break;
case VTUN_ENC_AES256ECB:
blocksize = 16;
keysize = 32;
- pctx_enc = &ctx_enc;
- pctx_dec = &ctx_dec;
+ pctx_enc = ctx_enc;
+ pctx_dec = ctx_dec;
cipher_type = EVP_aes_256_ecb();
strcpy(cipher_name,"AES-256-ECB");
break;
@@ -202,14 +207,14 @@ int alloc_encrypt(struct vtun_host *host
keysize = 16;
sb_init=1;
cipher_type = EVP_aes_128_ecb();
- pctx_enc = &ctx_enc_ecb;
- pctx_dec = &ctx_dec_ecb;
+ pctx_enc = ctx_enc_ecb;
+ pctx_dec = ctx_dec_ecb;
break;
case VTUN_ENC_AES128ECB:
blocksize = 16;
keysize = 16;
- pctx_enc = &ctx_enc;
- pctx_dec = &ctx_dec;
+ pctx_enc = ctx_enc;
+ pctx_dec = ctx_dec;
cipher_type = EVP_aes_128_ecb();
strcpy(cipher_name,"AES-128-ECB");
break;
@@ -222,16 +227,16 @@ int alloc_encrypt(struct vtun_host *host
var_key = 1;
sb_init = 1;
cipher_type = EVP_bf_ecb();
- pctx_enc = &ctx_enc_ecb;
- pctx_dec = &ctx_dec_ecb;
+ pctx_enc = ctx_enc_ecb;
+ pctx_dec = ctx_dec_ecb;
break;
case VTUN_ENC_BF256ECB:
blocksize = 8;
keysize = 32;
var_key = 1;
- pctx_enc = &ctx_enc;
- pctx_dec = &ctx_dec;
+ pctx_enc = ctx_enc;
+ pctx_dec = ctx_dec;
cipher_type = EVP_bf_ecb();
strcpy(cipher_name,"Blowfish-256-ECB");
break;
@@ -244,16 +249,16 @@ int alloc_encrypt(struct vtun_host *host
var_key = 1;
sb_init = 1;
cipher_type = EVP_bf_ecb();
- pctx_enc = &ctx_enc_ecb;
- pctx_dec = &ctx_dec_ecb;
+ pctx_enc = ctx_enc_ecb;
+ pctx_dec = ctx_dec_ecb;
break;
case VTUN_ENC_BF128ECB: /* blowfish 128 ecb is the default */
default:
blocksize = 8;
keysize = 16;
var_key = 1;
- pctx_enc = &ctx_enc;
- pctx_dec = &ctx_dec;
+ pctx_enc = ctx_enc;
+ pctx_dec = ctx_dec;
cipher_type = EVP_bf_ecb();
strcpy(cipher_name,"Blowfish-128-ECB");
break;
@@ -295,10 +300,10 @@ int free_encrypt()
lfd_free(enc_buf); enc_buf = NULL;
lfd_free(dec_buf); dec_buf = NULL;
- EVP_CIPHER_CTX_cleanup(&ctx_enc);
- EVP_CIPHER_CTX_cleanup(&ctx_dec);
- EVP_CIPHER_CTX_cleanup(&ctx_enc_ecb);
- EVP_CIPHER_CTX_cleanup(&ctx_dec_ecb);
+ EVP_CIPHER_CTX_free(ctx_enc);
+ EVP_CIPHER_CTX_free(ctx_dec);
+ EVP_CIPHER_CTX_free(ctx_enc_ecb);
+ EVP_CIPHER_CTX_free(ctx_dec_ecb);
return 0;
}
@@ -324,7 +329,7 @@ int encrypt_buf(int len, char *in, char
outlen=len+pad;
if (pad == blocksize)
RAND_bytes((unsigned char *)in_ptr+len, blocksize-1);
- EVP_EncryptUpdate(&ctx_enc, (unsigned char *)out_ptr, &outlen, (unsigned char *)in_ptr, len+pad);
+ EVP_EncryptUpdate(ctx_enc, (unsigned char *)out_ptr, &outlen, (unsigned char *)in_ptr, len+pad);
*out = enc_buf;
sequence_num++;
@@ -344,7 +349,7 @@ int decrypt_buf(int len, char *in, char
outlen=len;
if (!len) return 0;
- EVP_DecryptUpdate(&ctx_dec, (unsigned char *)out_ptr, &outlen, (unsigned char *)in_ptr, len);
+ EVP_DecryptUpdate(ctx_dec, (unsigned char *)out_ptr, &outlen, (unsigned char *)in_ptr, len);
recv_ib_mesg(&outlen, &out_ptr);
if (!outlen) return 0;
tmp_ptr = out_ptr + outlen; tmp_ptr--;
@@ -432,13 +437,13 @@ int cipher_enc_init(char * iv)
break;
} /* switch(cipher) */
- EVP_CIPHER_CTX_init(&ctx_enc);
- EVP_EncryptInit_ex(&ctx_enc, cipher_type, NULL, NULL, NULL);
+ EVP_CIPHER_CTX_init(ctx_enc);
+ EVP_EncryptInit_ex(ctx_enc, cipher_type, NULL, NULL, NULL);
if (var_key)
- EVP_CIPHER_CTX_set_key_length(&ctx_enc, keysize);
- EVP_EncryptInit_ex(&ctx_enc, NULL, NULL, (unsigned char *)pkey, NULL);
- EVP_EncryptInit_ex(&ctx_enc, NULL, NULL, NULL, (unsigned char *)iv);
- EVP_CIPHER_CTX_set_padding(&ctx_enc, 0);
+ EVP_CIPHER_CTX_set_key_length(ctx_enc, keysize);
+ EVP_EncryptInit_ex(ctx_enc, NULL, NULL, (unsigned char *)pkey, NULL);
+ EVP_EncryptInit_ex(ctx_enc, NULL, NULL, NULL, (unsigned char *)iv);
+ EVP_CIPHER_CTX_set_padding(ctx_enc, 0);
if (enc_init_first_time)
{
sprintf(tmpstr,"%s encryption initialized", cipher_name);
@@ -522,13 +527,13 @@ int cipher_dec_init(char * iv)
break;
} /* switch(cipher) */
- EVP_CIPHER_CTX_init(&ctx_dec);
- EVP_DecryptInit_ex(&ctx_dec, cipher_type, NULL, NULL, NULL);
+ EVP_CIPHER_CTX_init(ctx_dec);
+ EVP_DecryptInit_ex(ctx_dec, cipher_type, NULL, NULL, NULL);
if (var_key)
- EVP_CIPHER_CTX_set_key_length(&ctx_dec, keysize);
- EVP_DecryptInit_ex(&ctx_dec, NULL, NULL, (unsigned char *)pkey, NULL);
- EVP_DecryptInit_ex(&ctx_dec, NULL, NULL, NULL, (unsigned char *)iv);
- EVP_CIPHER_CTX_set_padding(&ctx_dec, 0);
+ EVP_CIPHER_CTX_set_key_length(ctx_dec, keysize);
+ EVP_DecryptInit_ex(ctx_dec, NULL, NULL, (unsigned char *)pkey, NULL);
+ EVP_DecryptInit_ex(ctx_dec, NULL, NULL, NULL, (unsigned char *)iv);
+ EVP_CIPHER_CTX_set_padding(ctx_dec, 0);
if (dec_init_first_time)
{
sprintf(tmpstr,"%s decryption initialized", cipher_name);
@@ -560,7 +565,7 @@ int send_msg(int len, char *in, char **o
in_ptr = in - blocksize*2;
outlen = blocksize*2;
- EVP_EncryptUpdate(&ctx_enc_ecb, (unsigned char *)in_ptr,
+ EVP_EncryptUpdate(ctx_enc_ecb, (unsigned char *)in_ptr,
&outlen, (unsigned char *)in_ptr, blocksize*2);
*out = in_ptr;
len = outlen;
@@ -587,7 +592,7 @@ int recv_msg(int len, char *in, char **o
in_ptr = in;
iv = malloc(blocksize);
outlen = blocksize*2;
- EVP_DecryptUpdate(&ctx_dec_ecb, (unsigned char *)in_ptr, &outlen, (unsigned char *)in_ptr, blocksize*2);
+ EVP_DecryptUpdate(ctx_dec_ecb, (unsigned char *)in_ptr, &outlen, (unsigned char *)in_ptr, blocksize*2);
if ( !strncmp(in_ptr, "ivec", 4) )
{
@@ -630,7 +635,7 @@ int recv_msg(int len, char *in, char **o
if (cipher_enc_state != CIPHER_INIT)
{
cipher_enc_state = CIPHER_INIT;
- EVP_CIPHER_CTX_cleanup(&ctx_enc);
+ EVP_CIPHER_CTX_cleanup(ctx_enc);
#ifdef LFD_ENCRYPT_DEBUG
vtun_syslog(LOG_INFO,
"Forcing local encryptor re-init");
@@ -711,7 +716,7 @@ int recv_ib_mesg(int *len, char **in)
if (cipher_enc_state != CIPHER_INIT)
{
cipher_enc_state = CIPHER_INIT;
- EVP_CIPHER_CTX_cleanup(&ctx_enc);
+ EVP_CIPHER_CTX_cleanup(ctx_enc);
}
#ifdef LFD_ENCRYPT_DEBUG
vtun_syslog(LOG_INFO, "Remote requests encryptor re-init");
@@ -725,7 +730,7 @@ int recv_ib_mesg(int *len, char **in)
cipher_enc_state != CIPHER_REQ_INIT &&
cipher_enc_state != CIPHER_INIT)
{
- EVP_CIPHER_CTX_cleanup (&ctx_dec);
+ EVP_CIPHER_CTX_cleanup (ctx_dec);
cipher_dec_state = CIPHER_INIT;
cipher_enc_state = CIPHER_REQ_INIT;
}
|