blob: c6b17743ce91f424edcaaf3455a615aad72fbd81 (
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
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
diff -Nuar --exclude '*~' flow-tools-0.68.5.1.orig/lib/ftxlate.c flow-tools-0.68.5.1/lib/ftxlate.c
--- flow-tools-0.68.5.1.orig/lib/ftxlate.c 2008-01-27 12:48:49.000000000 -0800
+++ flow-tools-0.68.5.1/lib/ftxlate.c 2018-12-29 15:18:33.739062317 -0800
@@ -34,6 +34,14 @@
#include <openssl/ssl.h>
#include <openssl/evp.h>
#undef free_func
+
+/* fixup LibreSSL OpenSSL version numbering */
+#include <openssl/opensslv.h>
+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
+#undef OPENSSL_VERSION_NUMBER
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
+#endif
+
#endif /* HAVE_OPENSSL */
#include <sys/time.h>
@@ -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;
|
GitWeb
