Merge pull request #3 from lsh123/master

KFoxder · web-flow · commit bd279260ca3d · 2021-02-13T12:50:12.000-05:00
Keep up to date.
diff --git a/.github/workflows/make-check.yml b/.github/workflows/make-check.yml
@@ -0,0 +1,118 @@
+name: Make Check
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  check-ubuntu:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - static_linking: true
+          - static_linking: false
+    steps:
+    - name: install dependencies
+      run: |
+          sudo apt update
+          sudo apt install automake autoconf libtool libtool-bin libltdl-dev libltdl7
+          sudo apt install libxml2 libxml2-dev libxslt1.1 libxslt1-dev
+          sudo apt install libssl1.0.0 libssl-dev libnspr4 libnspr4-dev libnss3 libnss3-dev libnss3-tools libgcrypt20 libgcrypt20-dev libgnutls28-dev
+    - uses: actions/checkout@v2
+    - run: mkdir build
+    - name: configure
+      working-directory: build
+      run: ../autogen.sh --enable-werror --enable-static-linking=${{ matrix.static_linking }}
+    - name: make
+      working-directory: build
+      run: make
+    - name: make check
+      working-directory: build
+      run: make check
+  
+  check-osx:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - static_linking: true
+          - static_linking: false
+    steps:
+    - name: install dependencies
+      run: |
+          brew update
+          brew install automake autoconf libtool
+          # brew install libxml2 libxslt
+          brew install openssl nspr nss libgcrypt gnutls        
+    - uses: actions/checkout@v2
+    - run: mkdir build
+    - name: configure
+      working-directory: build
+      run: ../autogen.sh --enable-werror --enable-static-linking=${{ matrix.static_linking }}
+    - name: make
+      working-directory: build
+      run: make
+    - name: make check
+      working-directory: build
+      run: make check
+  
+  check-mingw:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - msystem: MINGW64
+            arch: x86_64
+            unicode: true
+            static_linking: true
+          - msystem: MINGW64
+            arch: x86_64
+            unicode: true
+            static_linking: false
+          - msystem: MINGW64
+            arch: x86_64
+            unicode: false
+            static_linking: true
+          - msystem: MINGW64
+            arch: x86_64
+            unicode: false
+            static_linking: false
+    defaults:
+      run:
+        shell: msys2 {0}  
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        release: false  
+        update: false
+        install: >-
+          git
+          base-devel
+          mingw-w64-${{ matrix.arch }}-toolchain
+          mingw-w64-${{ matrix.arch }}-libtool
+          mingw-w64-${{ matrix.arch }}-libxml2
+          mingw-w64-${{ matrix.arch }}-libxslt
+          mingw-w64-${{ matrix.arch }}-openssl
+          mingw-w64-${{ matrix.arch }}-nspr
+          mingw-w64-${{ matrix.arch }}-nss
+          mingw-w64-${{ matrix.arch }}-gnutls
+    - run: git config --global core.autocrlf input
+      shell: bash
+    - uses: actions/checkout@v2      
+    - run: mkdir build
+    - name: configure
+      working-directory: build
+      run: pwd && ../autogen.sh --build="${{ matrix.arch }}-w64-mingw32" --host="${{ matrix.arch }}-w64-mingw32" --enable-unicode=${{ matrix.unicode }} --enable-static-linking=${{ matrix.static_linking }} --enable-mscrypto --enable-mscng 
+    - name: make
+      working-directory: build
+      run: make
+    - name: make check
+      working-directory: build
+      run: make check
diff --git a/.travis.yml b/.travis.yml
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,7 +12,7 @@
 # You can check the whole build process in the logs, and any later commit will start
 # a new build using a fresh virtual machine.
 
-version: '1.2.30-{build}'
+version: '1.2.31-{build}'
 
 shallow_clone: true
 skip_branch_with_pr: true
@@ -64,43 +64,25 @@ environment:
       UNICODE: no
       WERROR: yes
 
-    - COMPILER: MinGW-w64
-      STATIC: no
-      UNICODE: yes
-    
-    - COMPILER: MinGW-w64
-      STATIC: yes
-      UNICODE: no
-
 init:
   - git config --global core.autocrlf input
-  - if [%COMPILER%]==[MinGW-w64] set PATH=C:\msys64\usr\bin;C:\msys64\mingw64\bin;%PATH%
-  - if [%COMPILER%]==[MSVC17] set PATH=%EXTRAS_FOLDER%\bin;%EXTRAS_FOLDER%\lib;;%PATH%
+  - set PATH=%EXTRAS_FOLDER%\bin;%EXTRAS_FOLDER%\lib;;%PATH%
     
 install:
-  - if [%COMPILER%]==[MinGW-w64] pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade
-  - if [%COMPILER%]==[MinGW-w64] pacman -S --noconfirm --needed mingw-w64-x86_64-{toolchain,libtool}
-  - if [%COMPILER%]==[MinGW-w64] pacman -S --noconfirm --needed mingw-w64-x86_64-{libxml2,libxslt,openssl,gnutls}
-  - if [%COMPILER%]==[MSVC17] call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-  - if [%COMPILER%]==[MSVC17] mkdir %EXTRAS_FOLDER% && cd %EXTRAS_FOLDER%
-  - if [%COMPILER%]==[MSVC17] appveyor DownloadFile %EXTRAS_URL%/%LIBXML2_FILE%
-  - if [%COMPILER%]==[MSVC17] 7z x %LIBXML2_FILE%
-  - if [%COMPILER%]==[MSVC17] appveyor DownloadFile %EXTRAS_URL%/%LIBXSLT_FILE%
-  - if [%COMPILER%]==[MSVC17] 7z x %LIBXSLT_FILE%
-  - if [%COMPILER%]==[MSVC17] appveyor DownloadFile %EXTRAS_URL%/%OPENSSL_FILE%
-  - if [%COMPILER%]==[MSVC17] 7z x %OPENSSL_FILE%
-  - if [%COMPILER%]==[MSVC17] cd %APPVEYOR_BUILD_FOLDER%
+  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+  - mkdir %EXTRAS_FOLDER% && cd %EXTRAS_FOLDER%
+  - appveyor DownloadFile %EXTRAS_URL%/%LIBXML2_FILE%
+  - 7z x %LIBXML2_FILE%
+  - appveyor DownloadFile %EXTRAS_URL%/%LIBXSLT_FILE%
+  - 7z x %LIBXSLT_FILE%
+  - appveyor DownloadFile %EXTRAS_URL%/%OPENSSL_FILE%
+  - 7z x %OPENSSL_FILE%
+  - cd %APPVEYOR_BUILD_FOLDER%
 
 build_script:
-  - if [%COMPILER%]==[MinGW-w64] mkdir build && cd build
-  - if [%COMPILER%]==[MinGW-w64] bash ../autogen.sh --build="x86_64-w64-mingw32" --host="x86_64-w64-mingw32" --enable-unicode=$UNICODE --enable-mscrypto --enable-mscng --enable-openssl --enable-gnutls --enable-static-linking=$STATIC
-  - if [%COMPILER%]==[MinGW-w64] make
-  - if [%COMPILER%]==[MSVC17] cd win32
-  - if [%COMPILER%]==[MSVC17] cscript configure.js static=%STATIC% crypto=%CRYPTO% werror=%WERROR% iconv=no unicode=%UNICODE% prefix=%EXTRAS_FOLDER% include=%EXTRAS_FOLDER%\include;%EXTRAS_FOLDER%\include\libxml2;%MSSDK_INCLUDE% lib=%EXTRAS_FOLDER%\bin;%EXTRAS_FOLDER%\lib;%MSSDK_LIB%
-  - if [%COMPILER%]==[MSVC17] nmake
+  - cd win32
+  - cscript configure.js static=%STATIC% crypto=%CRYPTO% werror=%WERROR% iconv=no unicode=%UNICODE% prefix=%EXTRAS_FOLDER% include=%EXTRAS_FOLDER%\include;%EXTRAS_FOLDER%\include\libxml2;%MSSDK_INCLUDE% lib=%EXTRAS_FOLDER%\bin;%EXTRAS_FOLDER%\lib;%MSSDK_LIB%
+  - nmake
  
 test_script:
-  - if [%COMPILER%]==[MinGW-w64] make check
-  - if [%COMPILER%]==[MSVC17] nmake check
-
-
+  - nmake check
diff --git a/configure.ac b/configure.ac
@@ -1,10 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([xmlsec1],[1.2.30],[http://www.aleksey.com/xmlsec])
+AC_INIT([xmlsec1],[1.2.31],[http://www.aleksey.com/xmlsec])
 
 XMLSEC_PACKAGE=xmlsec1
 XMLSEC_VERSION_MAJOR=1
 XMLSEC_VERSION_MINOR=2
-XMLSEC_VERSION_SUBMINOR=30
+XMLSEC_VERSION_SUBMINOR=31
 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'`
@@ -2304,13 +2304,25 @@ dnl ==========================================================================
 AC_MSG_CHECKING(for pedantic)
 AC_ARG_ENABLE([pedantic], [AC_HELP_STRING([--enable-pedantic], [enable pedantic compilation flags (no)])])
 if test "z$enable_pedantic" = "zyes" ; then
-    dnl CFLAGS="$CFLAGS -pedantic -Wall -std=c99 -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wredundant-decls"
     CFLAGS="$CFLAGS -O -pedantic -Wall -std=c99 -fno-inline -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wredundant-decls"
     AC_MSG_RESULT([yes])
 else
     AC_MSG_RESULT([disabled])
 fi
 
+dnl ==========================================================================
+dnl Secure memset
+dnl ==========================================================================
+AC_MSG_CHECKING(for secure memset)
+AC_ARG_ENABLE([secure-memset], [AC_HELP_STRING([--enable-secure-memset], [enable secure memset compilation flags (yes)])])
+if test "z$enable_secure_memset" != "zno" ; then
+    CFLAGS="$CFLAGS -fno-builtin-memset"
+    AC_MSG_RESULT([yes])
+else
+    AC_MSG_RESULT([disabled])
+fi
+
+
 dnl ==========================================================================
 dnl Final steps: xmlsec config
 dnl ==========================================================================
@@ -2428,7 +2440,6 @@ apps/Makefile
 docs/Makefile
 docs/api/Makefile
 man/Makefile
-
 xmlsec1-openssl.pc:xmlsec-openssl.pc.in
 xmlsec1-gnutls.pc:xmlsec-gnutls.pc.in
 xmlsec1-gcrypt.pc:xmlsec-gcrypt.pc.in
diff --git a/docs/api/xmlsec-version.html b/docs/api/xmlsec-version.html
@@ -78,7 +78,7 @@ <h2><span class="refentrytitle"><a name="xmlsec-version.top_of_page"></a>version
 <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.30"
+<pre class="programlisting">#define XMLSEC_VERSION			"1.2.31"
 </pre>
 <p>The library version string in the format
 "$major_number.$minor_number.$sub_minor_number".</p>
@@ -100,14 +100,14 @@ <h2><span class="refentrytitle"><a name="xmlsec-version.top_of_page"></a>version
 <hr>
 <div class="refsect2">
 <a name="XMLSEC-VERSION-SUBMINOR:CAPS"></a><h3>XMLSEC_VERSION_SUBMINOR</h3>
-<pre class="programlisting">#define XMLSEC_VERSION_SUBMINOR		30
+<pre class="programlisting">#define XMLSEC_VERSION_SUBMINOR		31
 </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:30:2"
+<pre class="programlisting">#define XMLSEC_VERSION_INFO		"3:31:2"
 </pre>
 <p>The library version info string in the format
 "$major_number+$minor_number:$sub_minor_number:$minor_number".</p>
diff --git a/docs/download.html b/docs/download.html
@@ -420,10 +420,10 @@
       <h1>Download</h1>
       </div>
 <h2>Stable releases.</h2>
-<p>The latest stable XML Security Library version is <b>1.2.30</b>:</p>
+<p>The latest stable XML Security Library version is <b>1.2.31</b>:</p>
 <ul>
 <li>
-<a href="http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.30.tar.gz">Sources for latest version</a>.</li>
+<a href="http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.31.tar.gz">Sources for latest version</a>.</li>
 <li>
 <a href="http://www.zlatkovic.com/projects/libxml/index.html">Windows binaries</a> for XMLSec Library 
 (as well as LibXML2, LibXSLT and OpenSSL) from <a href="mailto:igor@zlatkovic.com">Igor Zlatkovic</a>.</li>
diff --git a/docs/index.html b/docs/index.html
@@ -439,7 +439,14 @@ <h1>XML Security Library</h1>
 see the Copyright file in the distribution  for details.<br><br></p>
 <p><b>News</b></p>
 <ul>
-<li>April 21 2020<br>
+<li>October 29 2020<br>
+        The <a href="download.html">XML Security Library 1.2.31</a> release includes the following changes:
+        <ul>
+        <li>Added configure option to ensure memset() securely erases memory (gcc).</li>
+        <li>Several other small fixes (<a href="https://github.com/lsh123/xmlsec/commits/master">more details</a>).</li>
+        </ul>
+</li>
+<br><li>April 21 2020<br>
         The <a href="download.html">XML Security Library 1.2.30</a> release includes the following changes:
         <ul>
         <li>Enabled XML_PARSE_HUGE for all xml parsers.</li>
@@ -466,26 +473,6 @@ <h1>XML Security Library</h1>
         <li>Several other small fixes (<a href="https://github.com/lsh123/xmlsec/commits/master">more details</a>).</li>
         </ul>
 </li>
-<br><li>October 23 2018<br>
-        The <a href="download.html">XML Security Library 1.2.27</a> release includes the following changes:
-        <ul>
-        <li>Added AES-GCM support for OpenSSL and MSCNG (snargit).</li>
-        <li>Added DSA-SHA256 and ECDSA-SHA384 support for NSS (vmiklos).</li>
-        <li>Added RSA-OAEP support for MSCNG (vmiklos).</li>
-        <li>Continuous build integration in Travis and Appveyor.</li>
-        <li>Several other small fixes (<a href="https://github.com/lsh123/xmlsec/commits/master">more details</a>).</li>
-        </ul>
-</li>
-<br><li>June 5 2018<br>
-        The <a href="download.html">XML Security Library 1.2.26</a> release includes the following changes:
-        <ul>
-	    <li>Added xmlsec-mscng module based on <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/aa376210(v=vs.85).aspx">Microsoft Cryptography API: Next Generation</a> (vmiklos).</li>
-	    <li>Added support for GOST 2012 and fixed CryptoPro CSP provider for GOST R 34.10-2001 in xmlsec-mscrypto (ipechorin).</li>
-	    <li>Added LibreSSL 2.7 support (vishwin).</li>
-        <li>Upgraded documentation build process to support the latest gtk-doc.</li>
-        <li>Several other small fixes (<a href="https://github.com/lsh123/xmlsec/commits/master">more details</a>).</li>
-        </ul>
-</li>
 </ul>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/news.html b/docs/news.html
@@ -420,7 +420,14 @@
 <h1>XML Security Library News</h1>
 </div>
 <ul>
-<li>April 21 2020<br>
+<li>October 29 2020<br>
+        The <a href="download.html">XML Security Library 1.2.31</a> release includes the following changes:
+        <ul>
+        <li>Added configure option to ensure memset() securely erases memory (gcc).</li>
+        <li>Several other small fixes (<a href="https://github.com/lsh123/xmlsec/commits/master">more details</a>).</li>
+        </ul>
+</li>
+<br><li>April 21 2020<br>
         The <a href="download.html">XML Security Library 1.2.30</a> release includes the following changes:
         <ul>
         <li>Enabled XML_PARSE_HUGE for all xml parsers.</li>
diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
@@ -19,6 +19,12 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/dl.h>
 
+
+/* MD5 was removed from NSS */
+#if (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58))
+#define XMLSEC_NO_MD5 1
+#endif /* (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58)) */
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
diff --git a/man/xmlsec1-config.1 b/man/xmlsec1-config.1
diff --git a/man/xmlsec1.1 b/man/xmlsec1.1
diff --git a/src/dl.c b/src/dl.c
