Remove obsolete responder references (#418)

IB-7067

Signed-off-by: Raul Metsma <[email protected]>

.github/workflows/build.yml

@@ -3,12 +3,11 @@ on: [push, pull_request]
 env:
   RUN_TESTS: ALL
   BUILD_NUMBER: ${{ github.run_number }}
+  MAKEFLAGS: -j3
 jobs:
   macos:
     name: Build on macOS for ${{ matrix.target }}
     runs-on: macos-latest
-    env:
-      MAKEFLAGS: -j3
     strategy:
       matrix:
         target: [osx, ios, iossimulator, androidarm, androidarm64, androidx86, androidx86_64]
@@ -69,7 +68,6 @@ jobs:
       matrix:
         container: ['ubuntu:18.04', 'ubuntu:20.04', 'ubuntu:20.10', 'ubuntu:21.04']
     env:
-      MAKEFLAGS: -j3
       DEBIAN_FRONTEND: noninteractive
       DEBFULLNAME: 'github-actions'
       DEBEMAIL: '[email protected]'
@@ -117,8 +115,9 @@ jobs:
           toolset: '141'
           vcvars: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
     env:
+      MAKEFLAGS: ""
       VER_SUFFIX: ".VS${{ matrix.toolset }}"
-      VERSION: "3.14.6.${{ github.run_number }}"
+      VERSION: "3.14.7.${{ github.run_number }}"
       VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/patches/vcpkg-triplets"
       VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/patches/vcpkg-ports"
     steps:
@@ -182,7 +181,6 @@ jobs:
     if: contains(github.repository, 'open-eid/libdigidocpp') && contains(github.ref, 'coverity_scan')
     runs-on: ubuntu-20.04
     env:
-      MAKEFLAGS: -j3
       TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
       PROJECTNAME: 'open-eid/libdigidocpp'
     steps:
@@ -216,8 +214,6 @@ jobs:
   codeql:
     name: Run CodeQL tests
     runs-on: ubuntu-20.04
-    env:
-      MAKEFLAGS: -j3
     steps:
     - name: Checkout
       uses: actions/checkout@v2

README.md

@@ -15,7 +15,7 @@
 
 1. Install dependencies
 
-        sudo apt-get install cmake libxml-security-c-dev xsdcxx libssl-dev zlib1g-dev
+        sudo apt install cmake libxml-security-c-dev xsdcxx libssl-dev zlib1g-dev
 
 	* doxygen - Optional, for API documentation
 	* libboost-test-dev - Optional, for unittests
@@ -47,7 +47,7 @@
 
 1. Install dependencies from
 	* [XCode](https://itunes.apple.com/en/app/xcode/id497799835?mt=12)
-	* [http://www.cmake.org](http://www.cmake.org)
+	* [CMake](http://www.cmake.org)
 
 2. Fetch the source
 
@@ -71,15 +71,13 @@
 1. Install dependencies and necessary tools from
 	* [Visual Studio Community 2015/2017/2019](https://www.visualstudio.com/downloads/)
 	* [CMake](http://www.cmake.org)
-	* [7-zip](http://www.7-zip.org) - Optional, for prepare script
-	* [Perl](https://www.perl.org/get.html) - Optional, for OpenSSL prepare script
-	* [Swig](http://swig.org/download.html) - Optional, for C# bindings
+	* [Swig](http://swig.org/download.html) - Optional, for C# and Java bindings
 	* [Wix toolset](http://wixtoolset.org/releases/) - Optional, for creating Windows installation packages
 
    Toolset:
-        * 140 - Visual Studio 2015
-        * 141 - Visual Studio 2017
-        * 142 - Visual Studio 2019
+	* 140 - Visual Studio 2015
+	* 141 - Visual Studio 2017 (Default)
+	* 142 - Visual Studio 2019
 
 2. Fetch the source
 
@@ -88,7 +86,7 @@
 
 3. Prepare
 
-        powershell -ExecutionPolicy ByPass -File prepare_win_build_environment.ps1 -toolset 140
+        powershell -ExecutionPolicy ByPass -File prepare_win_build_environment.ps1 -toolset 141
 
 4. Configure
 
@@ -109,7 +107,7 @@
 
 6. Alternative to steps 4. and 5. -
 
-        powershell -ExecutionPolicy ByPass -File build.ps1 -toolset 140
+        powershell -ExecutionPolicy ByPass -File build.ps1 -toolset 141
 
     The build script builds executables and installation media for all
     platforms (x86 and x64 / Debug and Release with debug symbols)

etc/digidocpp.conf.cmake

@@ -3,7 +3,7 @@
     <!--Logging settings-->
     <!--<param name="log.level" lock="false">2</param>-->
     <!--<param name="log.file" lock="false">/tmp/digidocpp.log</param>-->
-    <!--<param name="log.file" lock="false">C:\Documents and Settings\All Users\Documents\digidocpp.log</param>-->
+    <!--<param name="log.file" lock="false">C:\Users\All Users\Documents\digidocpp.log</param>-->
 
     <!--Digest algorithm settings-->
     <!--<param name="signer.digestUri" lock="false">http://www.w3.org/2001/04/xmlenc#sha256</param>-->
@@ -38,7 +38,6 @@
     <!--<param name="verify.serivceUri" lock="false">@SIVA_URL@</param>-->
 
     <!--OCSP responder URL-->
-    <!--<ocsp issuer="ESTEID-SK 2011">http://ocsp.sk.ee</ocsp>-->
     <!--<ocsp issuer="ESTEID-SK 2015">http://ocsp.sk.ee</ocsp>-->
     <!--<ocsp issuer="KLASS3-SK 2010">http://ocsp.sk.ee</ocsp>-->
     <!--<ocsp issuer="KLASS3-SK 2016">http://ocsp.sk.ee</ocsp>-->

src/CMakeLists.txt

@@ -1,7 +1,6 @@
 if(NOT MINIZIP_FOUND)
     message(STATUS "MiniZip not found; using bundled copy.")
-    add_library(minizip STATIC minizip/zip.c minizip/unzip.c minizip/ioapi.c)
-    target_sources(minizip PRIVATE $<$<C_COMPILER_ID:MSVC>:minizip/iowin32.c>)
+    add_library(minizip STATIC minizip/zip.c minizip/unzip.c minizip/ioapi.c $<$<C_COMPILER_ID:MSVC>:minizip/iowin32.c>)
     target_compile_options(minizip PRIVATE $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-unused-parameter -Wno-unused-value>)
     set_target_properties(minizip PROPERTIES COMPILE_DEFINITIONS "NOUNCRYPT;NOCRYPT" POSITION_INDEPENDENT_CODE YES)
     target_link_libraries(minizip ZLIB::ZLIB)

src/Conf.cpp

@@ -108,7 +108,6 @@ string Conf::PKCS11Driver() const { return PKCS11_MODULE; }
 string Conf::ocsp(const string &issuer) const
 {
     static const map<string,string> ocsplist = {
-        {"ESTEID-SK 2011", "http://ocsp.sk.ee"},
         {"ESTEID-SK 2015", "http://ocsp.sk.ee"},
         {"KLASS3-SK 2010", "http://ocsp.sk.ee"},
         {"KLASS3-SK 2016", "http://ocsp.sk.ee"},