67 lines
1.8 KiB
Diff
67 lines
1.8 KiB
Diff
From c1cdc4097a90d3314bb287d51ff83c98d86a677c Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sat, 14 May 2022 00:03:51 +0200
|
|
Subject: [PATCH] fix build with libressl >= 3.5.0
|
|
|
|
Fix the following build failure with libressl >= 3.5.0:
|
|
|
|
crypto-openssl-10.cpp:78:18: error: field 'ctx' has incomplete type 'HMAC_CTX' {aka 'hmac_ctx_st'}
|
|
78 | HMAC_CTX ctx;
|
|
| ^~~
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/98747d470c2ad59280934e160d24bd3fdad1503c
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
crypto-openssl-10.cpp | 5 ++---
|
|
crypto-openssl-11.cpp | 5 ++---
|
|
2 files changed, 4 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/crypto-openssl-10.cpp b/crypto-openssl-10.cpp
|
|
index f0f2c53..1623690 100644
|
|
--- a/crypto-openssl-10.cpp
|
|
+++ b/crypto-openssl-10.cpp
|
|
@@ -28,16 +28,15 @@
|
|
* as that of the covered work.
|
|
*/
|
|
|
|
-#include <openssl/opensslconf.h>
|
|
+#include <openssl/hmac.h>
|
|
|
|
-#if !defined(OPENSSL_API_COMPAT)
|
|
+#if defined(HMAC_cleanup)
|
|
|
|
#include "crypto.hpp"
|
|
#include "key.hpp"
|
|
#include "util.hpp"
|
|
#include <openssl/aes.h>
|
|
#include <openssl/sha.h>
|
|
-#include <openssl/hmac.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/rand.h>
|
|
#include <openssl/err.h>
|
|
diff --git a/crypto-openssl-11.cpp b/crypto-openssl-11.cpp
|
|
index adf03bb..518b90c 100644
|
|
--- a/crypto-openssl-11.cpp
|
|
+++ b/crypto-openssl-11.cpp
|
|
@@ -28,16 +28,15 @@
|
|
* as that of the covered work.
|
|
*/
|
|
|
|
-#include <openssl/opensslconf.h>
|
|
+#include <openssl/hmac.h>
|
|
|
|
-#if defined(OPENSSL_API_COMPAT)
|
|
+#if !defined(HMAC_cleanup)
|
|
|
|
#include "crypto.hpp"
|
|
#include "key.hpp"
|
|
#include "util.hpp"
|
|
#include <openssl/aes.h>
|
|
#include <openssl/sha.h>
|
|
-#include <openssl/hmac.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/rand.h>
|
|
#include <openssl/err.h>
|