diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9a0b2b0..0b887174 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: container: ubuntu:${{ matrix.container }} strategy: matrix: - container: ['22.04', '24.04', '26.04'] + container: ['22.04', '24.04', '26.04', '26.10'] arch: ['amd64', 'arm64'] env: DEBIAN_FRONTEND: noninteractive @@ -64,7 +64,7 @@ jobs: echo "ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME" >> "$GITHUB_ENV" echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> "$GITHUB_ENV" - name: Cache vcpkg - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: ${{ github.workspace }}/vcpkg_cache key: vcpkg-${{ matrix.target }}-${{ hashFiles('vcpkg.json') }} @@ -83,7 +83,7 @@ jobs: libcdoc.${{ matrix.target }} macos: name: Build on macOS for ${{ matrix.target }} - runs-on: macos-latest + runs-on: xcode-27 strategy: matrix: target: [macos, iphoneos, iphonesimulator] @@ -97,7 +97,7 @@ jobs: brew update brew install --formula swig doxygen - name: Cache vcpkg - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: ${{ github.workspace }}/vcpkg_cache key: vcpkg-${{ matrix.target }}-${{ hashFiles('vcpkg.json') }} @@ -133,7 +133,7 @@ jobs: - name: Checkout uses: actions/checkout@v6 - name: Cache vcpkg - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: ${{ github.workspace }}/vcpkg_cache key: vcpkg-${{ matrix.image }}-${{ matrix.platform }}-${{ hashFiles('vcpkg.json') }} diff --git a/README.md b/README.md index 07e8108f..f9c354fa 100644 --- a/README.md +++ b/README.md @@ -89,9 +89,9 @@ For more information refer [doc/intro.md](doc/intro.md) document. 1. Install dependencies and necessary tools from * [Visual Studio Community 2022](https://www.visualstudio.com/downloads/) - * [CMake](http://www.cmake.org) + * [CMake](https://www.cmake.org) * [vcpkg](https://vcpkg.io/) - * [Swig](http://swig.org/download.html) - Optional, for C# and Java bindings + * [Swig](https://swig.org/download.html) - Optional, for C# and Java bindings * [Doxygen](https://www.doxygen.nl/download.html) - Optional, for generating documentation * [Java](https://www.oracle.com/java/technologies/downloads/) - Optional, for Java bindings diff --git a/cdoc/Certificate.cpp b/cdoc/Certificate.cpp index 1c047a41..6ff2d291 100644 --- a/cdoc/Certificate.cpp +++ b/cdoc/Certificate.cpp @@ -35,13 +35,13 @@ std::string Certificate::getName(int NID) const std::string cn; if(!cert) return cn; - X509_NAME *name = X509_get_subject_name(cert.get()); + const X509_NAME *name = X509_get_subject_name(cert.get()); if(!name) return cn; int pos = X509_NAME_get_index_by_NID(name, NID, -1); if(pos == -1) return cn; - X509_NAME_ENTRY *e = X509_NAME_get_entry(name, pos); + const X509_NAME_ENTRY *e = X509_NAME_get_entry(name, pos); if(!e) return cn; char *data = nullptr; diff --git a/vcpkg.json b/vcpkg.json index 4a9953d9..84135f89 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -18,7 +18,7 @@ "dependencies": [{ "name": "boost-test", "platform": "!ios & !android" }] } }, - "builtin-baseline": "99e82d9c9f0b281ec11fba48cc8434574a2b6e66", + "builtin-baseline": "e182cb4dd2df2ab02f66a1aabd5f35bbdc9522c7", "vcpkg-configuration": { "overlay-triplets": ["./vcpkg-triplets"], "registries": [ @@ -26,7 +26,7 @@ "kind": "git", "repository": "https://github.com/open-eid/vcpkg-ports", "reference": "vcpkg-registry", - "baseline": "6daff78a7188881762bb2c6aef721b3c1f35edb7", + "baseline": "10f07d1b2f04f98fce8de4398d0ae98b71e5e8b1", "packages": ["openssl"] } ]