Commit 3668e152 authored by Ondřej Surý's avatar Ondřej Surý

Merge branch 'fix-pkcs11-build' into 'master'

Fix pkcs11 build

See merge request !377
parents 0b559ccb 8ee23a47
Pipeline #2430 passed with stages
in 7 minutes and 50 seconds
......@@ -69,7 +69,7 @@
* Use this in translation units that would otherwise be empty, to
* suppress compiler warnings.
*/
#define EMPTY_TRANSLATION_UNIT static void isc__empty(void) { isc__empty(); }
#define EMPTY_TRANSLATION_UNIT extern int isc__empty;
/*%
* We use macros instead of calling the routines directly because
......
......@@ -11,9 +11,11 @@
#include <config.h>
#if HAVE_OPENSSL
#include <openssl/opensslv.h>
#if HAVE_OPENSSL && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#include <stdlib.h>
#include <string.h>
......@@ -92,4 +94,6 @@ int HMAC_CTX_reset(HMAC_CTX *ctx) {
return 1;
}
#endif
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
#endif /* HAVE_OPENSSL */
......@@ -9,11 +9,12 @@
* information regarding copyright ownership.
*/
#ifndef ISC_OPENSSL_P_H
#define ISC_OPENSSL_P_H
#pragma once
#include <config.h>
#if HAVE_OPENSSL
#include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
......@@ -31,6 +32,6 @@ HMAC_CTX *HMAC_CTX_new(void);
void HMAC_CTX_free(HMAC_CTX *ctx);
int HMAC_CTX_reset(HMAC_CTX *ctx);
#endif /* ISC_OPENSSL_P_H */
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
#endif /* ISC_OPENSSL_P_H */
#endif /* HAVE_OPENSSL */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment