summaryrefslogtreecommitdiff
path: root/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch
blob: cbbddcaae68d54d0f0d55cdb6a6a20bef2d96a25 (plain)
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
--- a/lib/ftxlate.c
+++ b/lib/ftxlate.c
@@ -2040,11 +2048,13 @@
 
 
   /* init crypto */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
   if (!(cp->cipher_ctx = (EVP_CIPHER_CTX*) malloc(sizeof(EVP_CIPHER_CTX)))) {
     return -1;
   }
 
   EVP_CIPHER_CTX_init(cp->cipher_ctx);
+#endif
 
   /* disable padding */
   if (!(EVP_CIPHER_CTX_set_padding(cp->cipher_ctx, 0))) {
@@ -2083,10 +2093,14 @@
 {
 
 #ifdef HAVE_OPENSSL
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
   EVP_CIPHER_CTX_cleanup(cp->cipher_ctx);
 
   if (cp->cipher_ctx)
     free (cp->cipher_ctx);
+#else
+  EVP_CIPHER_CTX_free(cp->cipher_ctx);
+#endif
 #endif /* HAVE_OPENSSL */
 
   return 0;