Attachment 186132 Details for Bug 221890 – 0006-security-apache-xml-security-c-Patch-to-build-with-C.patch

[patch] 0006-security-apache-xml-security-c-Patch-to-build-with-C.patch

0006-security-apache-xml-security-c-Patch-to-build-with-C.patch (text/plain), 5.15 KB, created by Roger Leigh on 2017-09-06 21:46:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roger Leigh

Created: 2017-09-06 21:46:37 UTC

Size: 5.15 KB

patch

obsolete

>From ed7e696529ca35656f29f6ef0df99f72d60eb870 Mon Sep 17 00:00:00 2001
>From: Roger Leigh <rleigh@codelibre.net>
>Date: Sun, 3 Sep 2017 22:52:53 +0100
>Subject: [PATCH 06/13] security/apache-xml-security-c: Patch to build with
> C++11
>
>See https://issues.apache.org/jira/browse/SANTUARIO-471
>---
> .../files/patch-xsec_enc_NSS_NSSCryptoSymmetricKey.hpp        | 11 +++++++++++
> .../patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp      | 11 +++++++++++
> .../patch-xsec_enc_WinCAPI_WinCAPICryptoSymmetricKey.hpp      | 11 +++++++++++
> .../files/patch-xsec_enc_XSECCryptoSymmetricKey.hpp           | 11 +++++++++++
> .../files/patch-xsec_tools_checksig_InteropResolver.cpp       | 11 +++++++++++
> 5 files changed, 55 insertions(+)
> create mode 100644 security/apache-xml-security-c/files/patch-xsec_enc_NSS_NSSCryptoSymmetricKey.hpp
> create mode 100644 security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp
> create mode 100644 security/apache-xml-security-c/files/patch-xsec_enc_WinCAPI_WinCAPICryptoSymmetricKey.hpp
> create mode 100644 security/apache-xml-security-c/files/patch-xsec_enc_XSECCryptoSymmetricKey.hpp
> create mode 100644 security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp
>
>diff --git a/security/apache-xml-security-c/files/patch-xsec_enc_NSS_NSSCryptoSymmetricKey.hpp b/security/apache-xml-security-c/files/patch-xsec_enc_NSS_NSSCryptoSymmetricKey.hpp
>new file mode 100644
>index 000000000000..a599cc8d64ca
>--- /dev/null
>+++ b/security/apache-xml-security-c/files/patch-xsec_enc_NSS_NSSCryptoSymmetricKey.hpp
>@@ -0,0 +1,11 @@
>+--- xsec/enc/NSS/NSSCryptoSymmetricKey.hpp.orig	2017-09-03 18:52:39 UTC
>++++ xsec/enc/NSS/NSSCryptoSymmetricKey.hpp
>+@@ -149,7 +149,7 @@ public :
>+ 							 SymmetricKeyMode mode = MODE_CBC,
>+ 							 const unsigned char * iv = NULL,
>+                              const unsigned char* tag = NULL,
>+-                             unsigned int taglen = NULL);
>++                             unsigned int taglen = 0U);
>+ 
>+ 	/**
>+ 	 * \brief Continue an decrypt operation using this key.
>diff --git a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp
>new file mode 100644
>index 000000000000..a36381c20f04
>--- /dev/null
>+++ b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp
>@@ -0,0 +1,11 @@
>+--- xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp.orig	2017-09-03 18:59:26 UTC
>++++ xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
>+@@ -151,7 +151,7 @@ public :
>+ 							 SymmetricKeyMode mode = MODE_CBC,
>+ 							 const unsigned char * iv = NULL,
>+                              const unsigned char* tag = NULL,
>+-                             unsigned int taglen = NULL);
>++                             unsigned int taglen = 0U);
>+ 
>+ 	/**
>+ 	 * \brief Continue an decrypt operation using this key.
>diff --git a/security/apache-xml-security-c/files/patch-xsec_enc_WinCAPI_WinCAPICryptoSymmetricKey.hpp b/security/apache-xml-security-c/files/patch-xsec_enc_WinCAPI_WinCAPICryptoSymmetricKey.hpp
>new file mode 100644
>index 000000000000..ff479d2b0b44
>--- /dev/null
>+++ b/security/apache-xml-security-c/files/patch-xsec_enc_WinCAPI_WinCAPICryptoSymmetricKey.hpp
>@@ -0,0 +1,11 @@
>+--- xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp.orig	2017-09-03 18:59:55 UTC
>++++ xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp
>+@@ -158,7 +158,7 @@ public :
>+ 							 SymmetricKeyMode mode = MODE_CBC,
>+ 							 const unsigned char * iv = NULL,
>+                              const unsigned char* tag = NULL,
>+-                             unsigned int taglen = NULL);
>++                             unsigned int taglen = 0U);
>+ 
>+ 	/**
>+ 	 * \brief Continue an decrypt operation using this key.
>diff --git a/security/apache-xml-security-c/files/patch-xsec_enc_XSECCryptoSymmetricKey.hpp b/security/apache-xml-security-c/files/patch-xsec_enc_XSECCryptoSymmetricKey.hpp
>new file mode 100644
>index 000000000000..0e61016b3f8b
>--- /dev/null
>+++ b/security/apache-xml-security-c/files/patch-xsec_enc_XSECCryptoSymmetricKey.hpp
>@@ -0,0 +1,11 @@
>+--- xsec/enc/XSECCryptoSymmetricKey.hpp.orig	2017-09-03 18:48:32 UTC
>++++ xsec/enc/XSECCryptoSymmetricKey.hpp
>+@@ -185,7 +185,7 @@ public :
>+ 							 SymmetricKeyMode mode = MODE_CBC,
>+ 							 const unsigned char* iv = NULL,
>+                              const unsigned char* tag = NULL,
>+-                             unsigned int taglen = NULL) = 0;
>++                             unsigned int taglen = 0U) = 0;
>+ 
>+ 	/**
>+ 	 * \brief Continue a decrypt operation using this key.
>diff --git a/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp b/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp
>new file mode 100644
>index 000000000000..5b46be054bd5
>--- /dev/null
>+++ b/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp
>@@ -0,0 +1,11 @@
>+--- xsec/tools/checksig/InteropResolver.cpp.orig	2017-09-03 19:03:40 UTC
>++++ xsec/tools/checksig/InteropResolver.cpp
>+@@ -645,7 +645,7 @@ XSECCryptoKey * InteropResolver::resolve
>+ 
>+ 	}
>+ 
>+-	return false;
>++	return 0;
>+ 
>+ }
>+ 
>-- 
>2.14.1
>

Actions: View | Diff

Attachments on bug 221890: 185962 | 186127 | 186128 | 186129 | 186130 | 186131 | 186132 | 186133 | 186134 | 186135 | 186136 | 186153