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
|
--- source/iked/ike.cpp.orig 2009-02-12 02:35:43 UTC
+++ source/iked/ike.cpp
@@ -391,11 +391,11 @@ long _IKED::packet_ike_decrypt( IDB_PH1 * sa, PACKET_I
// init cipher key and iv
//
- EVP_CIPHER_CTX ctx_cipher;
- EVP_CIPHER_CTX_init( &ctx_cipher );
+ EVP_CIPHER_CTX *ctx_cipher;
+ ctx_cipher = EVP_CIPHER_CTX_new();
EVP_CipherInit_ex(
- &ctx_cipher,
+ ctx_cipher,
sa->evp_cipher,
NULL,
NULL,
@@ -403,11 +403,11 @@ long _IKED::packet_ike_decrypt( IDB_PH1 * sa, PACKET_I
0 );
EVP_CIPHER_CTX_set_key_length(
- &ctx_cipher,
+ ctx_cipher,
( int ) sa->key.size() );
EVP_CipherInit_ex(
- &ctx_cipher,
+ ctx_cipher,
NULL,
NULL,
sa->key.buff(),
@@ -419,12 +419,12 @@ long _IKED::packet_ike_decrypt( IDB_PH1 * sa, PACKET_I
//
EVP_Cipher(
- &ctx_cipher,
+ ctx_cipher,
data + sizeof( IKE_HEADER ),
data + sizeof( IKE_HEADER ),
( int ) size - sizeof( IKE_HEADER ) );
- EVP_CIPHER_CTX_cleanup( &ctx_cipher );
+ EVP_CIPHER_CTX_free( ctx_cipher );
log.bin(
LLOG_DEBUG,
@@ -595,11 +595,11 @@ long _IKED::packet_ike_encrypt( IDB_PH1 * sa, PACKET_I
// encrypt all but header
//
- EVP_CIPHER_CTX ctx_cipher;
- EVP_CIPHER_CTX_init( &ctx_cipher );
+ EVP_CIPHER_CTX *ctx_cipher;
+ ctx_cipher = EVP_CIPHER_CTX_new();
EVP_CipherInit_ex(
- &ctx_cipher,
+ ctx_cipher,
sa->evp_cipher,
NULL,
NULL,
@@ -607,11 +607,11 @@ long _IKED::packet_ike_encrypt( IDB_PH1 * sa, PACKET_I
1 );
EVP_CIPHER_CTX_set_key_length(
- &ctx_cipher,
+ ctx_cipher,
( int ) sa->key.size() );
EVP_CipherInit_ex(
- &ctx_cipher,
+ ctx_cipher,
NULL,
NULL,
sa->key.buff(),
@@ -619,12 +619,12 @@ long _IKED::packet_ike_encrypt( IDB_PH1 * sa, PACKET_I
1 );
EVP_Cipher(
- &ctx_cipher,
+ ctx_cipher,
data + sizeof( IKE_HEADER ),
data + sizeof( IKE_HEADER ),
( int ) size - sizeof( IKE_HEADER ) );
- EVP_CIPHER_CTX_cleanup( &ctx_cipher );
+ EVP_CIPHER_CTX_free( ctx_cipher );
//
// store cipher iv data
|
