forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-libs/xml-security-c: Allow for compiling with GCC 6
Gentoo-bug: 594234 * EAPI=6 Package-Manager: portage-2.3.0
- Loading branch information
1 parent
37c95d5
commit 28e20b4
Showing
3 changed files
with
43 additions
and
10 deletions.
There are no files selected for viewing
File renamed without changes.
36 changes: 36 additions & 0 deletions
36
dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
Fix building with C++14, which errors out due to bool -> T* conversions | ||
See also: https://bugs.gentoo.org/show_bug.cgi?id=594234 | ||
|
||
--- a/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp | ||
+++ b/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp | ||
@@ -151,7 +151,7 @@ | ||
SymmetricKeyMode mode = MODE_CBC, | ||
const unsigned char * iv = NULL, | ||
const unsigned char* tag = NULL, | ||
- unsigned int taglen = NULL); | ||
+ unsigned int taglen = 0); | ||
|
||
/** | ||
* \brief Continue an decrypt operation using this key. | ||
--- a/xsec/enc/XSECCryptoSymmetricKey.hpp | ||
+++ b/xsec/enc/XSECCryptoSymmetricKey.hpp | ||
@@ -185,7 +185,7 @@ | ||
SymmetricKeyMode mode = MODE_CBC, | ||
const unsigned char* iv = NULL, | ||
const unsigned char* tag = NULL, | ||
- unsigned int taglen = NULL) = 0; | ||
+ unsigned int taglen = 0) = 0; | ||
|
||
/** | ||
* \brief Continue a decrypt operation using this key. | ||
--- a/xsec/tools/checksig/InteropResolver.cpp | ||
+++ b/xsec/tools/checksig/InteropResolver.cpp | ||
@@ -645,7 +645,7 @@ | ||
|
||
} | ||
|
||
- return false; | ||
+ return NULL; | ||
|
||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters