149 lines
4.3 KiB
Diff
149 lines
4.3 KiB
Diff
|
--- lib/isc/sha2.c.orig
|
||
|
|
+++ lib/isc/sha2.c
|
||
|
|
@@ -69,7 +69,7 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifdef ISC_PLATFORM_OPENSSLHASH
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
#define EVP_MD_CTX_new() &(context->_ctx)
|
||
|
|
#define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr)
|
||
|
|
#define EVP_MD_CTX_reset(c) EVP_MD_CTX_cleanup(c)
|
||
|
|
--- lib/isc/include/isc/sha2.h.orig
|
||
|
|
+++ lib/isc/include/isc/sha2.h
|
||
|
|
@@ -84,7 +84,7 @@
|
||
|
|
|
||
|
|
typedef struct {
|
||
|
|
EVP_MD_CTX *ctx;
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
EVP_MD_CTX _ctx;
|
||
|
|
#endif
|
||
|
|
} isc_sha2_t;
|
||
|
|
--- lib/isc/include/isc/hmacmd5.h.orig
|
||
|
|
+++ lib/isc/include/isc/hmacmd5.h
|
||
|
|
@@ -42,7 +42,7 @@
|
||
|
|
|
||
|
|
typedef struct {
|
||
|
|
HMAC_CTX *ctx;
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
HMAC_CTX _ctx;
|
||
|
|
#endif
|
||
|
|
} isc_hmacmd5_t;
|
||
|
|
--- lib/isc/hmacmd5.c.orig
|
||
|
|
+++ lib/isc/hmacmd5.c
|
||
|
|
@@ -43,7 +43,7 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifdef ISC_PLATFORM_OPENSSLHASH
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
#define HMAC_CTX_new() &(ctx->_ctx), HMAC_CTX_init(&(ctx->_ctx))
|
||
|
|
#define HMAC_CTX_free(ptr) HMAC_CTX_cleanup(ptr)
|
||
|
|
#endif
|
||
|
|
--- lib/isc/md5.c.orig
|
||
|
|
+++ lib/isc/md5.c
|
||
|
|
@@ -54,7 +54,7 @@
|
||
|
|
#include <isc/util.h>
|
||
|
|
|
||
|
|
#ifdef ISC_PLATFORM_OPENSSLHASH
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
#define EVP_MD_CTX_new() &(ctx->_ctx)
|
||
|
|
#define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr)
|
||
|
|
#endif
|
||
|
|
--- lib/isc/hmacsha.c.orig
|
||
|
|
+++ lib/isc/hmacsha.c
|
||
|
|
@@ -40,7 +40,7 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifdef ISC_PLATFORM_OPENSSLHASH
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
#define HMAC_CTX_new() &(ctx->_ctx), HMAC_CTX_init(&(ctx->_ctx))
|
||
|
|
#define HMAC_CTX_free(ptr) HMAC_CTX_cleanup(ptr)
|
||
|
|
#endif
|
||
|
|
--- lib/isc/include/isc/hmacsha.h.orig
|
||
|
|
+++ lib/isc/include/isc/hmacsha.h
|
||
|
|
@@ -42,7 +42,7 @@
|
||
|
|
|
||
|
|
typedef struct {
|
||
|
|
HMAC_CTX *ctx;
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
HMAC_CTX _ctx;
|
||
|
|
#endif
|
||
|
|
} isc_hmacsha_t;
|
||
|
|
--- lib/isc/include/isc/sha1.h.orig
|
||
|
|
+++ lib/isc/include/isc/sha1.h
|
||
|
|
@@ -41,7 +41,7 @@
|
||
|
|
|
||
|
|
typedef struct {
|
||
|
|
EVP_MD_CTX *ctx;
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
EVP_MD_CTX _ctx;
|
||
|
|
#endif
|
||
|
|
} isc_sha1_t;
|
||
|
|
--- lib/isc/include/isc/md5.h.orig
|
||
|
|
+++ lib/isc/include/isc/md5.h
|
||
|
|
@@ -60,7 +60,7 @@
|
||
|
|
|
||
|
|
typedef struct {
|
||
|
|
EVP_MD_CTX *ctx;
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
EVP_MD_CTX _ctx;
|
||
|
|
#endif
|
||
|
|
} isc_md5_t;
|
||
|
|
--- lib/isc/aes.c.orig
|
||
|
|
+++ lib/isc/aes.c
|
||
|
|
@@ -33,7 +33,7 @@
|
||
|
|
#include <openssl/opensslv.h>
|
||
|
|
#include <openssl/evp.h>
|
||
|
|
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
#define EVP_CIPHER_CTX_new() &(_context), EVP_CIPHER_CTX_init(&_context)
|
||
|
|
#define EVP_CIPHER_CTX_free(c) RUNTIME_CHECK(EVP_CIPHER_CTX_cleanup(c) == 1)
|
||
|
|
#endif
|
||
|
|
@@ -42,7 +42,7 @@
|
||
|
|
isc_aes128_crypt(const unsigned char *key, const unsigned char *in,
|
||
|
|
unsigned char *out)
|
||
|
|
{
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
EVP_CIPHER_CTX _context;
|
||
|
|
#endif
|
||
|
|
EVP_CIPHER_CTX *c;
|
||
|
|
@@ -62,7 +62,7 @@
|
||
|
|
isc_aes192_crypt(const unsigned char *key, const unsigned char *in,
|
||
|
|
unsigned char *out)
|
||
|
|
{
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
EVP_CIPHER_CTX _context;
|
||
|
|
#endif
|
||
|
|
EVP_CIPHER_CTX *c;
|
||
|
|
@@ -82,7 +82,7 @@
|
||
|
|
isc_aes256_crypt(const unsigned char *key, const unsigned char *in,
|
||
|
|
unsigned char *out)
|
||
|
|
{
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
EVP_CIPHER_CTX _context;
|
||
|
|
#endif
|
||
|
|
EVP_CIPHER_CTX *c;
|
||
|
|
--- lib/isc/sha1.c.orig
|
||
|
|
+++ lib/isc/sha1.c
|
||
|
|
@@ -50,7 +50,7 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifdef ISC_PLATFORM_OPENSSLHASH
|
||
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
#define EVP_MD_CTX_new() &(context->_ctx)
|
||
|
|
#define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr)
|
||
|
|
#endif
|