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
|
--- dkimsign.cpp.orig 2020-09-09 02:13:04 UTC
+++ dkimsign.cpp
@@ -40,21 +40,27 @@ CDKIMSign::CDKIMSign()
{
m_EmptyLineCount = 0;
m_pfnHdrCallback = NULL;
+
+ m_allman_sha1ctx = EVP_MD_CTX_create();
+ m_Hdr_ietf_sha1ctx = EVP_MD_CTX_create();
+ m_Hdr_ietf_sha256ctx = EVP_MD_CTX_create();
+ m_Bdy_ietf_sha1ctx = EVP_MD_CTX_create();
+ m_Bdy_ietf_sha256ctx = EVP_MD_CTX_create();
- EVP_SignInit( &m_allman_sha1ctx, EVP_sha1() );
- EVP_SignInit( &m_Hdr_ietf_sha1ctx, EVP_sha1() );
- EVP_SignInit( &m_Hdr_ietf_sha256ctx, EVP_sha256() );
- EVP_DigestInit( &m_Bdy_ietf_sha1ctx, EVP_sha1() );
- EVP_DigestInit( &m_Bdy_ietf_sha256ctx, EVP_sha256() );
+ EVP_SignInit( m_allman_sha1ctx, EVP_sha1() );
+ EVP_SignInit( m_Hdr_ietf_sha1ctx, EVP_sha1() );
+ EVP_SignInit( m_Hdr_ietf_sha256ctx, EVP_sha256() );
+ EVP_DigestInit( m_Bdy_ietf_sha1ctx, EVP_sha1() );
+ EVP_DigestInit( m_Bdy_ietf_sha256ctx, EVP_sha256() );
}
CDKIMSign::~CDKIMSign()
{
- EVP_MD_CTX_cleanup( &m_allman_sha1ctx );
- EVP_MD_CTX_cleanup( &m_Hdr_ietf_sha1ctx );
- EVP_MD_CTX_cleanup( &m_Hdr_ietf_sha256ctx );
- EVP_MD_CTX_cleanup( &m_Bdy_ietf_sha1ctx );
- EVP_MD_CTX_cleanup( &m_Bdy_ietf_sha256ctx );
+ EVP_MD_CTX_destroy( m_allman_sha1ctx );
+ EVP_MD_CTX_destroy( m_Hdr_ietf_sha1ctx );
+ EVP_MD_CTX_destroy( m_Hdr_ietf_sha256ctx );
+ EVP_MD_CTX_destroy( m_Bdy_ietf_sha1ctx );
+ EVP_MD_CTX_destroy( m_Bdy_ietf_sha256ctx );
}
////////////////////////////////////////////////////////////////////////////////
@@ -150,34 +156,34 @@ void CDKIMSign::Hash( const char* szBuffer, int nBufLe
{
if( m_nIncludeBodyHash & DKIM_BODYHASH_ALLMAN_1 )
{
- EVP_SignUpdate( &m_allman_sha1ctx, szBuffer, nBufLength );
+ EVP_SignUpdate( m_allman_sha1ctx, szBuffer, nBufLength );
}
}
else
{
if( m_nIncludeBodyHash < DKIM_BODYHASH_IETF_1 )
{
- EVP_SignUpdate( &m_allman_sha1ctx, szBuffer, nBufLength );
+ EVP_SignUpdate( m_allman_sha1ctx, szBuffer, nBufLength );
}
else if( m_nIncludeBodyHash & DKIM_BODYHASH_IETF_1 )
{
if( m_nIncludeBodyHash & DKIM_BODYHASH_ALLMAN_1 )
{
- EVP_SignUpdate( &m_allman_sha1ctx, szBuffer, nBufLength );
+ EVP_SignUpdate( m_allman_sha1ctx, szBuffer, nBufLength );
}
if( m_nHash & DKIM_HASH_SHA256 )
{
if( bHdr )
- EVP_SignUpdate( &m_Hdr_ietf_sha256ctx, szBuffer, nBufLength );
+ EVP_SignUpdate( m_Hdr_ietf_sha256ctx, szBuffer, nBufLength );
else
- EVP_DigestUpdate( &m_Bdy_ietf_sha256ctx, szBuffer, nBufLength );
+ EVP_DigestUpdate( m_Bdy_ietf_sha256ctx, szBuffer, nBufLength );
}
if( m_nHash != DKIM_HASH_SHA256 )
{
if( bHdr )
- EVP_SignUpdate( &m_Hdr_ietf_sha1ctx, szBuffer, nBufLength );
+ EVP_SignUpdate( m_Hdr_ietf_sha1ctx, szBuffer, nBufLength );
else
- EVP_DigestUpdate( &m_Bdy_ietf_sha1ctx, szBuffer, nBufLength );
+ EVP_DigestUpdate( m_Bdy_ietf_sha1ctx, szBuffer, nBufLength );
}
}
}
@@ -865,7 +871,7 @@ int CDKIMSign::ConstructSignature( char* szPrivKey, bo
unsigned char Hash[EVP_MAX_MD_SIZE];
unsigned int nHashLen = 0;
- EVP_DigestFinal( bUseSha256 ? &m_Bdy_ietf_sha256ctx : &m_Bdy_ietf_sha1ctx, Hash, &nHashLen );
+ EVP_DigestFinal( bUseSha256 ? m_Bdy_ietf_sha256ctx : m_Bdy_ietf_sha1ctx, Hash, &nHashLen );
bio = BIO_new(BIO_s_mem());
if (!bio) {
@@ -936,11 +942,11 @@ int CDKIMSign::ConstructSignature( char* szPrivKey, bo
if( bUseIetfBodyHash )
{
- EVP_SignUpdate( bUseSha256 ? &m_Hdr_ietf_sha256ctx : &m_Hdr_ietf_sha1ctx, sTemp.c_str(), sTemp.size() );
+ EVP_SignUpdate( bUseSha256 ? m_Hdr_ietf_sha256ctx : m_Hdr_ietf_sha1ctx, sTemp.c_str(), sTemp.size() );
}
else
{
- EVP_SignUpdate( &m_allman_sha1ctx, sTemp.c_str(), sTemp.size() );
+ EVP_SignUpdate( m_allman_sha1ctx, sTemp.c_str(), sTemp.size() );
}
bio = BIO_new_mem_buf(szPrivKey, -1);
@@ -967,11 +973,11 @@ int CDKIMSign::ConstructSignature( char* szPrivKey, bo
if( bUseIetfBodyHash )
{
- nSignRet = EVP_SignFinal( bUseSha256 ? &m_Hdr_ietf_sha256ctx : &m_Hdr_ietf_sha1ctx, sig, &siglen, pkey);
+ nSignRet = EVP_SignFinal( bUseSha256 ? m_Hdr_ietf_sha256ctx : m_Hdr_ietf_sha1ctx, sig, &siglen, pkey);
}
else
{
- nSignRet = EVP_SignFinal( &m_allman_sha1ctx, sig, &siglen, pkey);
+ nSignRet = EVP_SignFinal( m_allman_sha1ctx, sig, &siglen, pkey);
}
EVP_PKEY_free(pkey);
|
