diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d57e04371..d27a69458 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + name: CI on: [push, pull_request] permissions: @@ -387,3 +390,9 @@ jobs: uses: github/codeql-action/upload-sarif@v4 with: sarif_file: sarif-results/cpp.sarif + copyright: + name: Check copyright headers + uses: open-eid/.github/.github/workflows/copyright.yml@b2d87c7447ebcc01beb54c84f3978a81c1d64877 # master + with: + # TSL sample documents and XML attack payloads used as test fixtures + exclude: ^test/data/.*\.xml$ diff --git a/CMakeLists.txt b/CMakeLists.txt index 119083633..5bfde1f6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + cmake_minimum_required(VERSION 3.22) if(POLICY CMP0167) cmake_policy(SET CMP0167 NEW) diff --git a/COPYING b/COPYING deleted file mode 100644 index e145b13fb..000000000 --- a/COPYING +++ /dev/null @@ -1,140 +0,0 @@ -etc/schema/xmldsig-core-schema.xsd -Schema for XML Signatures - http://www.w3.org/2000/09/xmldsig# - $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $ - - Copyright 2001 The Internet Society and W3C (Massachusetts Institute - of Technology, Institut National de Recherche en Informatique et en - Automatique, Keio University). All Rights Reserved. - http://www.w3.org/Consortium/Legal/ - - This document is governed by the W3C Software License [1] as described - in the FAQ [2]. - - [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720 - [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD - -_______________________________________________________________________________ -etc/schema/OpenDocument_dsig.rng - - OASIS OpenDocument v1.2 - Committee Draft 05 Rev 02, 11 November 2010 - Digital Signatures Relax-NG Schema - - Copyright © OASIS Open 2008-2010. All Rights Reserved. - -_______________________________________________________________________________ -etc/schema/OpenDocument_manifest_v1_2.rng - - Open Document Format for Office Applications (OpenDocument) Version 1.2 - OASIS Standard, 29 September 2011 - Manifest Relax-NG Schema - Source: http://docs.oasis-open.org/office/v1.2/os/ - Copyright (c) OASIS Open 2002-2011. All Rights Reserved. - -_______________________________________________________________________________ -src/minizip - -http://www.winimage.com/zLibDll/minizip.html - -MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson - -Credits - - Gilles Vollant - Original MiniZip author - Even Rouault - ZIP64 unzip Support - Daniel Borca - BZip Compression method support in unzip - Mathias Svensson - ZIP64 zip support - Mathias Svensson - BZip Compression method support in zip - -License ----------------------------------------------------------- - Condition of use and distribution are the same than zlib : - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - ----------------------------------------------------------- - -_______________________________________________________________________________ -src/crypto/signer/pkcs11.h - - pkcs11.h - Copyright 2006, 2007 g10 Code GmbH - Copyright 2006 Andreas Jellinghaus - - This file is free software; as a special exception the author gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. - - This file is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY, to the extent permitted by law; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. - -_______________________________________________________________________________ -examples/DigiDocCSharp - -LICENSE.BSD -=========== - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the copyright holder nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -_______________________________________________________________________________ -src/json.h - -SPDX-License-Identifier: MIT -SPDX-FileCopyrightText: 2013-2022 Niels Lohmann - -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. diff --git a/README.md b/README.md index ab4ebf01c..bd9378ffa 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![European Regional Development Fund](https://github.com/open-eid/DigiDoc4-Client/blob/master/client/images/EL_Regionaalarengu_Fond.png "European Regional Development Fund - DO NOT REMOVE THIS IMAGE BEFORE 05.03.2020") - * License: LGPL 2.1 + * License: LGPL-2.1-or-later * © Estonian Information System Authority * [Architecture of ID-software](http://open-eid.github.io) * [API Documentation](http://open-eid.github.io/libdigidocpp) diff --git a/build.ps1 b/build.ps1 index f210fe03c..5830db115 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + #powershell -ExecutionPolicy ByPass -File build.ps1 param( [string]$libdigidocpp = $PSScriptRoot, diff --git a/cmake/modules/FindPKCS11.cmake b/cmake/modules/FindPKCS11.cmake index dab04793b..c8d85798e 100644 --- a/cmake/modules/FindPKCS11.cmake +++ b/cmake/modules/FindPKCS11.cmake @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + # - Find pkcs11 # Find the PKCS11 module # diff --git a/debian/copyright b/debian/copyright index e0b0475b3..e9fd4ae06 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,8 +3,199 @@ Upstream-Contact: info@ria.ee Source: https://github.com/open-eid/libdigidocpp Files: * -Copyright: 2012-2026 Estonian Information System's Authority -License: LGPL-2.1 +Copyright: Estonian Information System Authority +License: LGPL-2.1+ + +Files: src/json.hpp +Copyright: 2013-2025 Niels Lohmann +Comment: Vendored from https://github.com/nlohmann/json +License: Expat + +Files: src/minizip/* +Copyright: 1998-2010 Gilles Vollant + 2009-2010 Mathias Svensson +Comment: MiniZip, http://www.winimage.com/zLibDll/minizip.html +License: Zlib + +Files: src/minizip/unzip.h +Copyright: 1998-2010 Gilles Vollant + 2007-2008 Even Rouault + 2009-2010 Mathias Svensson +License: Zlib + +Files: src/minizip/unzip.c +Copyright: 1990-2000 Info-ZIP + 1998-2010 Gilles Vollant + 2007-2008 Even Rouault + 2009-2010 Mathias Svensson +Comment: The decryption code is derived from Info-ZIP's crypt.c and was woven + into MiniZip by Terry Thorsen. BZIP2 support includes a patch by Daniel Borca. +License: Zlib and Info-ZIP + +Files: src/crypto/pkcs11.h +Copyright: 2006, 2007 g10 Code GmbH + 2006 Andreas Jellinghaus +Comment: From the Scute project, http://www.scute.org/ +License: all-permissive + +Files: etc/schema/xmldsig-core-schema.xsd* + etc/schema/xml.xsd +Copyright: 2001 The Internet Society + 1994-2002 World Wide Web Consortium + (Massachusetts Institute of Technology, + Institut National de Recherche en Informatique et en Automatique, + Keio University) +Comment: Normative W3C schemas used for offline XML signature validation. + xmldsig-core-schema.xsd is from XML Signature Syntax and Processing; + xml.xsd is the schema for the xml: namespace and carries no embedded + notice of its own. + . + The licence requires notice of changes. The files are modified, and every + modification is listed in the library documentation, section "XML schema + modifications", and marked with XML comments in the files themselves. In + summary: remote schemaLocation URLs are rewritten to local filenames so + that validation needs no network access, and element X509SerialNumber is + changed from integer to string because SK-issued certificate serial numbers + do not fit the long type generated from integer. The unmodified upstream + file ships alongside as xmldsig-core-schema.xsd.orig. +License: W3C-Software-19980720 + +Files: etc/schema/OpenDocument_dsig.xsd + etc/schema/OpenDocument_manifest_v1_2.xsd + etc/schema/OpenDocument-v1.2-csd06-dsig-schema.rng + etc/schema/OpenDocument-v1.2-os-manifest-schema.rng +Copyright: 2002-2011 OASIS Open +Comment: OASIS publishes the OpenDocument schemas in RELAX NG only; there is no + official XML Schema version, in v1.2 or in the later v1.3 and v1.4. + . + The two *.rng files are the OASIS originals, redistributed unmodified: + . + OpenDocument-v1.2-os-manifest-schema.rng + http://docs.oasis-open.org/office/v1.2/os/ + OpenDocument-v1.2-csd06-dsig-schema.rng + http://docs.oasis-open.org/office/v1.2/csd06/ + . + The two *.xsd are derived from them with Trang + (https://relaxng.org/jclark/trang.html), which carries the OASIS notice + across into its output, and then hand-edited: in the manifest schema + use="required" is dropped from the version attribute for backward + compatibility, and in the dsig schema the imported schemaLocation values are + pointed at the local files, imports for the XAdES namespaces are added, and + the document-signatures attribute group and dsMarkup type are commented out. + Each edit is marked in place. + . + A format conversion that assists implementation is a derivative work the + OASIS notice permits, provided the copyright notice and the permission + section travel with it, which they do. +License: OASIS-IPR + +Files: etc/schema/XAdES01903v132-201601.xsd* + etc/schema/XAdES01903v141-201601.xsd* + etc/schema/ts_119612v020101_additionaltypes_xsd.xsd* + etc/schema/ts_119612v020101_sie_xsd.xsd* + etc/schema/ts_119612v020201_201601xsd.xsd* +Copyright: 2024 ETSI +Comment: XAdES and Trusted List schemas published by ETSI on ETSI Forge under + a BSD 3-clause licence. Each *.xsd.orig here is byte-identical to the file + published there: + . + XAdES01903v132-201601.xsd.orig + esi/x19_13201_xades 1913201-XAdES01903v132.xsd + XAdES01903v141-201601.xsd.orig + esi/x19_13201_xades 1913201-XAdES01903v141.xsd @ v1.1.1 + ts_119612v020201_201601xsd.xsd.orig + esi/x19_612_trusted_lists 19612_xsd.xsd @ v2.2.1 + ts_119612v020101_sie_xsd.xsd.orig + esi/x19_612_trusted_lists 19612_sie_xsd.xsd @ v2.1.1 + ts_119612v020101_additionaltypes_xsd.xsd.orig + esi/x19_612_trusted_lists 19612_additionaltypes_xsd.xsd @ v2.1.1 + . + Repositories are at https://forge.etsi.org/rep/esi/. The NOTICE comment + carried in some of the files states that the text of the corresponding ETSI + deliverable prevails in case of conflict. + . + The shipped *.xsd are modified copies. Every modification is listed in the + library documentation, section "XML schema modifications", and marked with + XML comments in the files themselves. In summary: remote schemaLocation URLs + rewritten to local filenames, imports added so TSL extension content can be + validated through lax processing, missing "type" attributes added, and the + SignedSignatureProperties and SignatureProductionPlace content models relaxed + from xsd:sequence to xsd:all so child elements may appear in any order. +License: BSD-3-Clause + +Files: xmlsec1-1.3.12.legacy.patch +Copyright: Estonian Information System Authority +Comment: Patch against src/openssl/signatures.c of xmlsec1, restoring + verification of legacy RSA PKCS#1 signatures whose DigestInfo omits the + ASN.1 NULL algorithm parameter. Applied to a locally built xmlsec1 by + prepare_osx_build_environment.sh. + . + Licensed to match xmlsec1 itself (MIT, Aleksey Sanin) rather than this + library's LGPL, so that the patched result stays MIT and the change can be + offered upstream. The diff context is xmlsec1's own code. +License: Expat + +Files: examples/android/gradlew* + examples/android/gradle/wrapper/* + examples/java/gradlew* + examples/java/gradle/wrapper/* +Copyright: 2015-2021 the original authors +Comment: Gradle wrapper, shipped with the Android and Java examples so they can + be built without a preinstalled Gradle. gradlew and gradlew.bat carry an + Apache-2.0 notice and an SPDX-License-Identifier of their own; + gradle-wrapper.jar is the matching prebuilt bootstrap and + gradle-wrapper.properties only pins the distribution URL. +License: Apache-2.0 + +Files: etc/tl-mp*.crt +Copyright: European Commission +Comment: Certificates of the signers of the European Commission's List of + Trusted Lists (LOTL). The Commission publishes them so that the LOTL + signature can be verified, and they are reproduced here for exactly that + purpose: src/CMakeLists.txt compiles them into the library as the default + trust anchors for TSL validation. + . + They are issued third-party certificates, not works of this project, so the + project's licence does not apply to them; a certificate carries no + copyrightable expression of ours to license. Listed here for provenance. + . + Four of the six are qualified certificates of named European Commission + staff and therefore contain personal data, published by the Commission + itself. They also expire, and the set is updated as the Commission rotates + signers. +License: public-domain + No licence is asserted over these certificates. They are published by the + European Commission for public verification of the LOTL signature. + +Files: examples/DigiDocCSharp/Program.cs +Copyright: AS Sertifitseerimiskeskus +Comment: C# signing example, released under its own LICENSE.BSD in that + directory rather than the library's LGPL. +License: BSD-3-Clause + +Files: examples/DigiDocCSharp/DigiDocCSharp.csproj +Copyright: Estonian Information System Authority +Comment: Rewritten as an SDK-style project file, but kept under the licence of + the example directory it belongs to. Its element names AS + Sertifitseerimiskeskus because that metadata is stamped into the assembly + compiled from Program.cs. +License: BSD-3-Clause + +Files: etc/schema/en_31916201v010101.xsd* +Copyright: 2016 ETSI +Comment: ASiC schema, annex A of ETSI EN 319 162-1 V1.1.1, distributed with + that deliverable as the normative attachment en_31916201v010101p0.zip. + Unlike the XAdES and Trusted List schemas above, this one is not published + on ETSI Forge and carries no licence grant; the deliverable's own copyright + notification reserves all rights and permits reproduction only by written + permission of ETSI. Recorded here for provenance, pending clarification. + . + Modified as described in the library documentation, section "XML schema + modifications": the imported schemaLocation URLs are rewritten to local + filenames and imports for the XAdES namespaces are added. +License: ETSI-deliverable + +License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -18,3 +209,230 @@ License: LGPL-2.1 You should have received a copy of the GNU Lesser General Public License with your system, in /usr/share/common-licenses/LGPL-2.1 If not, see . + +License: Expat + 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. + +License: Zlib + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +License: Info-ZIP + This is version 2009-Jan-02 of the Info-ZIP license. + The definitive version of this document should be available at + ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely and a copy at + http://www.info-zip.org/pub/infozip/license.html. + . + Copyright (c) 1990-2009 Info-ZIP. All rights reserved. + . + For the purposes of this copyright and license, "Info-ZIP" is defined as the + following set of individuals: + . + Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois, + Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth, + Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, + David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko, + Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, + Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda, + Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren, + Rich Wales, Mike White. + . + This software is provided "as is," without warranty of any kind, express or + implied. In no event shall Info-ZIP or its contributors be held liable for + any direct, indirect, incidental, special or consequential damages arising + out of the use of or inability to use this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the above disclaimer and the following restrictions: + . + 1. Redistributions of source code (in whole or in part) must retain the + above copyright notice, definition, disclaimer, and this list of + conditions. + 2. Redistributions in binary form (compiled executables and libraries) + must reproduce the above copyright notice, definition, disclaimer, and + this list of conditions in documentation and/or other materials provided + with the distribution. Additional documentation is not needed for + executables where a command line license option provides these and a + note regarding this option is in the executable's startup banner. The + sole exception to this condition is redistribution of a standard + UnZipSFX binary (including SFXWiz) as part of a self-extracting archive; + that is permitted without inclusion of this license, as long as the + normal SFX banner has not been removed from the binary or disabled. + 3. Altered versions--including, but not limited to, ports to new operating + systems, existing ports with new graphical interfaces, versions with + modified or added functionality, and dynamic, shared, or static library + versions not from Info-ZIP--must be plainly marked as such and must not + be misrepresented as being the original source or, if binaries, compiled + from the original source. Such altered versions also must not be + misrepresented as being Info-ZIP releases--including, but not limited to, + labeling of the altered versions with the names "Info-ZIP" (or any + variation thereof, including, but not limited to, different + capitalizations), "Pocket UnZip," "WiZ" or "MacZip" without the explicit + permission of Info-ZIP. Such altered versions are further prohibited + from misrepresentative use of the Zip-Bugs or Info-ZIP e-mail addresses + or the Info-ZIP URL(s), such as to imply Info-ZIP will provide support + for the altered versions. + 4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip," + "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its own + source and binary releases. + +License: all-permissive + This file is free software; as a special exception the author gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. + . + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY, to the extent permitted by law; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. + +License: W3C-Software-19980720 + This W3C work (including software, documents, or other related items) is + being provided by the copyright holders under the following license. By + obtaining, using and/or copying this work, you (the licensee) agree that you + have read, understood, and will comply with the following terms and + conditions: + . + Permission to use, copy, modify, and distribute this software and its + documentation, with or without modification, for any purpose and without fee + or royalty is hereby granted, provided that you include the following on ALL + copies of the software and documentation or portions thereof, including + modifications, that you make: + . + 1. The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work. + 2. Any pre-existing intellectual property disclaimers, notices, or terms + and conditions. If none exist, a short notice of the following form + (hypertext is preferred, text is permitted) should be used within the + body of any redistributed or derivative code: "Copyright (c) + [$date-of-software] World Wide Web Consortium, (Massachusetts Institute + of Technology, Institut National de Recherche en Informatique et en + Automatique, Keio University). All Rights Reserved. + http://www.w3.org/Consortium/Legal/" + 3. Notice of any changes or modifications to the W3C files, including the + date changes were made. (We recommend you provide URIs to the location + from which the code is derived.) + . + THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS + MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT + LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR + PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE + ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. + . + COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR + CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR + DOCUMENTATION. + . + The name and trademarks of copyright holders may NOT be used in advertising + or publicity pertaining to the software without specific, written prior + permission. Title to copyright in this software and any associated + documentation will at all times remain with copyright holders. + +License: OASIS-IPR + All capitalized terms in the following text have the meanings assigned to + them in the OASIS Intellectual Property Rights Policy (the "OASIS IPR + Policy"). The full Policy may be found at the OASIS website. + . + This document and translations of it may be copied and furnished to others, + and derivative works that comment on or otherwise explain it or assist in + its implementation may be prepared, copied, published, and distributed, in + whole or in part, without restriction of any kind, provided that the above + copyright notice and this section are included on all such copies and + derivative works. However, this document itself may not be modified in any + way, including by removing the copyright notice or references to OASIS, + except as needed for the purpose of developing any document or deliverable + produced by an OASIS Technical Committee (in which case the rules applicable + to copyrights, as set forth in the OASIS IPR Policy, must be followed) or as + required to translate it into languages other than English. + . + The limited permissions granted above are perpetual and will not be revoked + by OASIS or its successors or assigns. + . + This document and the information contained herein is provided on an "AS IS" + basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT + NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT + INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY + OR FITNESS FOR A PARTICULAR PURPOSE. + +License: BSD-3-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +License: ETSI-deliverable + The ASiC schema file carries no licence grant. ETSI publishes its deliverables + free of charge for use in implementations, and the schemas are distributed + as part of them; the notice embedded in some of the files reads: + . + This document is part of ETSI TS 119 612. In the event that any part of + this document is in conflict with the text of TS 119 612 then that text + shall prevail as the authoritative source + . + See https://www.etsi.org/standards/copyright-and-legal-notices for ETSI's + terms of reproduction. + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems the full text of the Apache License version 2.0 can be + found in /usr/share/common-licenses/Apache-2.0 diff --git a/debian/rules b/debian/rules index 681ccd799..94c301348 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,7 @@ #!/usr/bin/make -f +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + DEB_MAKE_CHECK_TARGET = test %: diff --git a/doc/images/asic.svg b/doc/images/asic.svg index af856df90..0524d5688 100644 --- a/doc/images/asic.svg +++ b/doc/images/asic.svg @@ -1,4 +1,6 @@ + + diff --git a/doc/images/components.svg b/doc/images/components.svg index ef279272f..58050dc09 100644 --- a/doc/images/components.svg +++ b/doc/images/components.svg @@ -1,4 +1,6 @@ + + diff --git a/doc/images/digidoc_framework.svg b/doc/images/digidoc_framework.svg index ab7993d45..ac62d980b 100644 --- a/doc/images/digidoc_framework.svg +++ b/doc/images/digidoc_framework.svg @@ -1,4 +1,6 @@ + + diff --git a/doc/images/schemas.svg b/doc/images/schemas.svg index 175c13b69..9f28fb7ca 100644 --- a/doc/images/schemas.svg +++ b/doc/images/schemas.svg @@ -1,4 +1,6 @@ + + diff --git a/doc/images/security.svg b/doc/images/security.svg index 802dfe500..66c7d6ee2 100644 --- a/doc/images/security.svg +++ b/doc/images/security.svg @@ -1,4 +1,6 @@ + + diff --git a/etc/Doxyfile.css b/etc/Doxyfile.css index 5cb044db9..76b889eb1 100644 --- a/etc/Doxyfile.css +++ b/etc/Doxyfile.css @@ -1,3 +1,6 @@ +/* SPDX-FileCopyrightText: Estonian Information System Authority */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ + #projectlogo > img { width: 55px; height: 55px; diff --git a/etc/digidocpp.conf.cmake b/etc/digidocpp.conf.cmake index 1ba91308f..ab4a10e3f 100644 --- a/etc/digidocpp.conf.cmake +++ b/etc/digidocpp.conf.cmake @@ -1,4 +1,6 @@ + + diff --git a/etc/schema/conf.xsd b/etc/schema/conf.xsd index 9f24fbe2d..478c299e2 100644 --- a/etc/schema/conf.xsd +++ b/etc/schema/conf.xsd @@ -1,4 +1,6 @@ + + diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 353cb30c2..d22414be0 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + add_executable( pkcs11sign pkcs11sign.cpp ) set_target_properties( pkcs11sign PROPERTIES LINK_LIBRARIES digidocpp diff --git a/examples/DigiDocCSharp/DigiDocCSharp.csproj b/examples/DigiDocCSharp/DigiDocCSharp.csproj index 98bc95624..cdb802262 100644 --- a/examples/DigiDocCSharp/DigiDocCSharp.csproj +++ b/examples/DigiDocCSharp/DigiDocCSharp.csproj @@ -1,9 +1,11 @@ - + + + net8.0 Exe 0.6.0 - Copyright © 2015 + Copyright © 2015 AS Sertifitseerimiskeskus $(DefineConstants);_WINDOWS diff --git a/examples/DigiDocCSharp/Program.cs b/examples/DigiDocCSharp/Program.cs index 617cbf2d5..5acf00d09 100644 --- a/examples/DigiDocCSharp/Program.cs +++ b/examples/DigiDocCSharp/Program.cs @@ -1,5 +1,7 @@ -// Copyright (C) AS Sertifitseerimiskeskus -// This software is released under the BSD License (see LICENSE.BSD) +// SPDX-FileCopyrightText: AS Sertifitseerimiskeskus +// SPDX-License-Identifier: BSD-3-Clause +// +// Full licence text: LICENSE.BSD in this directory using System; using System.IO; diff --git a/examples/android/app/build.gradle b/examples/android/app/build.gradle index fc0a31cc1..f1510b3aa 100644 --- a/examples/android/app/build.gradle +++ b/examples/android/app/build.gradle @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later + apply plugin: 'com.android.application' def projectRoot = rootDir.parentFile.parentFile.absolutePath diff --git a/examples/android/app/src/main/AndroidManifest.xml b/examples/android/app/src/main/AndroidManifest.xml index 3cf55ee4e..c8bfc77e6 100644 --- a/examples/android/app/src/main/AndroidManifest.xml +++ b/examples/android/app/src/main/AndroidManifest.xml @@ -1,4 +1,6 @@ + + diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/MainActivity.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/MainActivity.java index ef55fb33e..0d97da3d5 100644 --- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/MainActivity.java +++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/MainActivity.java @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later + package ee.ria.libdigidocpp; import android.Manifest; diff --git a/examples/android/app/src/main/res/layout/activity_main.xml b/examples/android/app/src/main/res/layout/activity_main.xml index d37a64d0e..35ff64de5 100644 --- a/examples/android/app/src/main/res/layout/activity_main.xml +++ b/examples/android/app/src/main/res/layout/activity_main.xml @@ -1,3 +1,5 @@ + + + + Libdigidocpp diff --git a/examples/android/app/src/main/res/values/styles.xml b/examples/android/app/src/main/res/values/styles.xml index ff6c9d2c0..ec8cd3f49 100644 --- a/examples/android/app/src/main/res/values/styles.xml +++ b/examples/android/app/src/main/res/values/styles.xml @@ -1,3 +1,5 @@ + + diff --git a/examples/android/build.gradle b/examples/android/build.gradle index 682b58c76..dadcb0e0b 100644 --- a/examples/android/build.gradle +++ b/examples/android/build.gradle @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later + // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { diff --git a/examples/android/settings.gradle b/examples/android/settings.gradle index f8a779d7e..34f6d55e3 100644 --- a/examples/android/settings.gradle +++ b/examples/android/settings.gradle @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later + plugins { id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0' } diff --git a/examples/ios/libdigidocpp/AppDelegate.h b/examples/ios/libdigidocpp/AppDelegate.h index 7d93a9d4c..4dd2a0b4e 100644 --- a/examples/ios/libdigidocpp/AppDelegate.h +++ b/examples/ios/libdigidocpp/AppDelegate.h @@ -1,10 +1,5 @@ -// -// AppDelegate.h -// libdigidocpp-ios -// -// Created by Raul Metsma on 18/07/15. -// Copyright (c) 2015 RIA. All rights reserved. -// +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #import diff --git a/examples/ios/libdigidocpp/AppDelegate.mm b/examples/ios/libdigidocpp/AppDelegate.mm index 9e41f0146..b74d7dc08 100644 --- a/examples/ios/libdigidocpp/AppDelegate.mm +++ b/examples/ios/libdigidocpp/AppDelegate.mm @@ -1,10 +1,5 @@ -// -// AppDelegate.m -// libdigidocpp-ios -// -// Created by Raul Metsma on 18/07/15. -// Copyright (c) 2015 RIA. All rights reserved. -// +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #import "AppDelegate.h" diff --git a/examples/ios/libdigidocpp/Info.plist b/examples/ios/libdigidocpp/Info.plist index 547dd08f4..42c1db896 100644 --- a/examples/ios/libdigidocpp/Info.plist +++ b/examples/ios/libdigidocpp/Info.plist @@ -1,4 +1,6 @@ + + diff --git a/examples/ios/libdigidocpp/LaunchScreen.storyboard b/examples/ios/libdigidocpp/LaunchScreen.storyboard index af34ebaa1..c04232b24 100644 --- a/examples/ios/libdigidocpp/LaunchScreen.storyboard +++ b/examples/ios/libdigidocpp/LaunchScreen.storyboard @@ -15,12 +15,6 @@ - - - - diff --git a/examples/ios/libdigidocpp/MasterViewController.mm b/examples/ios/libdigidocpp/MasterViewController.mm index 4589bc1a1..91fc85120 100644 --- a/examples/ios/libdigidocpp/MasterViewController.mm +++ b/examples/ios/libdigidocpp/MasterViewController.mm @@ -1,10 +1,5 @@ -// -// MasterViewController.m -// libdigidocpp-ios -// -// Created by Raul Metsma on 18/07/15. -// Copyright (c) 2015 RIA. All rights reserved. -// +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #import "AppDelegate.h" diff --git a/examples/ios/libdigidocpp/libdigidocpp.entitlements b/examples/ios/libdigidocpp/libdigidocpp.entitlements index d7c971d31..e65d32671 100644 --- a/examples/ios/libdigidocpp/libdigidocpp.entitlements +++ b/examples/ios/libdigidocpp/libdigidocpp.entitlements @@ -1,4 +1,6 @@ + + diff --git a/examples/ios/libdigidocpp/main.mm b/examples/ios/libdigidocpp/main.mm index 773703c26..8c3fa9965 100644 --- a/examples/ios/libdigidocpp/main.mm +++ b/examples/ios/libdigidocpp/main.mm @@ -1,10 +1,5 @@ -// -// main.m -// libdigidocpp-ios -// -// Created by Raul Metsma on 18/07/15. -// Copyright (c) 2015 RIA. All rights reserved. -// +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #import "AppDelegate.h" diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 01e8126dc..d8f72f046 100755 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later + plugins { id 'java' } diff --git a/examples/java/settings.gradle b/examples/java/settings.gradle index 81617086d..056b89fe2 100644 --- a/examples/java/settings.gradle +++ b/examples/java/settings.gradle @@ -1 +1,4 @@ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later + rootProject.name = "libdigidocpp" diff --git a/examples/java/src/main/java/ee/ria/libdigidocpp/libdigidocpp.java b/examples/java/src/main/java/ee/ria/libdigidocpp/libdigidocpp.java index 6510f0674..2a50d2851 100644 --- a/examples/java/src/main/java/ee/ria/libdigidocpp/libdigidocpp.java +++ b/examples/java/src/main/java/ee/ria/libdigidocpp/libdigidocpp.java @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later + package ee.ria.libdigidocpp; import java.io.ByteArrayInputStream; diff --git a/examples/pkcs11sign.cpp b/examples/pkcs11sign.cpp index 2d824bf8a..c9d48c631 100644 --- a/examples/pkcs11sign.cpp +++ b/examples/pkcs11sign.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later + #include #include diff --git a/examples/python/main.py b/examples/python/main.py index 68e687eaf..d036c3c40 100644 --- a/examples/python/main.py +++ b/examples/python/main.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + import digidoc import sys import os diff --git a/libdigidocpp.dox b/libdigidocpp.dox index 703833ba0..8cc2d8eeb 100644 --- a/libdigidocpp.dox +++ b/libdigidocpp.dox @@ -428,9 +428,9 @@ Several XML schemas are used when creating digitally signed documents in ASiC fi -
Schema fileDescription
OpenDocument_manifest.xsdOASIS OpenDocument v1.2 (\ref OpenDocument "OpenDocument") +
OpenDocument_manifest_v1_2.xsdOASIS OpenDocument v1.2 (\ref OpenDocument "OpenDocument") Defines the structure of META-INF/manifest.xml file in ASiC container. -https://docs.oasis-open.org/office/v1.2/csd06/OpenDocument-v1.2-csd06-manifest-schema.rng +https://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-manifest-schema.rng
OpenDocument_dsig.xsdOASIS OpenDocument v1.2 (\ref OpenDocument "OpenDocument") Defines the structure of META-INF/signature.xml file in ADOC container. https://docs.oasis-open.org/office/v1.2/csd06/OpenDocument-v1.2-csd06-dsig-schema.rng @@ -457,6 +457,13 @@ The following section describes modifications that have been made to XML schemas Modifications are marked between xml comment tags. +OASIS publishes the OpenDocument schemas in RELAX NG only, so OpenDocument_manifest_v1_2.xsd and OpenDocument_dsig.xsd are not distributed by OASIS but generated from the .rng files shipped alongside them in etc/schema/, using Trang: +\code{.sh} +java -jar trang.jar OpenDocument-v1.2-os-manifest-schema.rng OpenDocument_manifest_v1_2.xsd +java -jar trang.jar OpenDocument-v1.2-csd06-dsig-schema.rng OpenDocument_dsig.xsd +\endcode +Trang carries the OASIS copyright notice across into its output. The modifications listed below are applied to the generated files afterwards, so regenerating a schema means re-applying them. + Schema en_31916201v010101.xsd 1) The schema’s location has been altered so that the imported schema file is looked up from the local file system. diff --git a/libdigidocpp.i b/libdigidocpp.i index 12681b452..ced3d9496 100644 --- a/libdigidocpp.i +++ b/libdigidocpp.i @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later // digidocpp.i - SWIG interface for libdigidocpp library diff --git a/libdigidocpp.wxs b/libdigidocpp.wxs index a5c9e9d75..e4183851d 100644 --- a/libdigidocpp.wxs +++ b/libdigidocpp.wxs @@ -1,4 +1,6 @@ - + + + diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh index 2b76ffb6b..5828eac55 100755 --- a/prepare_osx_build_environment.sh +++ b/prepare_osx_build_environment.sh @@ -1,4 +1,7 @@ #!/bin/sh +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + set -e OPENSSL_DIR=openssl-3.5.7 diff --git a/src/ASiC_E.cpp b/src/ASiC_E.cpp index ace983e0b..da11b0b33 100644 --- a/src/ASiC_E.cpp +++ b/src/ASiC_E.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "ASiC_E.h" diff --git a/src/ASiC_E.h b/src/ASiC_E.h index 9ea12055a..be108eb82 100644 --- a/src/ASiC_E.h +++ b/src/ASiC_E.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/ASiC_S.cpp b/src/ASiC_S.cpp index 1ad6cbb30..5cb465e8f 100644 --- a/src/ASiC_S.cpp +++ b/src/ASiC_S.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "ASiC_S.h" diff --git a/src/ASiC_S.h b/src/ASiC_S.h index bfccbe053..35d708507 100644 --- a/src/ASiC_S.h +++ b/src/ASiC_S.h @@ -1,21 +1,5 @@ -/* -* libdigidocpp -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2.1 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -* -*/ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/ASiContainer.cpp b/src/ASiContainer.cpp index dc7d7f5bb..c42e34efe 100644 --- a/src/ASiContainer.cpp +++ b/src/ASiContainer.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "ASiContainer.h" diff --git a/src/ASiContainer.h b/src/ASiContainer.h index 93bbf96cd..4c25381e9 100644 --- a/src/ASiContainer.h +++ b/src/ASiContainer.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5ee902147..7b6d0f286 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + if(TARGET PkgConfig::MINIZIP) add_library(minizip ALIAS PkgConfig::MINIZIP) else() diff --git a/src/Conf.cpp b/src/Conf.cpp index 594249e7b..c44ece94c 100644 --- a/src/Conf.cpp +++ b/src/Conf.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "Conf.h" diff --git a/src/Conf.h b/src/Conf.h index 0463c58f0..ba2b9d531 100644 --- a/src/Conf.h +++ b/src/Conf.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/Container.cpp b/src/Container.cpp index 30635f1a2..544bc77ff 100644 --- a/src/Container.cpp +++ b/src/Container.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "Container.h" diff --git a/src/Container.h b/src/Container.h index cdeac1c68..1bf5c22e9 100644 --- a/src/Container.h +++ b/src/Container.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/DataFile.cpp b/src/DataFile.cpp index 5cfe26672..f56b90e76 100644 --- a/src/DataFile.cpp +++ b/src/DataFile.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "DataFile_p.h" diff --git a/src/DataFile.h b/src/DataFile.h index 38e4bde09..9fd265fe2 100644 --- a/src/DataFile.h +++ b/src/DataFile.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/DataFile_p.h b/src/DataFile_p.h index 675d66a7a..a0754ed32 100644 --- a/src/DataFile_p.h +++ b/src/DataFile_p.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/Exception.cpp b/src/Exception.cpp index 6f29f3152..1c9795fb4 100644 --- a/src/Exception.cpp +++ b/src/Exception.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "Exception.h" diff --git a/src/Exception.h b/src/Exception.h index ddce08264..e3ecf1226 100644 --- a/src/Exception.h +++ b/src/Exception.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/Exports.h b/src/Exports.h index 6bbc7bb85..e23c4474a 100644 --- a/src/Exports.h +++ b/src/Exports.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/PDF.cpp b/src/PDF.cpp index 30d627524..ae8cbcf2a 100644 --- a/src/PDF.cpp +++ b/src/PDF.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "PDF.h" diff --git a/src/PDF.h b/src/PDF.h index 9492dc62a..0cdc80172 100644 --- a/src/PDF.h +++ b/src/PDF.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/SiVaContainer.cpp b/src/SiVaContainer.cpp index 289eddd90..dfef4064a 100644 --- a/src/SiVaContainer.cpp +++ b/src/SiVaContainer.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later /* * Validation Service diff --git a/src/SiVaContainer.h b/src/SiVaContainer.h index 3c00eb633..189525379 100644 --- a/src/SiVaContainer.h +++ b/src/SiVaContainer.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/Signature.cpp b/src/Signature.cpp index 3ce59b670..6da75cf85 100644 --- a/src/Signature.cpp +++ b/src/Signature.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "Signature.h" diff --git a/src/Signature.h b/src/Signature.h index d3923685f..40dfa9410 100644 --- a/src/Signature.h +++ b/src/Signature.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/SignatureCAdES_B.cpp b/src/SignatureCAdES_B.cpp index 59c73c4f1..5df935b6b 100644 --- a/src/SignatureCAdES_B.cpp +++ b/src/SignatureCAdES_B.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include #include diff --git a/src/SignatureCAdES_B.h b/src/SignatureCAdES_B.h index e7716ad9e..25d7cfe82 100644 --- a/src/SignatureCAdES_B.h +++ b/src/SignatureCAdES_B.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/SignatureCAdES_T.cpp b/src/SignatureCAdES_T.cpp index e62ccba22..0d1609eea 100644 --- a/src/SignatureCAdES_T.cpp +++ b/src/SignatureCAdES_T.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include #include diff --git a/src/SignatureCAdES_T.h b/src/SignatureCAdES_T.h index 18311ce48..4dcdd78ae 100644 --- a/src/SignatureCAdES_T.h +++ b/src/SignatureCAdES_T.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/SignatureCAdES_p.h b/src/SignatureCAdES_p.h index 8818060c7..d74d22f4f 100644 --- a/src/SignatureCAdES_p.h +++ b/src/SignatureCAdES_p.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/SignatureTST.cpp b/src/SignatureTST.cpp index b6207cb80..d390c7561 100644 --- a/src/SignatureTST.cpp +++ b/src/SignatureTST.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "SignatureTST.h" diff --git a/src/SignatureTST.h b/src/SignatureTST.h index d6da41b0a..7cef101f5 100644 --- a/src/SignatureTST.h +++ b/src/SignatureTST.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/SignatureXAdES_B.cpp b/src/SignatureXAdES_B.cpp index ace6ac43d..f557cb9fc 100644 --- a/src/SignatureXAdES_B.cpp +++ b/src/SignatureXAdES_B.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "SignatureXAdES_B.h" diff --git a/src/SignatureXAdES_B.h b/src/SignatureXAdES_B.h index 56f12e485..7b66ff3ef 100644 --- a/src/SignatureXAdES_B.h +++ b/src/SignatureXAdES_B.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/SignatureXAdES_LT.cpp b/src/SignatureXAdES_LT.cpp index 7d38e4c1d..dad67e636 100644 --- a/src/SignatureXAdES_LT.cpp +++ b/src/SignatureXAdES_LT.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "SignatureXAdES_LT.h" diff --git a/src/SignatureXAdES_LT.h b/src/SignatureXAdES_LT.h index 27135b6fc..9fb539bfc 100644 --- a/src/SignatureXAdES_LT.h +++ b/src/SignatureXAdES_LT.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/SignatureXAdES_LTA.cpp b/src/SignatureXAdES_LTA.cpp index 33d341a8b..ec77f8839 100644 --- a/src/SignatureXAdES_LTA.cpp +++ b/src/SignatureXAdES_LTA.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "SignatureXAdES_LTA.h" diff --git a/src/SignatureXAdES_LTA.h b/src/SignatureXAdES_LTA.h index 34c5b5202..b564992ce 100644 --- a/src/SignatureXAdES_LTA.h +++ b/src/SignatureXAdES_LTA.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/SignatureXAdES_T.cpp b/src/SignatureXAdES_T.cpp index 614f80a4a..829702f04 100644 --- a/src/SignatureXAdES_T.cpp +++ b/src/SignatureXAdES_T.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "SignatureXAdES_T.h" diff --git a/src/SignatureXAdES_T.h b/src/SignatureXAdES_T.h index fcff60bb9..cfa72b044 100644 --- a/src/SignatureXAdES_T.h +++ b/src/SignatureXAdES_T.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/XMLDocument.h b/src/XMLDocument.h index fd1d57c61..abd15c028 100644 --- a/src/XMLDocument.h +++ b/src/XMLDocument.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/XmlConf.cpp b/src/XmlConf.cpp index ec27e4e90..020899ce1 100644 --- a/src/XmlConf.cpp +++ b/src/XmlConf.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "XmlConf.h" diff --git a/src/XmlConf.h b/src/XmlConf.h index 2aa554281..8063286b2 100644 --- a/src/XmlConf.h +++ b/src/XmlConf.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/Connect.cpp b/src/crypto/Connect.cpp index 6516d8f67..d80c3c146 100644 --- a/src/crypto/Connect.cpp +++ b/src/crypto/Connect.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "Connect.h" diff --git a/src/crypto/Connect.h b/src/crypto/Connect.h index a21512702..e90b6a253 100644 --- a/src/crypto/Connect.h +++ b/src/crypto/Connect.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/Digest.cpp b/src/crypto/Digest.cpp index f751993d0..acdd49c60 100644 --- a/src/crypto/Digest.cpp +++ b/src/crypto/Digest.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "Digest.h" diff --git a/src/crypto/Digest.h b/src/crypto/Digest.h index d68155887..4e599903c 100644 --- a/src/crypto/Digest.h +++ b/src/crypto/Digest.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/OCSP.cpp b/src/crypto/OCSP.cpp index 22c4a98e3..1b2434db6 100644 --- a/src/crypto/OCSP.cpp +++ b/src/crypto/OCSP.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "OCSP.h" diff --git a/src/crypto/OCSP.h b/src/crypto/OCSP.h index bbfd7f166..700bbff9c 100644 --- a/src/crypto/OCSP.h +++ b/src/crypto/OCSP.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/OpenSSLHelpers.h b/src/crypto/OpenSSLHelpers.h index 926ac937c..c7e68003a 100644 --- a/src/crypto/OpenSSLHelpers.h +++ b/src/crypto/OpenSSLHelpers.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/PKCS11Signer.cpp b/src/crypto/PKCS11Signer.cpp index 26b72b525..abb3352f9 100644 --- a/src/crypto/PKCS11Signer.cpp +++ b/src/crypto/PKCS11Signer.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "PKCS11Signer.h" diff --git a/src/crypto/PKCS11Signer.h b/src/crypto/PKCS11Signer.h index 2445af9f6..b1398f9d5 100644 --- a/src/crypto/PKCS11Signer.h +++ b/src/crypto/PKCS11Signer.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/PKCS12Signer.cpp b/src/crypto/PKCS12Signer.cpp index 16a903849..a07c9505c 100644 --- a/src/crypto/PKCS12Signer.cpp +++ b/src/crypto/PKCS12Signer.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "PKCS12Signer.h" diff --git a/src/crypto/PKCS12Signer.h b/src/crypto/PKCS12Signer.h index 847b9ad3c..3e331ba2d 100644 --- a/src/crypto/PKCS12Signer.h +++ b/src/crypto/PKCS12Signer.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/Signer.cpp b/src/crypto/Signer.cpp index ea40f8f7c..5cacca8de 100644 --- a/src/crypto/Signer.cpp +++ b/src/crypto/Signer.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "Signer.h" diff --git a/src/crypto/Signer.h b/src/crypto/Signer.h index d23c18a00..db52c685e 100644 --- a/src/crypto/Signer.h +++ b/src/crypto/Signer.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/TS.cpp b/src/crypto/TS.cpp index ba7c3e36a..d5fcc8bf5 100644 --- a/src/crypto/TS.cpp +++ b/src/crypto/TS.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "TS.h" diff --git a/src/crypto/TS.h b/src/crypto/TS.h index f09c9f657..37707830c 100644 --- a/src/crypto/TS.h +++ b/src/crypto/TS.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/TSL.cpp b/src/crypto/TSL.cpp index 7c042101b..86e8c9c46 100644 --- a/src/crypto/TSL.cpp +++ b/src/crypto/TSL.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "crypto/TSL.h" diff --git a/src/crypto/TSL.h b/src/crypto/TSL.h index 59055ae80..4ca231ec5 100644 --- a/src/crypto/TSL.h +++ b/src/crypto/TSL.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/WinSigner.cpp b/src/crypto/WinSigner.cpp index 64d365515..a69e114d7 100644 --- a/src/crypto/WinSigner.cpp +++ b/src/crypto/WinSigner.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "WinSigner.h" diff --git a/src/crypto/WinSigner.h b/src/crypto/WinSigner.h index 4c380982e..69b3bf232 100644 --- a/src/crypto/WinSigner.h +++ b/src/crypto/WinSigner.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/X509Cert.cpp b/src/crypto/X509Cert.cpp index 489089af6..97ebd8604 100644 --- a/src/crypto/X509Cert.cpp +++ b/src/crypto/X509Cert.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "X509Cert.h" #include "X509CertStore.h" diff --git a/src/crypto/X509Cert.h b/src/crypto/X509Cert.h index d0776490e..9baf6218b 100644 --- a/src/crypto/X509Cert.h +++ b/src/crypto/X509Cert.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/X509CertStore.cpp b/src/crypto/X509CertStore.cpp index 684882fbf..507f8695e 100644 --- a/src/crypto/X509CertStore.cpp +++ b/src/crypto/X509CertStore.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "X509CertStore.h" diff --git a/src/crypto/X509CertStore.h b/src/crypto/X509CertStore.h index f0310fb96..83ffffbcd 100644 --- a/src/crypto/X509CertStore.h +++ b/src/crypto/X509CertStore.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/crypto/X509Crypto.cpp b/src/crypto/X509Crypto.cpp index aa1b1424f..996c6c51a 100644 --- a/src/crypto/X509Crypto.cpp +++ b/src/crypto/X509Crypto.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "X509Crypto.h" diff --git a/src/crypto/X509Crypto.h b/src/crypto/X509Crypto.h index 1f33aa0fb..ff32999a6 100644 --- a/src/crypto/X509Crypto.h +++ b/src/crypto/X509Crypto.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/digidoc-tool.1.cmake b/src/digidoc-tool.1.cmake index aba05ce00..9402ac647 100644 --- a/src/digidoc-tool.1.cmake +++ b/src/digidoc-tool.1.cmake @@ -1,3 +1,5 @@ +.\" SPDX-FileCopyrightText: Estonian Information System Authority +.\" SPDX-License-Identifier: LGPL-2.1-or-later .\" Manpage for digidoc-tool .TH DIGIDOC-TOOL 1 "${BUILD_DATE}" "${VERSION}" "User Commands" .SH NAME diff --git a/src/digidoc-tool.cpp b/src/digidoc-tool.cpp index 2f1e8b5ad..77ff66158 100644 --- a/src/digidoc-tool.cpp +++ b/src/digidoc-tool.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "Conf.h" #include "Container.h" diff --git a/src/digidoc-tool.manifest b/src/digidoc-tool.manifest index b51f3e735..de93bda4e 100644 --- a/src/digidoc-tool.manifest +++ b/src/digidoc-tool.manifest @@ -1,4 +1,6 @@ + + diff --git a/src/libdigidocpp.i.h b/src/libdigidocpp.i.h index c77bf1ca5..9b135985b 100644 --- a/src/libdigidocpp.i.h +++ b/src/libdigidocpp.i.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/libdigidocpp.pc.cmake b/src/libdigidocpp.pc.cmake index 31b298335..0c96000ea 100644 --- a/src/libdigidocpp.pc.cmake +++ b/src/libdigidocpp.pc.cmake @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_FULL_BINDIR@ libdir=@CMAKE_INSTALL_FULL_LIBDIR@ diff --git a/src/libdigidocpp.rc b/src/libdigidocpp.rc index 36e7d987f..dffb6f304 100644 --- a/src/libdigidocpp.rc +++ b/src/libdigidocpp.rc @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later + #include VS_VERSION_INFO VERSIONINFO diff --git a/src/setup.py.cmake b/src/setup.py.cmake index a27a2af62..fc44354ae 100644 --- a/src/setup.py.cmake +++ b/src/setup.py.cmake @@ -1,9 +1,12 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + from distutils.core import setup setup( name='digidocpp', version='${VERSION}', - license='LGPL 2.1', + license='LGPL-2.1-or-later', author='RIA', author_email='info@ria.ee', url='https://open-eid.github.io/libdigidocpp/', diff --git a/src/util/DateTime.cpp b/src/util/DateTime.cpp index cd74227f0..91cd1d963 100644 --- a/src/util/DateTime.cpp +++ b/src/util/DateTime.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "DateTime.h" diff --git a/src/util/DateTime.h b/src/util/DateTime.h index a5260a796..cd0e9af05 100644 --- a/src/util/DateTime.h +++ b/src/util/DateTime.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/util/File.cpp b/src/util/File.cpp index 4f0f31a4b..26dc37483 100644 --- a/src/util/File.cpp +++ b/src/util/File.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "File.h" diff --git a/src/util/File.h b/src/util/File.h index f48ef71ca..4c1c25897 100644 --- a/src/util/File.h +++ b/src/util/File.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/util/ZipSerialize.cpp b/src/util/ZipSerialize.cpp index f8ca53fbc..7f2e77626 100644 --- a/src/util/ZipSerialize.cpp +++ b/src/util/ZipSerialize.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "ZipSerialize.h" diff --git a/src/util/ZipSerialize.h b/src/util/ZipSerialize.h index 75e5d5c05..7a9e51d66 100644 --- a/src/util/ZipSerialize.h +++ b/src/util/ZipSerialize.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/util/algorithm.h b/src/util/algorithm.h index 7746e9823..997346890 100644 --- a/src/util/algorithm.h +++ b/src/util/algorithm.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/util/log.cpp b/src/util/log.cpp index 9cb3666fb..7378be91c 100644 --- a/src/util/log.cpp +++ b/src/util/log.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #include "log.h" diff --git a/src/util/log.h b/src/util/log.h index 193317288..c55388ba5 100644 --- a/src/util/log.h +++ b/src/util/log.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/src/util/memory.h b/src/util/memory.h index 31d92c328..95628c690 100644 --- a/src/util/memory.h +++ b/src/util/memory.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c916f57cd..35ed8482b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + set_env(TEST_FORMAT XML CACHE STRING "Test result format (XML/JUNIT)") set( CMAKE_SKIP_RPATH OFF ) add_definitions( diff --git a/test/TSLTests.cpp b/test/TSLTests.cpp index af93e490e..6eb2b4e00 100644 --- a/test/TSLTests.cpp +++ b/test/TSLTests.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #define BOOST_TEST_MODULE "TSL Tests for libdigidocpp" #include "test.h" diff --git a/test/data/digidocpp.conf b/test/data/digidocpp.conf index fd696d420..198579705 100644 --- a/test/data/digidocpp.conf +++ b/test/data/digidocpp.conf @@ -1,4 +1,6 @@ + + 2 digidocpp-test.log diff --git a/test/data/gencerts.sh b/test/data/gencerts.sh index e59dbb10b..97bc13a61 100755 --- a/test/data/gencerts.sh +++ b/test/data/gencerts.sh @@ -1,4 +1,6 @@ #!/bin/bash +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later echo '01' > caserial.txt echo '01' > interserial.txt diff --git a/test/data/openssl.conf b/test/data/openssl.conf index 3b58d65fa..006475f93 100644 --- a/test/data/openssl.conf +++ b/test/data/openssl.conf @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later + [ v3_usr ] basicConstraints = CA:false subjectKeyIdentifier = hash diff --git a/test/libdigidocpp_boost.cpp b/test/libdigidocpp_boost.cpp index 1af2c63cf..f2698f1a9 100644 --- a/test/libdigidocpp_boost.cpp +++ b/test/libdigidocpp_boost.cpp @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #define BOOST_TEST_MODULE "C++ Unit Tests for libdigidocpp" #include "test.h" diff --git a/test/test.h b/test/test.h index 0a4f4427b..0dd43ab9e 100644 --- a/test/test.h +++ b/test/test.h @@ -1,21 +1,5 @@ -/* - * libdigidocpp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +// SPDX-FileCopyrightText: Estonian Information System Authority +// SPDX-License-Identifier: LGPL-2.1-or-later #pragma once diff --git a/vcpkg-triplets/arm-neon-android.cmake b/vcpkg-triplets/arm-neon-android.cmake index 2b729484a..0ab8045ce 100644 --- a/vcpkg-triplets/arm-neon-android.cmake +++ b/vcpkg-triplets/arm-neon-android.cmake @@ -1,3 +1,9 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Based on vcpkg's triplet of the same name (MIT), https://github.com/microsoft/vcpkg +# Differs only in static CRT linkage and Android API level 30. + set(VCPKG_TARGET_ARCHITECTURE arm) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) diff --git a/vcpkg-triplets/arm64-android.cmake b/vcpkg-triplets/arm64-android.cmake index 1d59c1517..032b79f18 100644 --- a/vcpkg-triplets/arm64-android.cmake +++ b/vcpkg-triplets/arm64-android.cmake @@ -1,3 +1,9 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Based on vcpkg's triplet of the same name (MIT), https://github.com/microsoft/vcpkg +# Differs only in static CRT linkage and Android API level 30. + set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) diff --git a/vcpkg-triplets/arm64-ios.cmake b/vcpkg-triplets/arm64-ios.cmake index a3159b8bc..efd8fb8c5 100644 --- a/vcpkg-triplets/arm64-ios.cmake +++ b/vcpkg-triplets/arm64-ios.cmake @@ -1,3 +1,9 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Based on vcpkg's community triplet of the same name (MIT), https://github.com/microsoft/vcpkg +# Differs only in adding a 16.0 deployment target. + set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) diff --git a/vcpkg-triplets/arm64-x64-ios-catalyst.cmake b/vcpkg-triplets/arm64-x64-ios-catalyst.cmake index 08effaba0..a68bdf4fe 100644 --- a/vcpkg-triplets/arm64-x64-ios-catalyst.cmake +++ b/vcpkg-triplets/arm64-x64-ios-catalyst.cmake @@ -1,3 +1,9 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Based on vcpkg's arm64-ios community triplet (MIT), https://github.com/microsoft/vcpkg +# Extended for Mac Catalyst: macosx sysroot, universal binary, 16.0 deployment target. + set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) diff --git a/vcpkg-triplets/arm64-x64-ios-simulator.cmake b/vcpkg-triplets/arm64-x64-ios-simulator.cmake index 6d50c5204..f993a1f4b 100644 --- a/vcpkg-triplets/arm64-x64-ios-simulator.cmake +++ b/vcpkg-triplets/arm64-x64-ios-simulator.cmake @@ -1,3 +1,9 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Based on vcpkg's arm64-ios-simulator community triplet (MIT), https://github.com/microsoft/vcpkg +# Extended to a universal binary with a 16.0 deployment target. + set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) diff --git a/vcpkg-triplets/x64-android.cmake b/vcpkg-triplets/x64-android.cmake index 98071d89a..c300a51fc 100644 --- a/vcpkg-triplets/x64-android.cmake +++ b/vcpkg-triplets/x64-android.cmake @@ -1,3 +1,9 @@ +# SPDX-FileCopyrightText: Estonian Information System Authority +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Based on vcpkg's triplet of the same name (MIT), https://github.com/microsoft/vcpkg +# Differs only in static CRT linkage and Android API level 30. + set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) diff --git a/xmlsec1-1.3.12.legacy.patch b/xmlsec1-1.3.12.legacy.patch index 0dd57952c..29846c750 100644 --- a/xmlsec1-1.3.12.legacy.patch +++ b/xmlsec1-1.3.12.legacy.patch @@ -1,3 +1,13 @@ +Description: Verify legacy RSA PKCS#1 signatures via signature recovery + OpenSSL rejects PKCS#1 v1.5 signatures whose DigestInfo omits the ASN.1 NULL + algorithm parameter; some older Estonian signatures do so, therefore + recover the signature and compare the DigestInfo directly. Carried by + libdigidocpp itself from 2015 until 79d70014 moved XAdES validation to + xmlsec1. Rebased per xmlsec1 release; an identical copy lives in the xmlsec + port of open-eid/vcpkg-ports and must be kept in step. +Author: Estonian Information System Authority +SPDX-License-Identifier: MIT +Forwarded: no --- a/src/openssl/signatures.c +++ b/src/openssl/signatures.c @@ -35,6 +35,8 @@