diff mbox series

[1/1] package/sngrep: fix build with libressl >= 3.5.0

Message ID 20220505210604.9605-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/sngrep: fix build with libressl >= 3.5.0 | expand

Commit Message

Fabrice Fontaine May 5, 2022, 9:06 p.m. UTC 
Fix the following build failure with libressl raised since bump to
version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2:

capture_openssl.c: In function 'P_hash':
capture_openssl.c:101:18: error: storage size of 'hm' isn't known
  101 |         HMAC_CTX hm;
      |                  ^~

Fixes:
 - http://autobuild.buildroot.org/results/f1e8cdb3ac35a30055ab79d41e6cc038e5339c37

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...nssl.h-fix-build-with-libressl-3.5.0.patch | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch

Comments

Arnout Vandecappelle May 13, 2022, 10:10 p.m. UTC | #1 
On 05/05/2022 23:06, Fabrice Fontaine wrote:
> Fix the following build failure with libressl raised since bump to
> version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2:
> 
> capture_openssl.c: In function 'P_hash':
> capture_openssl.c:101:18: error: storage size of 'hm' isn't known
>    101 |         HMAC_CTX hm;
>        |                  ^~
> 
> Fixes:
>   - http://autobuild.buildroot.org/results/f1e8cdb3ac35a30055ab79d41e6cc038e5339c37
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   ...nssl.h-fix-build-with-libressl-3.5.0.patch | 40 +++++++++++++++++++
>   1 file changed, 40 insertions(+)
>   create mode 100644 package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch
> 
> diff --git a/package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch b/package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch
> new file mode 100644
> index 0000000000..7dbb29ab00
> --- /dev/null
> +++ b/package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch
> @@ -0,0 +1,40 @@
> +From 4e1406ad0df370ff8bf1d3a81aaadbb1cad2d761 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Fri, 29 Apr 2022 18:53:45 +0200
> +Subject: [PATCH] src/capture_openssl.h: fix build with libressl >= 3.5.0
> +
> +Fix the following build failure with libressl >= 3.5.0:
> +
> +capture_openssl.c: In function 'P_hash':
> +capture_openssl.c:101:18: error: storage size of 'hm' isn't known
> +  101 |         HMAC_CTX hm;
> +      |                  ^~
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/f1e8cdb3ac35a30055ab79d41e6cc038e5339c37
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Retrieved from:
> +https://github.com/irontec/sngrep/commit/4e1406ad0df370ff8bf1d3a81aaadbb1cad2d761]
> +---
> + src/capture_openssl.h | 5 +++--
> + 1 file changed, 3 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/capture_openssl.h b/src/capture_openssl.h
> +index 780de494..1f87a5cd 100644
> +--- a/src/capture_openssl.h
> ++++ b/src/capture_openssl.h
> +@@ -67,10 +67,11 @@
> + #endif
> +
> + /* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
> +- * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...)
> ++ * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...) until
> ++ * version 3.5.0
> +  */
> + #if defined(LIBRESSL_VERSION_NUMBER)
> +-#define MODSSL_USE_OPENSSL_PRE_1_1_API (1)
> ++#define MODSSL_USE_OPENSSL_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x30500000L)
> + #else
> + #define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
> + #endif
diff mbox series

Patch

diff --git a/package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch b/package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch
new file mode 100644
index 0000000000..7dbb29ab00
--- /dev/null
+++ b/package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch
@@ -0,0 +1,40 @@ 
+From 4e1406ad0df370ff8bf1d3a81aaadbb1cad2d761 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 29 Apr 2022 18:53:45 +0200
+Subject: [PATCH] src/capture_openssl.h: fix build with libressl >= 3.5.0
+
+Fix the following build failure with libressl >= 3.5.0:
+
+capture_openssl.c: In function 'P_hash':
+capture_openssl.c:101:18: error: storage size of 'hm' isn't known
+  101 |         HMAC_CTX hm;
+      |                  ^~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/f1e8cdb3ac35a30055ab79d41e6cc038e5339c37
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from:
+https://github.com/irontec/sngrep/commit/4e1406ad0df370ff8bf1d3a81aaadbb1cad2d761]
+---
+ src/capture_openssl.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/capture_openssl.h b/src/capture_openssl.h
+index 780de494..1f87a5cd 100644
+--- a/src/capture_openssl.h
++++ b/src/capture_openssl.h
+@@ -67,10 +67,11 @@
+ #endif
+ 
+ /* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
+- * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...)
++ * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...) until
++ * version 3.5.0
+  */
+ #if defined(LIBRESSL_VERSION_NUMBER)
+-#define MODSSL_USE_OPENSSL_PRE_1_1_API (1)
++#define MODSSL_USE_OPENSSL_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x30500000L)
+ #else
+ #define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
+ #endif