upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Put proper guards in openssl_shim.{c,h} when compiling with PKCS#11

Browse source
This commit is contained in:
Ondřej Surý 2018-06-14 23:54:48 +02:00 committed by Ondřej Surý
parent 0b559ccb33
commit 38060959c7
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/isc/openssl_shim.c
View file

@ -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
lib/isc/openssl_shim.h
View file

@ -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 */