ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/crypto.C
Revision: 1.2
Committed: Thu Jun 30 16:31:00 2016 UTC (7 years, 10 months ago) by root
Content type: text/plain
Branch: MAIN
CVS Tags: rel-3_0, HEAD
Changes since 1.1: +20 -0 lines
Log Message:
work around https://github.com/openssl/openssl/commit/4b464e7b46682f568a5df550426b0cf4b22e2485

File Contents

# User Rev Content
1 root 1.1 /*
2     crypto.C -- openssl crypto wrappers
3     Copyright (C) 2016 Marc Lehmann <gvpe@schmorp.de>
4    
5     This file is part of GVPE.
6    
7     GVPE is free software; you can redistribute it and/or modify it
8     under the terms of the GNU General Public License as published by the
9     Free Software Foundation; either version 3 of the License, or (at your
10     option) any later version.
11    
12     This program is distributed in the hope that it will be useful, but
13     WITHOUT ANY WARRANTY; without even the implied warranty of
14     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15     Public License for more details.
16    
17     You should have received a copy of the GNU General Public License along
18     with this program; if not, see <http://www.gnu.org/licenses/>.
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.
30     */
31    
32     #include <openssl/crypto.h>
33    
34     #include "crypto.h"
35    
36     hmac::hmac ()
37     {
38     #if OPENSSL_VERSION_NUMBER < 0x10100000
39     require (ctx = (HMAC_CTX *)OPENSSL_malloc (sizeof (*ctx)));
40     HMAC_CTX_init (ctx);
41     #else
42     require (ctx = HMAC_CTX_new ());
43     #endif
44     }
45    
46     hmac::~hmac ()
47     {
48     #if OPENSSL_VERSION_NUMBER < 0x10100000
49     HMAC_CTX_cleanup (ctx);
50     OPENSSL_free (ctx);
51     #else
52     HMAC_CTX_free (ctx);
53     #endif
54     }
55    
56 root 1.2 cipher::cipher ()
57     {
58     #if OPENSSL_VERSION_NUMBER < 0x10100000
59     require (ctx = (EVP_CIPHER_CTX *)OPENSSL_malloc (sizeof (*ctx)));
60     EVP_CIPHER_CTX_init (ctx);
61     #else
62     require (ctx = EVP_CIPHER_CTX_new ());
63     #endif
64     }
65    
66     cipher::~cipher ()
67     {
68     #if OPENSSL_VERSION_NUMBER < 0x10100000
69     EVP_CIPHER_CTX_cleanup (ctx);
70     OPENSSL_free (ctx);
71     #else
72     EVP_CIPHER_CTX_free (ctx);
73     #endif
74     }
75    
76 root 1.1