From 952b405613a0864faf88d19699f1ab11fd37df32 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Wed, 25 Mar 2026 09:56:38 +0200 Subject: [PATCH] Generate SBOM info WE2-1144 Signed-off-by: Raul Metsma --- .github/workflows/cmake-linux-fedora.yml | 8 +- .github/workflows/cmake-linux-ubuntu.yml | 7 +- .github/workflows/cmake-macos.yml | 7 + .github/workflows/cmake-windows.yml | 7 + .gitmodules | 4 + CMakeLists.txt | 4 + build.sh | 2 + cmake/cmake-sbom | 1 + cmake/sbom.cmake | 151 ++++++++++++++++++ install/distribution.xml | 2 + install/plugins.wxs | 2 + install/uninstall.sh | 2 + install/web-eid.desktop | 3 + install/web-eid.wxs | 4 +- scripts/clang-format.sh | 2 + scripts/clean.sh | 2 + scripts/fail-if-git-status-dirty.sh | 2 + src/app/CMakeLists.txt | 5 +- src/app/getcommandhandler.cpp | 23 +-- src/app/main.cpp | 23 +-- src/app/web-eid.rc | 3 + src/controller/CMakeLists.txt | 4 +- src/controller/application.cpp | 23 +-- src/controller/application.hpp | 23 +-- src/controller/application.mm | 23 +-- src/controller/certandpininfo.hpp | 23 +-- .../command-handlers/authenticate.cpp | 23 +-- .../command-handlers/authenticate.hpp | 23 +-- .../command-handlers/certificatereader.cpp | 23 +-- .../command-handlers/certificatereader.hpp | 23 +-- .../command-handlers/getcertificate.cpp | 23 +-- .../command-handlers/getcertificate.hpp | 23 +-- src/controller/command-handlers/sign.cpp | 23 +-- src/controller/command-handlers/sign.hpp | 23 +-- .../command-handlers/signauthutils.cpp | 23 +-- .../command-handlers/signauthutils.hpp | 23 +-- src/controller/commandhandler.hpp | 23 +-- src/controller/commands.cpp | 23 +-- src/controller/commands.hpp | 23 +-- src/controller/controller.cpp | 23 +-- src/controller/controller.hpp | 23 +-- src/controller/inputoutputmode.cpp | 23 +-- src/controller/inputoutputmode.hpp | 23 +-- src/controller/logging.cpp | 23 +-- src/controller/logging.hpp | 23 +-- src/controller/qeid.hpp | 23 +-- src/controller/retriableerror.hpp | 23 +-- .../threads/cardeventmonitorthread.hpp | 23 +-- .../threads/commandhandlerconfirmthread.hpp | 23 +-- .../threads/commandhandlerrunthread.hpp | 23 +-- .../threads/controllerchildthread.hpp | 23 +-- src/controller/threads/waitforcardthread.hpp | 23 +-- src/controller/ui.hpp | 23 +-- src/controller/utils/erasedata.hpp | 23 +-- src/controller/utils/observer_ptr.hpp | 23 +-- src/controller/utils/qdisablecopymove.hpp | 10 -- src/controller/utils/utils.hpp | 23 +-- src/controller/writeresponse.cpp | 23 +-- src/controller/writeresponse.hpp | 23 +-- src/mac/CMakeLists.txt | 3 + src/mac/Info-app.plist.cmake | 2 + src/mac/Info-extension.plist.cmake | 2 + src/mac/main.mm | 23 +-- src/mac/safari-extension.mm | 23 +-- src/mac/shared.hpp | 23 +-- src/ui/CMakeLists.txt | 3 + src/ui/certificatewidget.cpp | 23 +-- src/ui/certificatewidget.hpp | 24 +-- src/ui/dialog.ui | 2 + src/ui/languageselect.cpp | 23 +-- src/ui/languageselect.hpp | 23 +-- src/ui/languageselect.ui | 2 + src/ui/ui.cpp | 23 +-- src/ui/webeiddialog.cpp | 23 +-- src/ui/webeiddialog.hpp | 24 +-- test.sh | 2 + tests/input-output-mode/test.py | 3 + tests/mock-ui/CMakeLists.txt | 3 + tests/tests/CMakeLists.txt | 3 + 79 files changed, 336 insertions(+), 1027 deletions(-) create mode 160000 cmake/cmake-sbom create mode 100644 cmake/sbom.cmake delete mode 100644 src/controller/utils/qdisablecopymove.hpp diff --git a/.github/workflows/cmake-linux-fedora.yml b/.github/workflows/cmake-linux-fedora.yml index 8a19c19b..eaa2de8c 100644 --- a/.github/workflows/cmake-linux-fedora.yml +++ b/.github/workflows/cmake-linux-fedora.yml @@ -29,9 +29,13 @@ jobs: run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -B build -S . - name: Build - run: cmake --build build --config $BUILD_TYPE --target package + run: | + cmake --build build --config $BUILD_TYPE --target package + cmake --install build/sbom - uses: actions/upload-artifact@v7 with: name: web-eid-app-fedora-build-fedora${{matrix.container}}-${{github.run_number}} - path: build/*rpm + path: | + build/*rpm + build/*.spdx \ No newline at end of file diff --git a/.github/workflows/cmake-linux-ubuntu.yml b/.github/workflows/cmake-linux-ubuntu.yml index 679614ed..c9999306 100644 --- a/.github/workflows/cmake-linux-ubuntu.yml +++ b/.github/workflows/cmake-linux-ubuntu.yml @@ -17,7 +17,7 @@ jobs: container: ubuntu:${{matrix.container}} strategy: matrix: - container: ['22.04', '24.04', '25.04', '25.10'] + container: ['22.04', '24.04', '25.10', '26.04'] arch: ['amd64', 'arm64'] steps: @@ -35,6 +35,7 @@ jobs: - name: Build run: | cmake --build build --config $BUILD_TYPE --target installer + cmake --install build/sbom # Debian creates artifacts outside of project dir, copy them back to make them available in the build artifacts mv ../web-eid*.* build/ @@ -44,4 +45,6 @@ jobs: - uses: actions/upload-artifact@v7 with: name: web-eid-app-ubuntu-build-ubuntu${{matrix.container}}-${{ matrix.arch }}-${{github.run_number}} - path: build/*.*deb + path: | + build/*.*deb + build/*.spdx diff --git a/.github/workflows/cmake-macos.yml b/.github/workflows/cmake-macos.yml index e23cd17e..648829cc 100644 --- a/.github/workflows/cmake-macos.yml +++ b/.github/workflows/cmake-macos.yml @@ -77,6 +77,7 @@ jobs: cmake --build ${BUILD_DIR} --config ${BUILD_TYPE} cmake --build ${BUILD_DIR} --config ${BUILD_TYPE} --target installer cmake --build ${BUILD_DIR} --config ${BUILD_TYPE} --target installer-safari + cmake --install build/sbom #- name: Test # run: ctest -V -C ${BUILD_TYPE} --test-dir ${BUILD_DIR} @@ -88,3 +89,9 @@ jobs: path: | build/src/app/*.pkg build/src/app/*.dmg + + - name: Upload SBOM artifacts + uses: actions/upload-artifact@v7 + with: + name: web-eid-app-macos-sbom-${{github.run_number}} + path: build/*.spdx \ No newline at end of file diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index 4e3485bb..632c6b1f 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -67,6 +67,7 @@ jobs: cmake --build build --config ${env:BUILD_TYPE} cmake --build build --config ${env:BUILD_TYPE} --target installer cmake --build build --config ${env:BUILD_TYPE} --target bundle + cmake --install build/sbom - name: Test if: ${{ matrix.arch == 'x64' }} @@ -80,6 +81,12 @@ jobs: build/src/app/*.msi build/src/app/*.exe + - name: Upload SBOM artifacts + uses: actions/upload-artifact@v7 + with: + name: web-eid-app-windows-sbom-${{matrix.arch}}-${{github.run_number}} + path: build/*.spdx + - name: Upload debug artifacts uses: actions/upload-artifact@v7 with: diff --git a/.gitmodules b/.gitmodules index 6cc15ae0..124000fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,7 @@ [submodule "src/mac/js"] path = src/mac/js url = ../web-eid-webextension +[submodule "cmake/cmake-sbom"] + path = cmake/cmake-sbom + url = https://github.com/DEMCON/cmake-sbom.git + branch = v1.4.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 303ae180..b4e43ed8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT + cmake_minimum_required(VERSION 3.22) if(NOT EXISTS "${CMAKE_SOURCE_DIR}/lib/libelectronic-id/README.md") @@ -50,3 +53,4 @@ endif() enable_testing() add_subdirectory(tests/mock-ui) add_subdirectory(tests/tests) +include(cmake/sbom.cmake) diff --git a/build.sh b/build.sh index 94389f6c..18698462 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,6 @@ #!/bin/bash +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT set -e set -u diff --git a/cmake/cmake-sbom b/cmake/cmake-sbom new file mode 160000 index 00000000..9cf1ba43 --- /dev/null +++ b/cmake/cmake-sbom @@ -0,0 +1 @@ +Subproject commit 9cf1ba4339d793d29246bf0abe2576b322c05981 diff --git a/cmake/sbom.cmake b/cmake/sbom.cmake new file mode 100644 index 00000000..3ce3a80b --- /dev/null +++ b/cmake/sbom.cmake @@ -0,0 +1,151 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT + +# SBOM generation using DEMCON/cmake-sbom (SPDX 2.3, install-time) +# Run: cmake --install /sbom + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/cmake-sbom/cmake") +include(sbom) + +execute_process( + COMMAND git describe --tags --abbrev=0 + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/lib/libelectronic-id" + OUTPUT_VARIABLE ELECTRONIC_ID_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET +) +string(REGEX REPLACE "^v" "" ELECTRONIC_ID_VERSION "${ELECTRONIC_ID_VERSION}") + +sbom_generate( + OUTPUT "${CMAKE_BINARY_DIR}/web-eid-${PROJECT_VERSION}.spdx" + LICENSE "MIT" + SUPPLIER "Estonian Information System Authority" + SUPPLIER_URL https://www.ria.ee + DOWNLOAD_URL https://github.com/web-eid/web-eid-app + VERSION "${PROJECT_VERSION}" +) + +set(_sbom_reset "${CMAKE_BINARY_DIR}/sbom/sbom-reset.cmake") +file(WRITE "${_sbom_reset}" + "file(WRITE \"${CMAKE_BINARY_DIR}/sbom/sbom.spdx.in\" \"\")\n" + "file(READ \"${CMAKE_BINARY_DIR}/SPDXRef-DOCUMENT.spdx.in\" _doc)\n" + "file(APPEND \"${CMAKE_BINARY_DIR}/sbom/sbom.spdx.in\" \"\${_doc}\")\n" + "set(SBOM_VERIFICATION_CODES \"\")\n" +) +file(APPEND "${CMAKE_BINARY_DIR}/sbom/CMakeLists.txt" + "install(SCRIPT \"${_sbom_reset}\")\n" +) + +set(_app_spdxid "SPDXRef-Package-${PROJECT_NAME} DEPENDS_ON @SBOM_LAST_SPDXID@") +if(APPLE) + sbom_add(PACKAGE web-eid-safari + VERSION "${PROJECT_VERSION}" + SUPPLIER "Organization: Estonian Information System Authority" + DOWNLOAD_LOCATION https://github.com/web-eid/web-eid-app + LICENSE "MIT" + EXTREF "cpe:2.3:a:web-eid:web-eid:${PROJECT_VERSION}:*:*:*:*:*:*:*" + RELATIONSHIP "@SBOM_LAST_SPDXID@ VARIANT_OF SPDXRef-Package-${PROJECT_NAME}" + ) + set(_app_spdxid "${_app_spdxid}\nRelationship: ${SBOM_LAST_SPDXID} DEPENDS_ON @SBOM_LAST_SPDXID@") + file(READ "${CMAKE_SOURCE_DIR}/src/mac/js/package.json" _webext_json) + string(JSON WEBEXT_VERSION GET "${_webext_json}" "version") + sbom_add(PACKAGE web-eid-webextension + VERSION "${WEBEXT_VERSION}" + SUPPLIER "Organization: Estonian Information System Authority" + DOWNLOAD_LOCATION https://github.com/web-eid/web-eid-webextension + LICENSE "MIT" + RELATIONSHIP "${SBOM_LAST_SPDXID} DEPENDS_ON @SBOM_LAST_SPDXID@" + ) + if(NPM_EXECUTABLE) + execute_process( + COMMAND "${NPM_EXECUTABLE}" --version + OUTPUT_VARIABLE NPM_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + string(REGEX REPLACE "^v" "" NPM_VERSION "${NPM_VERSION}") + endif() + if(NPM_VERSION) + sbom_add(PACKAGE npm + VERSION "${NPM_VERSION}" + SUPPLIER "Organization: OpenJS Foundation" + DOWNLOAD_LOCATION https://www.npmjs.com + LICENSE "Artistic-2.0" + EXTREF "cpe:2.3:a:npmjs:npm:${NPM_VERSION}:*:*:*:*:*:*:*" + RELATIONSHIP "@SBOM_LAST_SPDXID@ BUILD_TOOL_OF ${SBOM_LAST_SPDXID}" + ) + endif() +endif() + +if(WIN32) + find_program(WIX_EXECUTABLE NAMES wix) + if(WIX_EXECUTABLE) + execute_process( + COMMAND "${WIX_EXECUTABLE}" --version + OUTPUT_VARIABLE WIX_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + string(REGEX REPLACE "\\+.*$" "" WIX_VERSION "${WIX_VERSION}") + endif() + if(WIX_VERSION) + sbom_add(PACKAGE WiX + VERSION "${WIX_VERSION}" + SUPPLIER "Organization: WiX Toolset Contributors" + DOWNLOAD_LOCATION https://wixtoolset.org + LICENSE "MS-RL" + EXTREF "cpe:2.3:a:wixtoolset:wix_toolset:${WIX_VERSION}:*:*:*:*:*:*:*" + ) + endif() +endif() + +sbom_add(PACKAGE libelectronic-id + VERSION "${ELECTRONIC_ID_VERSION}" + SUPPLIER "Organization: Estonian Information System Authority" + DOWNLOAD_LOCATION https://github.com/web-eid/libelectronic-id + LICENSE "MIT" + EXTREF "cpe:2.3:a:web-eid:libelectronic-id:${ELECTRONIC_ID_VERSION}:*:*:*:*:*:*:*" + RELATIONSHIP "${_app_spdxid}" +) + +find_package(GTest QUIET) +if(GTest_FOUND) + sbom_add(PACKAGE GTest + VERSION "${GTest_VERSION}" + SUPPLIER "Organization: Google LLC" + DOWNLOAD_LOCATION https://github.com/google/googletest + LICENSE "BSD-3-Clause" + EXTREF "cpe:2.3:a:google:googletest:${GTest_VERSION}:*:*:*:*:*:*:*" + RELATIONSHIP "${SBOM_LAST_SPDXID} TEST_TOOL_OF @SBOM_LAST_SPDXID@" + ) +endif() + +if(PCSC_FOUND) + sbom_add(PACKAGE libpcsclite + VERSION "${PCSC_VERSION}" + SUPPLIER "Organization: Muscle project" + DOWNLOAD_LOCATION https://pcsclite.apdu.fr + LICENSE "BSD-3-Clause" + EXTREF "cpe:2.3:a:pcsc-lite_project:pcsc-lite:${PCSC_VERSION}:*:*:*:*:*:*:*" + ) +endif() + +sbom_add(PACKAGE Qt6 + VERSION "${Qt6_VERSION}" + SUPPLIER "Organization: The Qt Company" + DOWNLOAD_LOCATION https://download.qt.io/ + LICENSE "LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only OR LicenseRef-Qt-commercial" + EXTREF "cpe:2.3:a:qt:qt:${Qt6_VERSION}:*:*:*:*:*:*:*" + RELATIONSHIP "${_app_spdxid}" +) + +sbom_add(PACKAGE OpenSSL + VERSION "${OPENSSL_VERSION}" + SUPPLIER "Organization: OpenSSL Software Foundation" + DOWNLOAD_LOCATION https://openssl.org + LICENSE "Apache-2.0" + EXTREF "cpe:2.3:a:openssl:openssl:${OPENSSL_VERSION}:*:*:*:*:*:*:*" + RELATIONSHIP "${_app_spdxid}" +) + +sbom_finalize(NO_VERIFY) diff --git a/install/distribution.xml b/install/distribution.xml index f23c4d28..950963cf 100644 --- a/install/distribution.xml +++ b/install/distribution.xml @@ -1,4 +1,6 @@ + + + diff --git a/install/uninstall.sh b/install/uninstall.sh index 911ca82e..900a1ac6 100755 --- a/install/uninstall.sh +++ b/install/uninstall.sh @@ -1,4 +1,6 @@ #!/bin/bash +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT sudo rm -rf \ /Applications/Utilities/web-eid.app \ diff --git a/install/web-eid.desktop b/install/web-eid.desktop index b534d311..d1ebc89e 100644 --- a/install/web-eid.desktop +++ b/install/web-eid.desktop @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT + [Desktop Entry] Type=Application diff --git a/install/web-eid.wxs b/install/web-eid.wxs index 8e45aa14..a3348429 100644 --- a/install/web-eid.wxs +++ b/install/web-eid.wxs @@ -1,4 +1,6 @@ - + + + diff --git a/scripts/clang-format.sh b/scripts/clang-format.sh index 32a0c97c..eb812953 100755 --- a/scripts/clang-format.sh +++ b/scripts/clang-format.sh @@ -1,4 +1,6 @@ #!/bin/bash +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT set -e set -u diff --git a/scripts/clean.sh b/scripts/clean.sh index f7d7981e..bd97bb5d 100755 --- a/scripts/clean.sh +++ b/scripts/clean.sh @@ -1,4 +1,6 @@ #!/bin/bash +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT set -e set -u diff --git a/scripts/fail-if-git-status-dirty.sh b/scripts/fail-if-git-status-dirty.sh index 900f71ed..d72bbcde 100755 --- a/scripts/fail-if-git-status-dirty.sh +++ b/scripts/fail-if-git-status-dirty.sh @@ -1,4 +1,6 @@ #!/bin/bash +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT set -e set -u diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 4c59ed11..05acb075 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT + add_executable(web-eid WIN32 MACOSX_BUNDLE ${CMAKE_SOURCE_DIR}/install/appicon.icns getcommandhandler.cpp @@ -22,7 +25,7 @@ if(WIN32) endif() set(WEBEID_PATH web-eid.exe) set(BASE_FILE $_${PROJECT_VERSION}.$ENV{PLATFORM}) - set(WIX_CMD wix.exe build -nologo + set(WIX_CMD wix build -nologo -arch $ENV{PLATFORM} -ext WixToolset.UI.wixext -bv WixUIDialogBmp=${CMAKE_SOURCE_DIR}/install/dlgbmp.bmp diff --git a/src/app/getcommandhandler.cpp b/src/app/getcommandhandler.cpp index d282a602..9d6e3767 100644 --- a/src/app/getcommandhandler.cpp +++ b/src/app/getcommandhandler.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "commandhandler.hpp" diff --git a/src/app/main.cpp b/src/app/main.cpp index 197fed52..c15783a8 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "application.hpp" #include "controller.hpp" diff --git a/src/app/web-eid.rc b/src/app/web-eid.rc index 69d527d4..31583f47 100644 --- a/src/app/web-eid.rc +++ b/src/app/web-eid.rc @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT + #include #define VER_STR_HELPER(x) #x diff --git a/src/controller/CMakeLists.txt b/src/controller/CMakeLists.txt index 6a30eae8..851162c5 100644 --- a/src/controller/CMakeLists.txt +++ b/src/controller/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT + add_library(controller STATIC application.cpp application.hpp @@ -32,7 +35,6 @@ add_library(controller STATIC ui.hpp utils/erasedata.hpp utils/observer_ptr.hpp - utils/qdisablecopymove.hpp utils/utils.hpp writeresponse.cpp writeresponse.hpp diff --git a/src/controller/application.cpp b/src/controller/application.cpp index 52f8d8ce..a53a1052 100644 --- a/src/controller/application.cpp +++ b/src/controller/application.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2021-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "application.hpp" #include "certandpininfo.hpp" diff --git a/src/controller/application.hpp b/src/controller/application.hpp index f2b92f17..4f205790 100644 --- a/src/controller/application.hpp +++ b/src/controller/application.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2021-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/application.mm b/src/controller/application.mm index 6cf6c376..e9e4ee1c 100644 --- a/src/controller/application.mm +++ b/src/controller/application.mm @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2022-2024 The Web eID Project - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "application.hpp" diff --git a/src/controller/certandpininfo.hpp b/src/controller/certandpininfo.hpp index 9ef0aa7d..abeb3aad 100644 --- a/src/controller/certandpininfo.hpp +++ b/src/controller/certandpininfo.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/command-handlers/authenticate.cpp b/src/controller/command-handlers/authenticate.cpp index 92f08cd0..8f9e1a48 100644 --- a/src/controller/command-handlers/authenticate.cpp +++ b/src/controller/command-handlers/authenticate.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "authenticate.hpp" diff --git a/src/controller/command-handlers/authenticate.hpp b/src/controller/command-handlers/authenticate.hpp index 0b70c049..26617716 100644 --- a/src/controller/command-handlers/authenticate.hpp +++ b/src/controller/command-handlers/authenticate.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/command-handlers/certificatereader.cpp b/src/controller/command-handlers/certificatereader.cpp index e377050c..1e1f6945 100644 --- a/src/controller/command-handlers/certificatereader.cpp +++ b/src/controller/command-handlers/certificatereader.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "certificatereader.hpp" diff --git a/src/controller/command-handlers/certificatereader.hpp b/src/controller/command-handlers/certificatereader.hpp index ba92fd1d..4bf06154 100644 --- a/src/controller/command-handlers/certificatereader.hpp +++ b/src/controller/command-handlers/certificatereader.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/command-handlers/getcertificate.cpp b/src/controller/command-handlers/getcertificate.cpp index 41502e57..9a703246 100644 --- a/src/controller/command-handlers/getcertificate.cpp +++ b/src/controller/command-handlers/getcertificate.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "getcertificate.hpp" diff --git a/src/controller/command-handlers/getcertificate.hpp b/src/controller/command-handlers/getcertificate.hpp index 1b0d90ea..2b191fe2 100644 --- a/src/controller/command-handlers/getcertificate.hpp +++ b/src/controller/command-handlers/getcertificate.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/command-handlers/sign.cpp b/src/controller/command-handlers/sign.cpp index 87c81ee5..3dae4365 100644 --- a/src/controller/command-handlers/sign.cpp +++ b/src/controller/command-handlers/sign.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "sign.hpp" diff --git a/src/controller/command-handlers/sign.hpp b/src/controller/command-handlers/sign.hpp index d1348fa6..581aae33 100644 --- a/src/controller/command-handlers/sign.hpp +++ b/src/controller/command-handlers/sign.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/command-handlers/signauthutils.cpp b/src/controller/command-handlers/signauthutils.cpp index 8cc023d6..069357cb 100644 --- a/src/controller/command-handlers/signauthutils.cpp +++ b/src/controller/command-handlers/signauthutils.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "utils/erasedata.hpp" #include "signauthutils.hpp" diff --git a/src/controller/command-handlers/signauthutils.hpp b/src/controller/command-handlers/signauthutils.hpp index 2aaa2b38..9099d015 100644 --- a/src/controller/command-handlers/signauthutils.hpp +++ b/src/controller/command-handlers/signauthutils.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/commandhandler.hpp b/src/controller/commandhandler.hpp index a7392bbc..71f3159e 100644 --- a/src/controller/commandhandler.hpp +++ b/src/controller/commandhandler.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/commands.cpp b/src/controller/commands.cpp index dc75bf8a..4a8db691 100644 --- a/src/controller/commands.cpp +++ b/src/controller/commands.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "commands.hpp" diff --git a/src/controller/commands.hpp b/src/controller/commands.hpp index f13a1c73..ef3050f8 100644 --- a/src/controller/commands.hpp +++ b/src/controller/commands.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/controller.cpp b/src/controller/controller.cpp index 80a3f0ec..b6f0ef6a 100644 --- a/src/controller/controller.cpp +++ b/src/controller/controller.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "controller.hpp" diff --git a/src/controller/controller.hpp b/src/controller/controller.hpp index 0464fe6a..8b361852 100644 --- a/src/controller/controller.hpp +++ b/src/controller/controller.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/inputoutputmode.cpp b/src/controller/inputoutputmode.cpp index 41f10230..84ffd9e4 100644 --- a/src/controller/inputoutputmode.cpp +++ b/src/controller/inputoutputmode.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "inputoutputmode.hpp" diff --git a/src/controller/inputoutputmode.hpp b/src/controller/inputoutputmode.hpp index 1654469a..92aea4c5 100644 --- a/src/controller/inputoutputmode.hpp +++ b/src/controller/inputoutputmode.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/logging.cpp b/src/controller/logging.cpp index fb18d3e7..70a88698 100644 --- a/src/controller/logging.cpp +++ b/src/controller/logging.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "logging.hpp" diff --git a/src/controller/logging.hpp b/src/controller/logging.hpp index 92b43fe2..089a4542 100644 --- a/src/controller/logging.hpp +++ b/src/controller/logging.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/qeid.hpp b/src/controller/qeid.hpp index ac60ba25..3f814c0c 100644 --- a/src/controller/qeid.hpp +++ b/src/controller/qeid.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/retriableerror.hpp b/src/controller/retriableerror.hpp index 8443507f..182a3bc6 100644 --- a/src/controller/retriableerror.hpp +++ b/src/controller/retriableerror.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/threads/cardeventmonitorthread.hpp b/src/controller/threads/cardeventmonitorthread.hpp index 5badb879..27648f1e 100644 --- a/src/controller/threads/cardeventmonitorthread.hpp +++ b/src/controller/threads/cardeventmonitorthread.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2021-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/threads/commandhandlerconfirmthread.hpp b/src/controller/threads/commandhandlerconfirmthread.hpp index 72cde6f3..8f7137f4 100644 --- a/src/controller/threads/commandhandlerconfirmthread.hpp +++ b/src/controller/threads/commandhandlerconfirmthread.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/threads/commandhandlerrunthread.hpp b/src/controller/threads/commandhandlerrunthread.hpp index 940c45c0..624ba7b3 100644 --- a/src/controller/threads/commandhandlerrunthread.hpp +++ b/src/controller/threads/commandhandlerrunthread.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/threads/controllerchildthread.hpp b/src/controller/threads/controllerchildthread.hpp index fba064be..b040e008 100644 --- a/src/controller/threads/controllerchildthread.hpp +++ b/src/controller/threads/controllerchildthread.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/threads/waitforcardthread.hpp b/src/controller/threads/waitforcardthread.hpp index 2f40b882..ff616998 100644 --- a/src/controller/threads/waitforcardthread.hpp +++ b/src/controller/threads/waitforcardthread.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/ui.hpp b/src/controller/ui.hpp index e11fb04b..5121eade 100644 --- a/src/controller/ui.hpp +++ b/src/controller/ui.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/utils/erasedata.hpp b/src/controller/utils/erasedata.hpp index bc6e2b86..10e8cf15 100644 --- a/src/controller/utils/erasedata.hpp +++ b/src/controller/utils/erasedata.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/utils/observer_ptr.hpp b/src/controller/utils/observer_ptr.hpp index d5df689f..602c58ba 100644 --- a/src/controller/utils/observer_ptr.hpp +++ b/src/controller/utils/observer_ptr.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/utils/qdisablecopymove.hpp b/src/controller/utils/qdisablecopymove.hpp deleted file mode 100644 index c49a63ad..00000000 --- a/src/controller/utils/qdisablecopymove.hpp +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -// Q_DISABLE_COPY_MOVE is available since Qt 5.13, define it for earlier versions. -// Assumes that Qt headers are already included. -#ifndef Q_DISABLE_COPY_MOVE -#define Q_DISABLE_COPY_MOVE(Class) \ - Q_DISABLE_COPY(Class) \ - Class(Class&&) = delete; \ - Class& operator=(Class&&) = delete; -#endif diff --git a/src/controller/utils/utils.hpp b/src/controller/utils/utils.hpp index 1bbd9ccf..ab0be11a 100644 --- a/src/controller/utils/utils.hpp +++ b/src/controller/utils/utils.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/controller/writeresponse.cpp b/src/controller/writeresponse.cpp index 3e6db83a..f4368b4c 100644 --- a/src/controller/writeresponse.cpp +++ b/src/controller/writeresponse.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "writeresponse.hpp" #include "inputoutputmode.hpp" diff --git a/src/controller/writeresponse.hpp b/src/controller/writeresponse.hpp index 7e16d31c..cbb6b67a 100644 --- a/src/controller/writeresponse.hpp +++ b/src/controller/writeresponse.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/mac/CMakeLists.txt b/src/mac/CMakeLists.txt index 41a2e7da..41188454 100644 --- a/src/mac/CMakeLists.txt +++ b/src/mac/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT + # Helper add_library(SafariServices INTERFACE shared.hpp) target_compile_options(SafariServices INTERFACE -fobjc-arc) diff --git a/src/mac/Info-app.plist.cmake b/src/mac/Info-app.plist.cmake index c42cf053..6c095816 100644 --- a/src/mac/Info-app.plist.cmake +++ b/src/mac/Info-app.plist.cmake @@ -1,4 +1,6 @@ + + diff --git a/src/mac/Info-extension.plist.cmake b/src/mac/Info-extension.plist.cmake index 9b8310a6..b4849d41 100644 --- a/src/mac/Info-extension.plist.cmake +++ b/src/mac/Info-extension.plist.cmake @@ -1,4 +1,6 @@ + + diff --git a/src/mac/main.mm b/src/mac/main.mm index 1d8a82c7..73fc74d6 100644 --- a/src/mac/main.mm +++ b/src/mac/main.mm @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "application.hpp" #include "controller.hpp" diff --git a/src/mac/safari-extension.mm b/src/mac/safari-extension.mm index 01a5c054..349f9f5a 100644 --- a/src/mac/safari-extension.mm +++ b/src/mac/safari-extension.mm @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #import diff --git a/src/mac/shared.hpp b/src/mac/shared.hpp index f0c5bca8..14a2158c 100644 --- a/src/mac/shared.hpp +++ b/src/mac/shared.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 8a2607f9..342ff707 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT + add_library(ui STATIC certificatewidget.cpp certificatewidget.hpp diff --git a/src/ui/certificatewidget.cpp b/src/ui/certificatewidget.cpp index 48a05fe6..184e7edd 100644 --- a/src/ui/certificatewidget.cpp +++ b/src/ui/certificatewidget.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2021-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "certificatewidget.hpp" diff --git a/src/ui/certificatewidget.hpp b/src/ui/certificatewidget.hpp index f7b0257c..9d3a205b 100644 --- a/src/ui/certificatewidget.hpp +++ b/src/ui/certificatewidget.hpp @@ -1,31 +1,11 @@ -/* - * Copyright (c) 2021-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once #include #include "certandpininfo.hpp" -#include "utils/qdisablecopymove.hpp" class QLabel; diff --git a/src/ui/dialog.ui b/src/ui/dialog.ui index 1d87fa4a..90f581e2 100644 --- a/src/ui/dialog.ui +++ b/src/ui/dialog.ui @@ -1,4 +1,6 @@ + + WebEidDialog diff --git a/src/ui/languageselect.cpp b/src/ui/languageselect.cpp index 3e46170c..13621521 100644 --- a/src/ui/languageselect.cpp +++ b/src/ui/languageselect.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "languageselect.hpp" #include "ui_languageselect.h" diff --git a/src/ui/languageselect.hpp b/src/ui/languageselect.hpp index 40c631aa..4eed4e66 100644 --- a/src/ui/languageselect.hpp +++ b/src/ui/languageselect.hpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once diff --git a/src/ui/languageselect.ui b/src/ui/languageselect.ui index 0fc85350..c936bb83 100644 --- a/src/ui/languageselect.ui +++ b/src/ui/languageselect.ui @@ -1,4 +1,6 @@ + + LanguageSelect diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp index 06aa7cf2..84ae89e3 100644 --- a/src/ui/ui.cpp +++ b/src/ui/ui.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "webeiddialog.hpp" diff --git a/src/ui/webeiddialog.cpp b/src/ui/webeiddialog.cpp index 2b3b1fac..ca32ced1 100644 --- a/src/ui/webeiddialog.cpp +++ b/src/ui/webeiddialog.cpp @@ -1,24 +1,5 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #include "webeiddialog.hpp" #include "application.hpp" diff --git a/src/ui/webeiddialog.hpp b/src/ui/webeiddialog.hpp index ee0ffa1e..f9a6d18b 100644 --- a/src/ui/webeiddialog.hpp +++ b/src/ui/webeiddialog.hpp @@ -1,29 +1,9 @@ -/* - * Copyright (c) 2020-2024 Estonian Information System Authority - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: MIT #pragma once #include "ui.hpp" -#include "utils/qdisablecopymove.hpp" #include diff --git a/test.sh b/test.sh index 7e3fdfeb..0370baf5 100755 --- a/test.sh +++ b/test.sh @@ -1,4 +1,6 @@ #!/bin/bash +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT set -e set -u diff --git a/tests/input-output-mode/test.py b/tests/input-output-mode/test.py index 1cadfc22..7a877912 100644 --- a/tests/input-output-mode/test.py +++ b/tests/input-output-mode/test.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT + from __future__ import unicode_literals from __future__ import print_function diff --git a/tests/mock-ui/CMakeLists.txt b/tests/mock-ui/CMakeLists.txt index cc66d5ac..191ff901 100644 --- a/tests/mock-ui/CMakeLists.txt +++ b/tests/mock-ui/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT + add_library(mock-ui STATIC mock-ui.cpp mock-ui.hpp diff --git a/tests/tests/CMakeLists.txt b/tests/tests/CMakeLists.txt index b55040c4..bba8785a 100644 --- a/tests/tests/CMakeLists.txt +++ b/tests/tests/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: MIT + add_executable(web-eid-tests WIN32 changecertificatevaliduntil.hpp getcommandhandler-mock.cpp