4714. [port] openbsd/libressl: add support for building with

                        --enable-openssl-hash. [RT #45982]

diff --git a/CHANGES b/CHANGES
index 075f043cd43a2ab497438a2bfee9ca01a70b373d..b2771c7add7becaa215855758c4918abaf84d4fa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4714.  [port]          openbsd/libressl: add support for building with
+                       --enable-openssl-hash. [RT #45982]
+
        --- 9.12.0a1 released ---
 
 4713.  [func]          Added support for the DNS Response Policy Service

diff --git a/lib/isc/aes.c b/lib/isc/aes.c
index e47ecf367beace1f25ad9110d639b47bfb16c386..c187f6f0ef0b83d62575b49628891df71b66fd9e 100644 (file)
--- a/lib/isc/aes.c
+++ b/lib/isc/aes.c
@@ -25,7 +25,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
@@ -34,7 +34,7 @@ void
 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;
@@ -54,7 +54,7 @@ void
 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;
@@ -74,7 +74,7 @@ void
 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;

diff --git a/lib/isc/hmacmd5.c b/lib/isc/hmacmd5.c
index 7121cbcc9c24ab509d1b747129682edaa3599fab..bd6e454a264d18cafc95f1e7ef3e3dd36cfe8e94 100644 (file)
--- a/lib/isc/hmacmd5.c
+++ b/lib/isc/hmacmd5.c
@@ -32,7 +32,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

diff --git a/lib/isc/hmacsha.c b/lib/isc/hmacsha.c
index 6e42ade21812995643bd127aaeec38b4d55f4a93..d57ea7a511cd30a9b7e37de61df51f7dda88f4d2 100644 (file)
--- a/lib/isc/hmacsha.c
+++ b/lib/isc/hmacsha.c
@@ -30,7 +30,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

diff --git a/lib/isc/include/isc/hmacmd5.h b/lib/isc/include/isc/hmacmd5.h
index 1ff0b872d49f3c6ba6bba73b9fe1e4e135dda91c..f716762e77e94ff38729dc6dfaaea3f133c28e10 100644 (file)
--- a/lib/isc/include/isc/hmacmd5.h
+++ b/lib/isc/include/isc/hmacmd5.h
@@ -33,7 +33,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;

diff --git a/lib/isc/include/isc/hmacsha.h b/lib/isc/include/isc/hmacsha.h
index d90c1940586e18d5d5ab74521be8e86b11244075..6797ba99c85ff59f6c68b56eb3739af7ed1dbad1 100644 (file)
--- a/lib/isc/include/isc/hmacsha.h
+++ b/lib/isc/include/isc/hmacsha.h
@@ -34,7 +34,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;

diff --git a/lib/isc/include/isc/md5.h b/lib/isc/include/isc/md5.h
index b707aa6f5960a2cb09ce7e8dbaf11f931bff5b37..a91ad5794cff14d3197cfd523c62f37c041c412c 100644 (file)
--- a/lib/isc/include/isc/md5.h
+++ b/lib/isc/include/isc/md5.h
@@ -51,7 +51,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;

diff --git a/lib/isc/include/isc/sha1.h b/lib/isc/include/isc/sha1.h
index 7160a66ec8f96a3b72003b2fc0199bdc015373dd..480543e31f35fa446fd32184ecdfb9800cb261d3 100644 (file)
--- a/lib/isc/include/isc/sha1.h
+++ b/lib/isc/include/isc/sha1.h
@@ -32,7 +32,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;

diff --git a/lib/isc/include/isc/sha2.h b/lib/isc/include/isc/sha2.h
index 196f12052c457c2200be7f1b9c2f6a3490a2fce3..6808e131103d6b7e78155ffcf2b3f8260970eede 100644 (file)
--- a/lib/isc/include/isc/sha2.h
+++ b/lib/isc/include/isc/sha2.h
@@ -70,13 +70,17 @@
 
 /*** SHA-256/384/512 Context Structures *******************************/
 
-#ifdef ISC_PLATFORM_OPENSSLHASH
+#if defined(ISC_PLATFORM_OPENSSLHASH)
 #include <openssl/opensslv.h>
 #include <openssl/evp.h>
+#endif
+
+#if defined(ISC_PLATFORM_OPENSSLHASH) && !defined(LIBRESSL_VERSION_NUMBER)
+
 
 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;

diff --git a/lib/isc/md5.c b/lib/isc/md5.c
index 8ada1cc01c8a1f800959a66b70fd05ed905d9b8d..0d69fb837b7aae9d90a8a557638d728e752756ac 100644 (file)
--- a/lib/isc/md5.c
+++ b/lib/isc/md5.c
@@ -45,7 +45,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

diff --git a/lib/isc/sha1.c b/lib/isc/sha1.c
index f33758f58d388072b86dbb368dcbedaf1562e430..acfc5082ec12bef695ec890b02bb23f05a6be253 100644 (file)
--- a/lib/isc/sha1.c
+++ b/lib/isc/sha1.c
@@ -39,7 +39,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

diff --git a/lib/isc/sha2.c b/lib/isc/sha2.c
index 3558144d114286d8da85d5b596b69b249f581698..4a813efe1c868c6ae8f6f43fd99c287b06cb0fca 100644 (file)
--- a/lib/isc/sha2.c
+++ b/lib/isc/sha2.c
@@ -58,7 +58,7 @@
 #include <pk11/pk11.h>
 #endif
 
-#ifdef ISC_PLATFORM_OPENSSLHASH
+#if defined(ISC_PLATFORM_OPENSSLHASH) && !defined(LIBRESSL_VERSION_NUMBER)
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 #define EVP_MD_CTX_new() &(context->_ctx)
 #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr)
@@ -1604,7 +1604,7 @@ isc_sha224_end(isc_sha224_t *context, char buffer[]) {
                }
                *buffer = (char)0;
        } else {
-#ifdef ISC_PLATFORM_OPENSSLHASH
+#if defined(ISC_PLATFORM_OPENSSLHASH) && !defined(LIBRESSL_VERSION_NUMBER)
                EVP_MD_CTX_reset(context->ctx);
 #elif PKCS11CRYPTO
                pk11_return_session(context);
@@ -1645,7 +1645,7 @@ isc_sha256_end(isc_sha256_t *context, char buffer[]) {
                }
                *buffer = (char)0;
        } else {
-#ifdef ISC_PLATFORM_OPENSSLHASH
+#if defined(ISC_PLATFORM_OPENSSLHASH) && !defined(LIBRESSL_VERSION_NUMBER)
                EVP_MD_CTX_reset(context->ctx);
 #elif PKCS11CRYPTO
                pk11_return_session(context);
@@ -1686,7 +1686,7 @@ isc_sha512_end(isc_sha512_t *context, char buffer[]) {
                }
                *buffer = (char)0;
        } else {
-#ifdef ISC_PLATFORM_OPENSSLHASH
+#if defined(ISC_PLATFORM_OPENSSLHASH) && !defined(LIBRESSL_VERSION_NUMBER)
                EVP_MD_CTX_reset(context->ctx);
 #elif PKCS11CRYPTO
                pk11_return_session(context);
@@ -1727,7 +1727,7 @@ isc_sha384_end(isc_sha384_t *context, char buffer[]) {
                }
                *buffer = (char)0;
        } else {
-#ifdef ISC_PLATFORM_OPENSSLHASH
+#if defined(ISC_PLATFORM_OPENSSLHASH) && !defined(LIBRESSL_VERSION_NUMBER)
                EVP_MD_CTX_reset(context->ctx);
 #elif PKCS11CRYPTO
                pk11_return_session(context);