Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Sep 2016 05:14:46 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r421530 - head/emulators/virtualbox-ose/files
Message-ID:  <201609080514.u885EkHo060968@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Thu Sep  8 05:14:46 2016
New Revision: 421530
URL: https://svnweb.freebsd.org/changeset/ports/421530

Log:
  Attempt to fix build with LibreSSL.
  
  PR:		212473

Added:
  head/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_crypto_digest-builtin.cpp   (contents, props changed)

Added: head/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_crypto_digest-builtin.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_crypto_digest-builtin.cpp	Thu Sep  8 05:14:46 2016	(r421530)
@@ -0,0 +1,45 @@
+--- src/VBox/Runtime/common/crypto/digest-builtin.cpp.orig	2016-08-16 20:00:25 UTC
++++ src/VBox/Runtime/common/crypto/digest-builtin.cpp
+@@ -561,7 +561,7 @@ static PCRTCRDIGESTDESC const g_apDigest
+  * OpenSSL EVP.
+  */
+ 
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000
++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+ /** @impl_interface_method{RTCRDIGESTDESC::pfnNew} */
+ static DECLCALLBACK(void*) rtCrDigestOsslEvp_New(void)
+ {
+@@ -597,7 +597,7 @@ static DECLCALLBACK(int) rtCrDigestOsslE
+     if (fReInit)
+     {
+         pEvpType = EVP_MD_CTX_md(pThis);
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000
++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+         EVP_MD_CTX_reset(pThis);
+ # else
+         EVP_MD_CTX_cleanup(pThis);
+@@ -616,7 +616,7 @@ static DECLCALLBACK(int) rtCrDigestOsslE
+ static DECLCALLBACK(void) rtCrDigestOsslEvp_Delete(void *pvState)
+ {
+     EVP_MD_CTX *pThis = (EVP_MD_CTX *)pvState;
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000
++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+     EVP_MD_CTX_reset(pThis);
+ # else
+     EVP_MD_CTX_cleanup(pThis);
+@@ -661,13 +661,13 @@ static RTCRDIGESTDESC const g_rtCrDigest
+     NULL,
+     RTDIGESTTYPE_UNKNOWN,
+     EVP_MAX_MD_SIZE,
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000
++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+     0,
+ # else
+     sizeof(EVP_MD_CTX),
+ # endif
+     0,
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000
++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+     rtCrDigestOsslEvp_New,
+     rtCrDigestOsslEvp_Free,
+ # else



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609080514.u885EkHo060968>