Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xmlsec1 for openSUSE:Factory checked in at 2022-05-24 20:30:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlsec1 (Old) and /work/SRC/openSUSE:Factory/.xmlsec1.new.2254 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlsec1" Tue May 24 20:30:54 2022 rev:18 rq:978679 version:1.2.34 Changes: -------- --- /work/SRC/openSUSE:Factory/xmlsec1/xmlsec1.changes 2021-12-02 02:28:51.595860195 +0100 +++ /work/SRC/openSUSE:Factory/.xmlsec1.new.2254/xmlsec1.changes 2022-05-24 20:31:08.198907077 +0200 @@ -1,0 +2,8 @@ +Mon May 23 09:49:35 UTC 2022 - Dirk M??ller <dmuel...@suse.com> + +- update to 1.2.34: + * Support for OpenSSL compiled with OPENSSL_NO_ERR. + * Full support for LibreSSL 3.5.0 and above + * Several other small fixes + +------------------------------------------------------------------- Old: ---- xmlsec1-1.2.33.tar.gz xmlsec1-1.2.33.tar.gz.sig New: ---- xmlsec1-1.2.34.tar.gz xmlsec1-1.2.34.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlsec1.spec ++++++ --- /var/tmp/diff_new_pack.PO6JpU/_old 2022-05-24 20:31:08.998907791 +0200 +++ /var/tmp/diff_new_pack.PO6JpU/_new 2022-05-24 20:31:09.002907795 +0200 @@ -1,7 +1,7 @@ # # spec file for package xmlsec1 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ %global libgnutls libxmlsec1-gnutls1 %global libnss libxmlsec1-nss1 Name: xmlsec1 -Version: 1.2.33 +Version: 1.2.34 Release: 0 Summary: Library providing support for "XML Signature" and "XML Encryption" standards License: MIT ++++++ xmlsec1-1.2.33.tar.gz -> xmlsec1-1.2.34.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/configure new/xmlsec1-1.2.34/configure --- old/xmlsec1-1.2.33/configure 2021-10-25 15:06:17.000000000 +0200 +++ new/xmlsec1-1.2.34/configure 2022-05-03 16:36:51.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xmlsec1 1.2.33. +# Generated by GNU Autoconf 2.69 for xmlsec1 1.2.34. # # Report bugs to <http://www.aleksey.com/xmlsec>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='xmlsec1' PACKAGE_TARNAME='xmlsec1' -PACKAGE_VERSION='1.2.33' -PACKAGE_STRING='xmlsec1 1.2.33' +PACKAGE_VERSION='1.2.34' +PACKAGE_STRING='xmlsec1 1.2.34' PACKAGE_BUGREPORT='http://www.aleksey.com/xmlsec' PACKAGE_URL='' @@ -1585,7 +1585,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xmlsec1 1.2.33 to adapt to many kinds of systems. +\`configure' configures xmlsec1 1.2.34 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1656,7 +1656,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xmlsec1 1.2.33:";; + short | recursive ) echo "Configuration of xmlsec1 1.2.34:";; esac cat <<\_ACEOF @@ -1856,7 +1856,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xmlsec1 configure 1.2.33 +xmlsec1 configure 1.2.34 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2408,7 +2408,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xmlsec1 $as_me 1.2.33, which was +It was created by xmlsec1 $as_me 1.2.34, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2760,7 +2760,7 @@ XMLSEC_PACKAGE=xmlsec1 XMLSEC_VERSION_MAJOR=1 XMLSEC_VERSION_MINOR=2 -XMLSEC_VERSION_SUBMINOR=33 +XMLSEC_VERSION_SUBMINOR=34 XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR" XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'` XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'` @@ -3368,7 +3368,7 @@ # Define the identity of the package. PACKAGE='xmlsec1' - VERSION='1.2.33' + VERSION='1.2.34' cat >>confdefs.h <<_ACEOF @@ -16918,7 +16918,7 @@ main () { - int main () { CertOpenStore(0,0,0,0,0);; return(0); } + CertOpenStore(0,0,0,0,0); ; return 0; @@ -17011,11 +17011,8 @@ main () { - int main () { - BCRYPT_ALG_HANDLE hAlg; - BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_SHA256_ALGORITHM, NULL, 0); - return(0); - } + BCRYPT_ALG_HANDLE hAlg; + BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_SHA256_ALGORITHM, NULL, 0); ; return 0; @@ -18840,7 +18837,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xmlsec1 $as_me 1.2.33, which was +This file was extended by xmlsec1 $as_me 1.2.34, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18906,7 +18903,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xmlsec1 config.status 1.2.33 +xmlsec1 config.status 1.2.34 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/configure.ac new/xmlsec1-1.2.34/configure.ac --- old/xmlsec1-1.2.33/configure.ac 2021-10-25 15:05:42.000000000 +0200 +++ new/xmlsec1-1.2.34/configure.ac 2022-05-03 16:36:17.000000000 +0200 @@ -1,10 +1,10 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([xmlsec1],[1.2.33],[http://www.aleksey.com/xmlsec]) +AC_INIT([xmlsec1],[1.2.34],[http://www.aleksey.com/xmlsec]) XMLSEC_PACKAGE=xmlsec1 XMLSEC_VERSION_MAJOR=1 XMLSEC_VERSION_MINOR=2 -XMLSEC_VERSION_SUBMINOR=33 +XMLSEC_VERSION_SUBMINOR=34 XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR" XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'` XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'` @@ -1569,7 +1569,7 @@ #include <windows.h> #include <wincrypt.h> ]],[[ - int main () { CertOpenStore(0,0,0,0,0);; return(0); } + CertOpenStore(0,0,0,0,0); ]]) ],[ MSCRYPTO_FOUND=yes @@ -1640,11 +1640,8 @@ #include <windows.h> #include <wincrypt.h> ]],[[ - int main () { - BCRYPT_ALG_HANDLE hAlg; - BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_SHA256_ALGORITHM, NULL, 0); - return(0); - } + BCRYPT_ALG_HANDLE hAlg; + BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_SHA256_ALGORITHM, NULL, 0); ]]) ],[ MSCNG_FOUND=yes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/docs/api/xmlsec-version.html new/xmlsec1-1.2.34/docs/api/xmlsec-version.html --- old/xmlsec1-1.2.33/docs/api/xmlsec-version.html 2021-10-25 15:05:43.000000000 +0200 +++ new/xmlsec1-1.2.34/docs/api/xmlsec-version.html 2022-05-03 16:36:17.000000000 +0200 @@ -78,7 +78,7 @@ <a name="xmlsec-version.other_details"></a><h2>Types and Values</h2> <div class="refsect2"> <a name="XMLSEC-VERSION:CAPS"></a><h3>XMLSEC_VERSION</h3> -<pre class="programlisting">#define XMLSEC_VERSION "1.2.33" +<pre class="programlisting">#define XMLSEC_VERSION "1.2.34" </pre> <p>The library version string in the format "$major_number.$minor_number.$sub_minor_number".</p> @@ -100,14 +100,14 @@ <hr> <div class="refsect2"> <a name="XMLSEC-VERSION-SUBMINOR:CAPS"></a><h3>XMLSEC_VERSION_SUBMINOR</h3> -<pre class="programlisting">#define XMLSEC_VERSION_SUBMINOR 33 +<pre class="programlisting">#define XMLSEC_VERSION_SUBMINOR 34 </pre> <p>The library sub-minor version number.</p> </div> <hr> <div class="refsect2"> <a name="XMLSEC-VERSION-INFO:CAPS"></a><h3>XMLSEC_VERSION_INFO</h3> -<pre class="programlisting">#define XMLSEC_VERSION_INFO "3:33:2" +<pre class="programlisting">#define XMLSEC_VERSION_INFO "3:34:2" </pre> <p>The library version info string in the format "$major_number+$minor_number:$sub_minor_number:$minor_number".</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/docs/index.html new/xmlsec1-1.2.34/docs/index.html --- old/xmlsec1-1.2.33/docs/index.html 2021-10-25 15:05:43.000000000 +0200 +++ new/xmlsec1-1.2.34/docs/index.html 2022-05-03 16:36:17.000000000 +0200 @@ -439,6 +439,15 @@ see the Copyright file in the distribution for details.<br><br></p> <p><b>News</b></p> <ul> +<li>May 3 2022<br> + The <a href="download.html">XML Security Library 1.2.34</a> release includes the following changes: + <ul> + <li>Support for OpenSSL compiled with OPENSSL_NO_ERR.</li> + <li>Full support for LibreSSL 3.5.0 and above (@vishwin).</li> + <li>Several other small fixes (<a href="https://github.com/lsh123/xmlsec/commits/master";>more details</a>).</li> + </ul> +</li> +<br> <li>October 25 2021<br> The <a href="download.html">XML Security Library 1.2.33</a> release includes the following changes: <ul> @@ -470,14 +479,6 @@ <li>Several other small fixes (<a href="https://github.com/lsh123/xmlsec/commits/master";>more details</a>).</li> </ul> </li> -<br><li>October 15 2019<br> - The <a href="download.html">XML Security Library 1.2.29</a> release includes the following changes: - <ul> - <li>Various build and tests fixes and improvements.</li> - <li>Move remaining private header files away from xmlsec/include/ folder.</li> - <li>Several other small fixes (<a href="https://github.com/lsh123/xmlsec/commits/master";>more details</a>).</li> - </ul> -</li> <br><li>See <a href="news.html">News page</a> for older announcements.</li> </ul> </td></tr></table></td> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/docs/news.html new/xmlsec1-1.2.34/docs/news.html --- old/xmlsec1-1.2.33/docs/news.html 2021-10-25 15:05:43.000000000 +0200 +++ new/xmlsec1-1.2.34/docs/news.html 2022-05-03 16:36:17.000000000 +0200 @@ -420,6 +420,15 @@ <h1>XML Security Library News</h1> </div> <ul> +<li>May 3 2022<br> + The <a href="download.html">XML Security Library 1.2.34</a> release includes the following changes: + <ul> + <li>Support for OpenSSL compiled with OPENSSL_NO_ERR.</li> + <li>Full support for LibreSSL 3.5.0 and above (@vishwin).</li> + <li>Several other small fixes (<a href="https://github.com/lsh123/xmlsec/commits/master";>more details</a>).</li> + </ul> +</li> +<br> <li>October 25 2021<br> The <a href="download.html">XML Security Library 1.2.33</a> release includes the following changes: <ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/include/xmlsec/version.h new/xmlsec1-1.2.34/include/xmlsec/version.h --- old/xmlsec1-1.2.33/include/xmlsec/version.h 2021-10-25 15:07:12.000000000 +0200 +++ new/xmlsec1-1.2.34/include/xmlsec/version.h 2022-05-03 16:37:44.000000000 +0200 @@ -26,7 +26,7 @@ * The library version string in the format * "$major_number.$minor_number.$sub_minor_number". */ -#define XMLSEC_VERSION "1.2.33" +#define XMLSEC_VERSION "1.2.34" /** * XMLSEC_VERSION_MAJOR: @@ -47,7 +47,7 @@ * * The library sub-minor version number. */ -#define XMLSEC_VERSION_SUBMINOR 33 +#define XMLSEC_VERSION_SUBMINOR 34 /** * XMLSEC_VERSION_INFO: @@ -55,7 +55,7 @@ * The library version info string in the format * "$major_number+$minor_number:$sub_minor_number:$minor_number". */ -#define XMLSEC_VERSION_INFO "3:33:2" +#define XMLSEC_VERSION_INFO "3:34:2" #ifdef __cplusplus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/man/xmlsec1-config.1 new/xmlsec1-1.2.34/man/xmlsec1-config.1 --- old/xmlsec1-1.2.33/man/xmlsec1-config.1 2021-10-25 15:05:43.000000000 +0200 +++ new/xmlsec1-1.2.34/man/xmlsec1-config.1 2022-05-03 16:36:17.000000000 +0200 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH XMLSEC1-CONFIG "1" "October 2021" "xmlsec1-config 1.2.33" "User Commands" +.TH XMLSEC1-CONFIG "1" "April 2022" "xmlsec1-config 1.2.34" "User Commands" .SH NAME xmlsec1-config \- detail installed version of xmlsec library .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/man/xmlsec1.1 new/xmlsec1-1.2.34/man/xmlsec1.1 --- old/xmlsec1-1.2.33/man/xmlsec1.1 2021-10-25 15:05:43.000000000 +0200 +++ new/xmlsec1-1.2.34/man/xmlsec1.1 2022-05-03 16:36:17.000000000 +0200 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH XMLSEC1 "1" "October 2021" "xmlsec1 1.2.33 (openssl)" "User Commands" +.TH XMLSEC1 "1" "April 2022" "xmlsec1 1.2.34 (openssl)" "User Commands" .SH NAME xmlsec1 \- sign, verify, encrypt and decrypt XML documents .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/scripts/build_release.sh new/xmlsec1-1.2.34/scripts/build_release.sh --- old/xmlsec1-1.2.33/scripts/build_release.sh 2021-10-25 15:05:43.000000000 +0200 +++ new/xmlsec1-1.2.34/scripts/build_release.sh 2022-05-03 16:36:17.000000000 +0200 @@ -17,7 +17,7 @@ sig_file="xmlsec1-$version.sig" rc_tar_file="xmlsec1-$version-$rc.tar.gz" rc_sig_file="xmlsec1-$version-$rc.sig" -git_release_branch="xmlsec-$version-release" +git_release_branch=`echo "xmlsec-$version" | sed 's/\./_/g'` git_version_tag=`echo $version | sed 's/\./_/g'` if [ x"$version" = x ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/src/openssl/crypto.c new/xmlsec1-1.2.34/src/openssl/crypto.c --- old/xmlsec1-1.2.33/src/openssl/crypto.c 2021-10-25 15:05:43.000000000 +0200 +++ new/xmlsec1-1.2.34/src/openssl/crypto.c 2022-05-03 16:36:17.000000000 +0200 @@ -39,6 +39,19 @@ static xmlSecCryptoDLFunctionsPtr gXmlSecOpenSSLFunctions = NULL; static xmlChar* gXmlSecOpenSSLTrustedCertsFolder = NULL; +#if !defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_NO_ERR) + +#define XMLSEC_OPENSSL_ERRORS_FUNCTION 0 + +static int gXmlSecOpenSSLErrorsLib = 0; +static char gXmlSecOpenSSLErrorsLibName[] = "xmlsec lib"; +static char gXmlSecOpenSSLErrorsDefault[] = "xmlsec routines"; + +static ERR_STRING_DATA xmlSecOpenSSLStrLib[2]; +static ERR_STRING_DATA xmlSecOpenSSLStrDefReason[2]; +static ERR_STRING_DATA xmlSecOpenSSLStrReasons[XMLSEC_ERRORS_MAX_NUMBER + 1]; +#endif /* !defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_NO_ERR) */ + /** * xmlSecCryptoGetFunctions_openssl: * @@ -446,43 +459,47 @@ xmlSecOpenSSLErrorsDefaultCallback(const char* file, int line, const char* func, const char* errorObject, const char* errorSubject, int reason, const char* msg) { - ERR_put_error(XMLSEC_OPENSSL_ERRORS_LIB, +#if !defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_NO_ERR) + ERR_put_error(gXmlSecOpenSSLErrorsLib, XMLSEC_OPENSSL_ERRORS_FUNCTION, reason, file, line); +#endif /* !defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_NO_ERR) */ + xmlSecErrorsDefaultCallback(file, line, func, errorObject, errorSubject, reason, msg); } -#ifndef OPENSSL_IS_BORINGSSL -static ERR_STRING_DATA xmlSecOpenSSLStrReasons[XMLSEC_ERRORS_MAX_NUMBER + 1]; -static ERR_STRING_DATA xmlSecOpenSSLStrLib[] = { - { ERR_PACK(XMLSEC_OPENSSL_ERRORS_LIB,0,0), "xmlsec routines"}, - { 0, NULL} -}; -static ERR_STRING_DATA xmlSecOpenSSLStrDefReason[]= { - { XMLSEC_OPENSSL_ERRORS_LIB, "xmlsec lib"}, - { 0, NULL} -}; -#endif /* OPENSSL_IS_BORINGSSL */ - static int xmlSecOpenSSLErrorsInit(void) { -#ifndef OPENSSL_IS_BORINGSSL +#if !defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_NO_ERR) xmlSecSize pos; + /* get XMLSec library id */ + gXmlSecOpenSSLErrorsLib = ERR_get_next_error_library(); + + /* initialize xmlsec lib name array */ + memset(xmlSecOpenSSLStrLib, 0, sizeof(xmlSecOpenSSLStrLib)); + xmlSecOpenSSLStrLib[0].error = gXmlSecOpenSSLErrorsLib; + xmlSecOpenSSLStrLib[0].string = gXmlSecOpenSSLErrorsLibName; + + /* initialize xmlsec default error array */ + memset(xmlSecOpenSSLStrDefReason, 0, sizeof(xmlSecOpenSSLStrDefReason)); + xmlSecOpenSSLStrDefReason[0].error = ERR_PACK(gXmlSecOpenSSLErrorsLib, XMLSEC_OPENSSL_ERRORS_FUNCTION, 0); + xmlSecOpenSSLStrDefReason[0].string = gXmlSecOpenSSLErrorsDefault; + /* initialize reasons array */ memset(xmlSecOpenSSLStrReasons, 0, sizeof(xmlSecOpenSSLStrReasons)); for(pos = 0; (pos < XMLSEC_ERRORS_MAX_NUMBER) && (xmlSecErrorsGetMsg(pos) != NULL); ++pos) { - xmlSecOpenSSLStrReasons[pos].error = xmlSecErrorsGetCode(pos); + xmlSecOpenSSLStrReasons[pos].error = ERR_PACK(gXmlSecOpenSSLErrorsLib, XMLSEC_OPENSSL_ERRORS_FUNCTION, xmlSecErrorsGetCode(pos)); xmlSecOpenSSLStrReasons[pos].string = xmlSecErrorsGetMsg(pos); } /* load xmlsec strings in OpenSSL */ - ERR_load_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrLib); /* define xmlsec lib name */ - ERR_load_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrDefReason); /* define default reason */ - ERR_load_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrReasons); -#endif /* OPENSSL_IS_BORINGSSL */ + ERR_load_strings(gXmlSecOpenSSLErrorsLib, xmlSecOpenSSLStrLib); /* define xmlsec lib name */ + ERR_load_strings(gXmlSecOpenSSLErrorsLib, xmlSecOpenSSLStrDefReason); /* define default reason */ + ERR_load_strings(gXmlSecOpenSSLErrorsLib, xmlSecOpenSSLStrReasons); +#endif /* !defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_NO_ERR) */ /* and set default errors callback for xmlsec to us */ xmlSecErrorsSetCallback(xmlSecOpenSSLErrorsDefaultCallback); @@ -496,12 +513,12 @@ /* remove callback */ xmlSecErrorsSetCallback(NULL); -#ifndef OPENSSL_IS_BORINGSSL +#if !defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_NO_ERR) /* unload xmlsec strings from OpenSSL */ - ERR_unload_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrLib); - ERR_unload_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrDefReason); - ERR_unload_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrReasons); -#endif /* OPENSSL_IS_BORINGSSL */ + ERR_unload_strings(gXmlSecOpenSSLErrorsLib, xmlSecOpenSSLStrLib); + ERR_unload_strings(gXmlSecOpenSSLErrorsLib, xmlSecOpenSSLStrDefReason); + ERR_unload_strings(gXmlSecOpenSSLErrorsLib, xmlSecOpenSSLStrReasons); +#endif /* !defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_NO_ERR) */ } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/src/openssl/globals.h new/xmlsec1-1.2.34/src/openssl/globals.h --- old/xmlsec1-1.2.33/src/openssl/globals.h 2021-10-25 15:05:43.000000000 +0200 +++ new/xmlsec1-1.2.34/src/openssl/globals.h 2022-05-03 16:36:17.000000000 +0200 @@ -30,20 +30,6 @@ * *************************************************************/ /** - * XMLSEC_OPENSSL_ERRORS_LIB: - * - * Macro. The XMLSec library klass for OpenSSL errors reporting functions. - */ -#define XMLSEC_OPENSSL_ERRORS_LIB (ERR_LIB_USER + 57) - -/** - * XMLSEC_OPENSSL_ERRORS_FUNCTION: - * - * Macro. The XMLSec library functions OpenSSL errors reporting functions. - */ -#define XMLSEC_OPENSSL_ERRORS_FUNCTION 0 - -/** * xmlSecOpenSSLError: * @errorFunction: the failed function name. * @errorObject: the error specific error object (e.g. transform, key data, etc). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/src/openssl/openssl_compat.h new/xmlsec1-1.2.34/src/openssl/openssl_compat.h --- old/xmlsec1-1.2.33/src/openssl/openssl_compat.h 2021-10-25 15:05:43.000000000 +0200 +++ new/xmlsec1-1.2.34/src/openssl/openssl_compat.h 2022-05-03 16:36:17.000000000 +0200 @@ -75,7 +75,7 @@ * LibreSSL 2.7 compatibility (implements most of OpenSSL 1.1 API) * *****************************************************************************/ -#if defined(LIBRESSL_VERSION_NUMBER) && defined(XMLSEC_OPENSSL_API_110) +#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L && defined(XMLSEC_OPENSSL_API_110) /* EVP_CIPHER_CTX stuff */ #define EVP_CIPHER_CTX_encrypting(x) ((x)->encrypt) @@ -83,6 +83,6 @@ #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject #define X509_OBJECT_new() (calloc(1, sizeof(X509_OBJECT))) #define X509_OBJECT_free(x) { X509_OBJECT_free_contents(x); free(x); } -#endif /* defined(LIBRESSL_VERSION_NUMBER) && defined(XMLSEC_OPENSSL_API_110) */ +#endif /* defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L && defined(XMLSEC_OPENSSL_API_110) */ #endif /* __XMLSEC_OPENSSL_OPENSSL_COMPAT_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/xmlsec1-config new/xmlsec1-1.2.34/xmlsec1-config --- old/xmlsec1-1.2.33/xmlsec1-config 2021-10-25 15:07:13.000000000 +0200 +++ new/xmlsec1-1.2.34/xmlsec1-config 2022-05-03 16:37:45.000000000 +0200 @@ -95,7 +95,7 @@ ;; --version) - echo 1.2.33 + echo 1.2.34 exit 0 ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/xmlsec1-gcrypt.pc new/xmlsec1-1.2.34/xmlsec1-gcrypt.pc --- old/xmlsec1-1.2.33/xmlsec1-gcrypt.pc 2021-10-25 15:07:13.000000000 +0200 +++ new/xmlsec1-1.2.34/xmlsec1-gcrypt.pc 2022-05-03 16:37:45.000000000 +0200 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: xmlsec1-gcrypt -Version: 1.2.33 +Version: 1.2.34 Description: XML Security Library implements XML Signature and XML Encryption standards Requires: libxml-2.0 >= 2.8.0 libxslt >= 1.0.20 Cflags: -D__XMLSEC_FUNCTION__=__func__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_GOST2012=1 -DXMLSEC_DL_LIBLTDL=1 -I${prefix}/include/xmlsec1 -I/home/aleksey/local/include -DXMLSEC_CRYPTO_GCRYPT=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/xmlsec1-gnutls.pc new/xmlsec1-1.2.34/xmlsec1-gnutls.pc --- old/xmlsec1-1.2.33/xmlsec1-gnutls.pc 2021-10-25 15:07:12.000000000 +0200 +++ new/xmlsec1-1.2.34/xmlsec1-gnutls.pc 2022-05-03 16:37:45.000000000 +0200 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: xmlsec1-gnutls -Version: 1.2.33 +Version: 1.2.34 Description: XML Security Library implements XML Signature and XML Encryption standards Requires: libxml-2.0 >= 2.8.0 libxslt >= 1.0.20 Cflags: -D__XMLSEC_FUNCTION__=__func__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_GOST2012=1 -DXMLSEC_DL_LIBLTDL=1 -I${prefix}/include/xmlsec1 -I/usr/include/p11-kit-1 -DXMLSEC_CRYPTO_GNUTLS=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/xmlsec1-nss.pc new/xmlsec1-1.2.34/xmlsec1-nss.pc --- old/xmlsec1-1.2.33/xmlsec1-nss.pc 2021-10-25 15:07:13.000000000 +0200 +++ new/xmlsec1-1.2.34/xmlsec1-nss.pc 2022-05-03 16:37:45.000000000 +0200 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: xmlsec1-nss -Version: 1.2.33 +Version: 1.2.34 Description: XML Security Library implements XML Signature and XML Encryption standards Requires: libxml-2.0 >= 2.8.0 libxslt >= 1.0.20 xulrunner-nspr >= 1.4 xulrunner-nss >= 1.4 Cflags: -DXMLSEC_CRYPTO_NSS=1 -D__XMLSEC_FUNCTION__=__func__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_GOST2012=1 -DXMLSEC_DL_LIBLTDL=1 -I${prefix}/include/xmlsec1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/xmlsec1-openssl.pc new/xmlsec1-1.2.34/xmlsec1-openssl.pc --- old/xmlsec1-1.2.33/xmlsec1-openssl.pc 2021-10-25 15:07:12.000000000 +0200 +++ new/xmlsec1-1.2.34/xmlsec1-openssl.pc 2022-05-03 16:37:45.000000000 +0200 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: xmlsec1-openssl -Version: 1.2.33 +Version: 1.2.34 Description: XML Security Library implements XML Signature and XML Encryption standards Requires: libxml-2.0 >= 2.8.0 libxslt >= 1.0.20 Cflags: -D__XMLSEC_FUNCTION__=__func__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_GOST2012=1 -DXMLSEC_DL_LIBLTDL=1 -I${prefix}/include/xmlsec1 -DXMLSEC_CRYPTO_OPENSSL=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/xmlsec1.pc new/xmlsec1-1.2.34/xmlsec1.pc --- old/xmlsec1-1.2.33/xmlsec1.pc 2021-10-25 15:07:12.000000000 +0200 +++ new/xmlsec1-1.2.34/xmlsec1.pc 2022-05-03 16:37:44.000000000 +0200 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: xmlsec1 -Version: 1.2.33 +Version: 1.2.34 Description: XML Security Library implements XML Signature and XML Encryption standards Requires: libxml-2.0 >= 2.8.0 libxslt >= 1.0.20 Cflags: -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 -D__XMLSEC_FUNCTION__=__func__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_GOST2012=1 -DXMLSEC_DL_LIBLTDL=1 -I${prefix}/include/xmlsec1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/xmlsec1.spec new/xmlsec1-1.2.34/xmlsec1.spec --- old/xmlsec1-1.2.33/xmlsec1.spec 2021-10-25 15:07:13.000000000 +0200 +++ new/xmlsec1-1.2.34/xmlsec1.spec 2022-05-03 16:37:45.000000000 +0200 @@ -1,6 +1,6 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.33 +Version: 1.2.34 Release: 1 License: MIT Group: Development/Libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlsec1-1.2.33/xmlsec1Conf.sh new/xmlsec1-1.2.34/xmlsec1Conf.sh --- old/xmlsec1-1.2.33/xmlsec1Conf.sh 2021-10-25 15:07:13.000000000 +0200 +++ new/xmlsec1-1.2.34/xmlsec1Conf.sh 2022-05-03 16:37:45.000000000 +0200 @@ -9,5 +9,5 @@ XMLSEC_LIBDIR="${exec_prefix}/lib" XMLSEC_INCLUDEDIR=" -D__XMLSEC_FUNCTION__=__func__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_GOST2012=1 -DXMLSEC_DL_LIBLTDL=1 -I${prefix}/include/xmlsec1 -I/usr/include/libxml2 -I/usr/include/libxml2 -DXMLSEC_CRYPTO_OPENSSL=1" XMLSEC_LIBS="-L${exec_prefix}/lib -lxmlsec1-openssl -lxmlsec1 -lltdl -lxml2 -lxslt -lxml2 -lssl -lcrypto" -MODULE_VERSION="xmlsec-1.2.33-openssl" +MODULE_VERSION="xmlsec-1.2.34-openssl"
