git-crypt/trunk/openssl-3.0.patch

   1 From c1cdc4097a90d3314bb287d51ff83c98d86a677c Mon Sep 17 00:00:00 2001
   2 From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
   3 Date: Sat, 14 May 2022 00:03:51 +0200
   4 Subject: [PATCH] fix build with libressl >= 3.5.0
   5
   6 Fix the following build failure with libressl >= 3.5.0:
   7
   8 crypto-openssl-10.cpp:78:18: error: field 'ctx' has incomplete type 'HMAC_CTX' {aka 'hmac_ctx_st'}
   9    78 |         HMAC_CTX ctx;
  10       |                  ^~~
  11
  12 Fixes:
  13  - http://autobuild.buildroot.org/results/98747d470c2ad59280934e160d24bd3fdad1503c
  14
  15 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  16 ---
  17  crypto-openssl-10.cpp | 5 ++---
  18  crypto-openssl-11.cpp | 5 ++---
  19  2 files changed, 4 insertions(+), 6 deletions(-)
  20
  21 diff --git a/crypto-openssl-10.cpp b/crypto-openssl-10.cpp
  22 index f0f2c53..1623690 100644
  23 --- a/crypto-openssl-10.cpp
  24 +++ b/crypto-openssl-10.cpp
  25 @@ -28,16 +28,15 @@
  26   * as that of the covered work.
  27   */
  28
  29 -#include <openssl/opensslconf.h>
  30 +#include <openssl/hmac.h>
  31
  32 -#if !defined(OPENSSL_API_COMPAT)
  33 +#if defined(HMAC_cleanup)
  34
  35  #include "crypto.hpp"
  36  #include "key.hpp"
  37  #include "util.hpp"
  38  #include <openssl/aes.h>
  39  #include <openssl/sha.h>
  40 -#include <openssl/hmac.h>
  41  #include <openssl/evp.h>
  42  #include <openssl/rand.h>
  43  #include <openssl/err.h>
  44 diff --git a/crypto-openssl-11.cpp b/crypto-openssl-11.cpp
  45 index adf03bb..518b90c 100644
  46 --- a/crypto-openssl-11.cpp
  47 +++ b/crypto-openssl-11.cpp
  48 @@ -28,16 +28,15 @@
  49   * as that of the covered work.
  50   */
  51
  52 -#include <openssl/opensslconf.h>
  53 +#include <openssl/hmac.h>
  54
  55 -#if defined(OPENSSL_API_COMPAT)
  56 +#if !defined(HMAC_cleanup)
  57
  58  #include "crypto.hpp"
  59  #include "key.hpp"
  60  #include "util.hpp"
  61  #include <openssl/aes.h>
  62  #include <openssl/sha.h>
  63 -#include <openssl/hmac.h>
  64  #include <openssl/evp.h>
  65  #include <openssl/rand.h>
  66  #include <openssl/err.h>