From 6656ffbab1936b08e01bc05c58836a6fc601b00e Mon Sep 17 00:00:00 2001 From: Riccardo Iaconelli Date: Wed, 3 Jul 2024 15:40:32 +0200 Subject: [PATCH] Revert "Revert "Finish porting license template to Developers Italia standards. Finalises changes introduced in 06d17c90b46c23678107cde536b5bc1c833b2980"" This reverts commit d370df89dab439735fd98d298cbb93572656838e. --- TestCIE/TestCIE.cpp | 19 ++--------- TestCIE/UUCByteArray.cpp | 17 +--------- TestCIE/UUCByteArray.h | 17 +--------- cie-pkcs11/CSP/AbilitaCIE.cpp | 2 +- cie-pkcs11/CSP/AbilitaCIE.h | 2 +- cie-pkcs11/CSP/FirmaConCIE.cpp | 2 +- cie-pkcs11/CSP/FirmaConCIE.h | 2 +- cie-pkcs11/CSP/PINManager.cpp | 2 +- cie-pkcs11/CSP/PINManager.h | 2 +- cie-pkcs11/CSP/VerificaConCIE.cpp | 2 +- cie-pkcs11/CSP/VerificaConCIE.h | 2 +- cie-pkcs11/Crypto/CryptoUtil.h | 2 +- cie-pkcs11/Sign/definitions.h | 3 +- cie-pkcs11/UI/AbilitaCIE.mm | 2 +- cie-pkcs11/Util/UUCByteArray.cpp | 17 +--------- cie-pkcs11/Util/UUCByteArray.h | 17 +--------- cie-pkcs11/Util/UUCHashtable.hpp | 17 +--------- cie-pkcs11/Util/UUCProperties.cpp | 3 +- cie-pkcs11/Util/UUCProperties.h | 37 ++++++++++----------- cie-pkcs11/Util/UUCStringTable.cpp | 3 +- cie-pkcs11/Util/UUCStringTable.h | 33 +++++++++--------- cie-pkcs11/Util/UUCTextFileReader.cpp | 17 +--------- cie-pkcs11/Util/UUCTextFileReader.h | 19 ++--------- cie-pkcs11/keys.h | 2 +- cie_sign_sdk/include/Base64.h | 1 - cie_sign_sdk/include/UUCHashtable.h | 17 +--------- cie_sign_sdk/include/definitions.h | 3 +- cie_sign_sdk/include/keys.h | 2 +- cie_sign_sdk/src/ASN1/ASN1Exception.h | 17 +--------- cie_sign_sdk/src/ASN1/UUCBufferedReader.cpp | 17 +--------- cie_sign_sdk/src/ASN1/UUCBufferedReader.h | 17 +--------- cie_sign_sdk/src/ASN1/UUCByteArray.cpp | 17 +--------- cie_sign_sdk/src/ASN1/UUCByteArray.h | 17 +--------- cie_sign_sdk/src/Base64.cpp | 1 - cie_sign_sdk/src/Crypto/CryptoUtil.h | 2 +- cie_sign_sdk/src/RSA/sha2.c | 1 - cie_sign_sdk/src/RSA/sha2.h | 1 - cie_sign_sdk/src/Util/UUCHashtable.hpp | 17 +--------- cie_sign_sdk/src/Util/UUCProperties.cpp | 3 +- cie_sign_sdk/src/Util/UUCProperties.h | 37 ++++++++++----------- cie_sign_sdk/src/Util/UUCStringTable.h | 33 +++++++++--------- cie_sign_sdk/src/Util/UUCTextFileReader.cpp | 17 +--------- cie_sign_sdk/src/Util/UUCTextFileReader.h | 19 ++--------- 43 files changed, 106 insertions(+), 374 deletions(-) diff --git a/TestCIE/TestCIE.cpp b/TestCIE/TestCIE.cpp index 2ae7823d..36fb8d3f 100644 --- a/TestCIE/TestCIE.cpp +++ b/TestCIE/TestCIE.cpp @@ -1,22 +1,8 @@ // TestCIE.cpp : Questo file contiene la funzione 'main', in cui inizia e termina l'esecuzione del programma. // /* - * Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Copyright (c) 2018 Istituto Poligrafico e Zecca dello Stato + * SPDX-License-Identifier: BSD-3-Clause */ #include @@ -762,7 +748,6 @@ int main(int argc, char* argv[]) { std::cout << "----------------------------------------------" << std::endl; std::cout << "- Benvenuti nella Console di test del PKCS#11" << std::endl; - std::cout << "- Copyright (c) 2006-2019 by Ugo Chirico\n- http://www.ugochirico.com\n- All right reserved" << std::endl; std::cout << "----------------------------------------------" << std::endl; g_nLogLevel = 5; diff --git a/TestCIE/UUCByteArray.cpp b/TestCIE/UUCByteArray.cpp index 3af06029..17ec6149 100644 --- a/TestCIE/UUCByteArray.cpp +++ b/TestCIE/UUCByteArray.cpp @@ -1,20 +1,5 @@ /* - * Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com - * All Rights Reserved - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #include "UUCByteArray.h" diff --git a/TestCIE/UUCByteArray.h b/TestCIE/UUCByteArray.h index a3e69220..7fa43b28 100644 --- a/TestCIE/UUCByteArray.h +++ b/TestCIE/UUCByteArray.h @@ -1,20 +1,5 @@ /* - * Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com - * All Rights Reserved - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #pragma once diff --git a/cie-pkcs11/CSP/AbilitaCIE.cpp b/cie-pkcs11/CSP/AbilitaCIE.cpp index 2cb56fc8..743616a8 100644 --- a/cie-pkcs11/CSP/AbilitaCIE.cpp +++ b/cie-pkcs11/CSP/AbilitaCIE.cpp @@ -3,7 +3,7 @@ // cie-pkcs11 // // Created by ugo chirico on 06/10/18. http://www.ugochirico.com -// Copyright © 2018 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #include #include "IAS.h" diff --git a/cie-pkcs11/CSP/AbilitaCIE.h b/cie-pkcs11/CSP/AbilitaCIE.h index 17dc30b0..b1703c9a 100644 --- a/cie-pkcs11/CSP/AbilitaCIE.h +++ b/cie-pkcs11/CSP/AbilitaCIE.h @@ -3,7 +3,7 @@ // cie-pkcs11 // // Created by ugo chirico on 02/09/18. http://www.ugochirico.com -// Copyright © 2018 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #include "../PKCS11/cryptoki.h" #include diff --git a/cie-pkcs11/CSP/FirmaConCIE.cpp b/cie-pkcs11/CSP/FirmaConCIE.cpp index 14bfe14c..b253b509 100644 --- a/cie-pkcs11/CSP/FirmaConCIE.cpp +++ b/cie-pkcs11/CSP/FirmaConCIE.cpp @@ -1,7 +1,7 @@ // // FirmaConCIE.cpp // cie-pkcs11 -// Copyright © 2021 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #include "FirmaConCIE.h" diff --git a/cie-pkcs11/CSP/FirmaConCIE.h b/cie-pkcs11/CSP/FirmaConCIE.h index e3866597..1367bb1b 100644 --- a/cie-pkcs11/CSP/FirmaConCIE.h +++ b/cie-pkcs11/CSP/FirmaConCIE.h @@ -2,7 +2,7 @@ // FirmaConCIE.hpp // cie-pkcs11 // -// Copyright © 2021 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #ifndef FirmaConCIE_h diff --git a/cie-pkcs11/CSP/PINManager.cpp b/cie-pkcs11/CSP/PINManager.cpp index 9b5b9618..4611cff4 100644 --- a/cie-pkcs11/CSP/PINManager.cpp +++ b/cie-pkcs11/CSP/PINManager.cpp @@ -3,7 +3,7 @@ // cie-pkcs11 // // Created by ugo chirico on 06/10/18. http://www.ugochirico.com -// Copyright © 2018 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #include "PINManager.h" diff --git a/cie-pkcs11/CSP/PINManager.h b/cie-pkcs11/CSP/PINManager.h index ddf938a0..ce5de1c3 100644 --- a/cie-pkcs11/CSP/PINManager.h +++ b/cie-pkcs11/CSP/PINManager.h @@ -3,7 +3,7 @@ // cie-pkcs11 // // Created by ugo chirico on 06/10/18. http://www.ugochirico.com -// Copyright © 2018 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #ifndef PINManager_h diff --git a/cie-pkcs11/CSP/VerificaConCIE.cpp b/cie-pkcs11/CSP/VerificaConCIE.cpp index 3f3144ca..a4bb3521 100644 --- a/cie-pkcs11/CSP/VerificaConCIE.cpp +++ b/cie-pkcs11/CSP/VerificaConCIE.cpp @@ -3,7 +3,7 @@ // cie-pkcs11 // // Created by Pierluigi De Gregorio on 18/02/21. -// Copyright © 2021 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #include "VerificaConCIE.h" diff --git a/cie-pkcs11/CSP/VerificaConCIE.h b/cie-pkcs11/CSP/VerificaConCIE.h index 1a312a4d..864a4f20 100644 --- a/cie-pkcs11/CSP/VerificaConCIE.h +++ b/cie-pkcs11/CSP/VerificaConCIE.h @@ -2,7 +2,7 @@ // VerificaConCIE.h // cie-pkcs11 // -// Copyright © 2021 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #ifndef VerificaConCIE_h diff --git a/cie-pkcs11/Crypto/CryptoUtil.h b/cie-pkcs11/Crypto/CryptoUtil.h index 91f1d1e5..98ab81c0 100644 --- a/cie-pkcs11/Crypto/CryptoUtil.h +++ b/cie-pkcs11/Crypto/CryptoUtil.h @@ -3,7 +3,7 @@ // cie-pkcs11 // // Created by ugo chirico on 07/01/2019. -// Copyright © 2019 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #ifndef CryptoUtil_h diff --git a/cie-pkcs11/Sign/definitions.h b/cie-pkcs11/Sign/definitions.h index 917ee49a..ce7ecb2e 100644 --- a/cie-pkcs11/Sign/definitions.h +++ b/cie-pkcs11/Sign/definitions.h @@ -2,8 +2,7 @@ * utiltypes.h * * Fri Nov 17 01:15:58 2006 - * Copyright 2006 Ugo Chirico - * Email + * SPDX-License-Identifier: BSD-3-Clause ****************************************************************************/ #ifndef __UTILITYTYPES_H diff --git a/cie-pkcs11/UI/AbilitaCIE.mm b/cie-pkcs11/UI/AbilitaCIE.mm index 1eb95430..54d62157 100644 --- a/cie-pkcs11/UI/AbilitaCIE.mm +++ b/cie-pkcs11/UI/AbilitaCIE.mm @@ -3,7 +3,7 @@ // cie-pkcs11 // // Created by ugo chirico on 02/09/18. -// Copyright © 2018 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #include diff --git a/cie-pkcs11/Util/UUCByteArray.cpp b/cie-pkcs11/Util/UUCByteArray.cpp index 5db8ce27..4e54c636 100755 --- a/cie-pkcs11/Util/UUCByteArray.cpp +++ b/cie-pkcs11/Util/UUCByteArray.cpp @@ -1,20 +1,5 @@ /* - * Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com - * All Rights Reserved - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #include "UUCByteArray.h" diff --git a/cie-pkcs11/Util/UUCByteArray.h b/cie-pkcs11/Util/UUCByteArray.h index 3440cf17..d94968df 100755 --- a/cie-pkcs11/Util/UUCByteArray.h +++ b/cie-pkcs11/Util/UUCByteArray.h @@ -1,20 +1,5 @@ /* - * Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com - * All Rights Reserved - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #pragma once diff --git a/cie-pkcs11/Util/UUCHashtable.hpp b/cie-pkcs11/Util/UUCHashtable.hpp index 202d62e3..49329e33 100755 --- a/cie-pkcs11/Util/UUCHashtable.hpp +++ b/cie-pkcs11/Util/UUCHashtable.hpp @@ -1,21 +1,6 @@ /* CHashtable.hpp * - * Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com - * All Rights Reserved - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef _UUHASHTABLE_HPP_ #define _UUHASHTABLE_HPP_ diff --git a/cie-pkcs11/Util/UUCProperties.cpp b/cie-pkcs11/Util/UUCProperties.cpp index b5d6435a..ab5166c2 100755 --- a/cie-pkcs11/Util/UUCProperties.cpp +++ b/cie-pkcs11/Util/UUCProperties.cpp @@ -1,7 +1,6 @@ /* UUCProperties.cpp: implementation of the UUCProperties class. * -* Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com -* All Rights Reserved +* Copyright (c) 2018 Istituto Poligrafico e Zecca dello Stato * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/cie-pkcs11/Util/UUCProperties.h b/cie-pkcs11/Util/UUCProperties.h index ea76f7d5..94098984 100755 --- a/cie-pkcs11/Util/UUCProperties.h +++ b/cie-pkcs11/Util/UUCProperties.h @@ -1,21 +1,20 @@ /* UUCProperties.h: interface for the UUCProperties class. -* -* Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com -* All Rights Reserved -* -* This program 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 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* +* Copyright (c) 2018 Istituto Poligrafico e Zecca dello Stato +* +* This program 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 of the License, or +* (at your option) any later version. +* +* This program 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 General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if !defined(AFX_UUCPROPERTIES_H__715BAE3B_069E_4D31_9FBF_54EA38AAEFEC__INCLUDED_) @@ -40,9 +39,9 @@ class UUCProperties long load(const UUCByteArray& props); void putProperty(const char* szName, const char* szValue); //void putProperty(char* szName, char* szValue); - const char* getProperty(const char* szName, const char* szDefaultValue = NULL) const; + const char* getProperty(const char* szName, const char* szDefaultValue = NULL) const; int getIntProperty(const char* szName, int nDefaultValue = 0) const; - + void remove(const char* szName); void removeAll(); diff --git a/cie-pkcs11/Util/UUCStringTable.cpp b/cie-pkcs11/Util/UUCStringTable.cpp index c5f35ba0..01da77eb 100755 --- a/cie-pkcs11/Util/UUCStringTable.cpp +++ b/cie-pkcs11/Util/UUCStringTable.cpp @@ -1,7 +1,6 @@ /* UUCStringTable.cpp: implementation of the UUCStringTable class. * -* Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com -* All Rights Reserved +* Copyright (c) 2018 Istituto Poligrafico e Zecca dello Stato * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/cie-pkcs11/Util/UUCStringTable.h b/cie-pkcs11/Util/UUCStringTable.h index 5f4a558d..a7b2cf2c 100755 --- a/cie-pkcs11/Util/UUCStringTable.h +++ b/cie-pkcs11/Util/UUCStringTable.h @@ -1,21 +1,20 @@ /* UUCStringTable.h: interface for the UUCStringTable class. -* -* Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com -* All Rights Reserved -* -* This program 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 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* +* Copyright (c) 2018 Istituto Poligrafico e Zecca dello Stato +* +* This program 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 of the License, or +* (at your option) any later version. +* +* This program 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 General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if !defined(AFX_UUCSTRINGTABLE_H__4392B6C2_89AA_436D_8291_A3D22CFF877B__INCLUDED_) diff --git a/cie-pkcs11/Util/UUCTextFileReader.cpp b/cie-pkcs11/Util/UUCTextFileReader.cpp index 1758d4a9..82c46894 100755 --- a/cie-pkcs11/Util/UUCTextFileReader.cpp +++ b/cie-pkcs11/Util/UUCTextFileReader.cpp @@ -1,21 +1,6 @@ /* UUCTextFile.cpp: implementation of the UUCTextFile class. * - * Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com - * All Rights Reserved - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #include "UUCTextFileReader.h" diff --git a/cie-pkcs11/Util/UUCTextFileReader.h b/cie-pkcs11/Util/UUCTextFileReader.h index 697de49c..bf47675e 100755 --- a/cie-pkcs11/Util/UUCTextFileReader.h +++ b/cie-pkcs11/Util/UUCTextFileReader.h @@ -1,20 +1,5 @@ -/* UUCTextFile.h: interface for the UUCTextFile class. - * Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com - * All Rights Reserved - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* UUCTextFile.h: interface for the UUCTextFile class. + * SPDX-License-Identifier: BSD-3-Clause */ #if !defined(AFX_UUCTEXTFILE_H__CD3660A5_B4C5_4CD4_99AC_69AC96D1460F__INCLUDED_) diff --git a/cie-pkcs11/keys.h b/cie-pkcs11/keys.h index c303e4cf..2553bfdc 100644 --- a/cie-pkcs11/keys.h +++ b/cie-pkcs11/keys.h @@ -3,7 +3,7 @@ // cie-pkcs11 // // Created by ugo chirico on 07/01/2019. -// Copyright © 2019 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #ifndef keys_h diff --git a/cie_sign_sdk/include/Base64.h b/cie_sign_sdk/include/Base64.h index 670bff94..20ad2af2 100644 --- a/cie_sign_sdk/include/Base64.h +++ b/cie_sign_sdk/include/Base64.h @@ -1,5 +1,4 @@ /* Copyright (c) 2006-2007, Philip Busch - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/cie_sign_sdk/include/UUCHashtable.h b/cie_sign_sdk/include/UUCHashtable.h index a8206bf2..fa4db45f 100644 --- a/cie_sign_sdk/include/UUCHashtable.h +++ b/cie_sign_sdk/include/UUCHashtable.h @@ -1,21 +1,6 @@ /* CHashtable.hpp * - * Copyright (c) 2000-2006 by Ugo Chirico - http://www.ugosweb.com - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef _UUHASHTABLE_HPP_ #define _UUHASHTABLE_HPP_ diff --git a/cie_sign_sdk/include/definitions.h b/cie_sign_sdk/include/definitions.h index 917ee49a..ce7ecb2e 100644 --- a/cie_sign_sdk/include/definitions.h +++ b/cie_sign_sdk/include/definitions.h @@ -2,8 +2,7 @@ * utiltypes.h * * Fri Nov 17 01:15:58 2006 - * Copyright 2006 Ugo Chirico - * Email + * SPDX-License-Identifier: BSD-3-Clause ****************************************************************************/ #ifndef __UTILITYTYPES_H diff --git a/cie_sign_sdk/include/keys.h b/cie_sign_sdk/include/keys.h index c303e4cf..2553bfdc 100644 --- a/cie_sign_sdk/include/keys.h +++ b/cie_sign_sdk/include/keys.h @@ -3,7 +3,7 @@ // cie-pkcs11 // // Created by ugo chirico on 07/01/2019. -// Copyright © 2019 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #ifndef keys_h diff --git a/cie_sign_sdk/src/ASN1/ASN1Exception.h b/cie_sign_sdk/src/ASN1/ASN1Exception.h index d3e13b33..c4fe0131 100644 --- a/cie_sign_sdk/src/ASN1/ASN1Exception.h +++ b/cie_sign_sdk/src/ASN1/ASN1Exception.h @@ -1,20 +1,5 @@ /* - * Copyright (c) 2000-2006 by Ugo Chirico - http://www.ugosweb.com - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/cie_sign_sdk/src/ASN1/UUCBufferedReader.cpp b/cie_sign_sdk/src/ASN1/UUCBufferedReader.cpp index f4d8ed89..2c772c88 100644 --- a/cie_sign_sdk/src/ASN1/UUCBufferedReader.cpp +++ b/cie_sign_sdk/src/ASN1/UUCBufferedReader.cpp @@ -1,21 +1,6 @@ /* BufferedReader.cpp: implementation of the UUCBufferedReader class. /* - * Copyright (c) 2000-2006 by Ugo Chirico - http://www.ugosweb.com - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #include "definitions.h" diff --git a/cie_sign_sdk/src/ASN1/UUCBufferedReader.h b/cie_sign_sdk/src/ASN1/UUCBufferedReader.h index 62d72cb1..5b74114e 100644 --- a/cie_sign_sdk/src/ASN1/UUCBufferedReader.h +++ b/cie_sign_sdk/src/ASN1/UUCBufferedReader.h @@ -1,21 +1,6 @@ /* BufferedReader.h: interface for the CBufferedReader class. * - * Copyright (c) 2000-2006 by Ugo Chirico - http://www.ugosweb.com - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #pragma once diff --git a/cie_sign_sdk/src/ASN1/UUCByteArray.cpp b/cie_sign_sdk/src/ASN1/UUCByteArray.cpp index 58ad4936..141a9c34 100644 --- a/cie_sign_sdk/src/ASN1/UUCByteArray.cpp +++ b/cie_sign_sdk/src/ASN1/UUCByteArray.cpp @@ -1,20 +1,5 @@ /* - * Copyright (c) 2000-2006 by Ugo Chirico - http://www.ugosweb.com - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #include "UUCByteArray.h" diff --git a/cie_sign_sdk/src/ASN1/UUCByteArray.h b/cie_sign_sdk/src/ASN1/UUCByteArray.h index 9b19f384..35adfd91 100644 --- a/cie_sign_sdk/src/ASN1/UUCByteArray.h +++ b/cie_sign_sdk/src/ASN1/UUCByteArray.h @@ -1,20 +1,5 @@ /* - * Copyright (c) 2000-2006 by Ugo Chirico - http://www.ugosweb.com - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #pragma once diff --git a/cie_sign_sdk/src/Base64.cpp b/cie_sign_sdk/src/Base64.cpp index 401a96af..86b2873b 100644 --- a/cie_sign_sdk/src/Base64.cpp +++ b/cie_sign_sdk/src/Base64.cpp @@ -1,5 +1,4 @@ /* Copyright (c) 2006-2007, Philip Busch - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/cie_sign_sdk/src/Crypto/CryptoUtil.h b/cie_sign_sdk/src/Crypto/CryptoUtil.h index 4c9a7954..fcc6d6ce 100644 --- a/cie_sign_sdk/src/Crypto/CryptoUtil.h +++ b/cie_sign_sdk/src/Crypto/CryptoUtil.h @@ -3,7 +3,7 @@ // cie-pkcs11 // // Created by ugo chirico on 07/01/2019. -// Copyright © 2019 IPZS. All rights reserved. +// SPDX-License-Identifier: BSD-3-Clause // #ifndef CryptoUtil_h diff --git a/cie_sign_sdk/src/RSA/sha2.c b/cie_sign_sdk/src/RSA/sha2.c index 36a5e0fc..1761ea02 100644 --- a/cie_sign_sdk/src/RSA/sha2.c +++ b/cie_sign_sdk/src/RSA/sha2.c @@ -6,7 +6,6 @@ * This file is part of PolarSSL (http://www.polarssl.org) * Lead Maintainer: Paul Bakker * - * All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cie_sign_sdk/src/RSA/sha2.h b/cie_sign_sdk/src/RSA/sha2.h index 39d93475..e45b85cf 100644 --- a/cie_sign_sdk/src/RSA/sha2.h +++ b/cie_sign_sdk/src/RSA/sha2.h @@ -8,7 +8,6 @@ * This file is part of PolarSSL (http://www.polarssl.org) * Lead Maintainer: Paul Bakker * - * All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cie_sign_sdk/src/Util/UUCHashtable.hpp b/cie_sign_sdk/src/Util/UUCHashtable.hpp index 202d62e3..49329e33 100644 --- a/cie_sign_sdk/src/Util/UUCHashtable.hpp +++ b/cie_sign_sdk/src/Util/UUCHashtable.hpp @@ -1,21 +1,6 @@ /* CHashtable.hpp * - * Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com - * All Rights Reserved - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef _UUHASHTABLE_HPP_ #define _UUHASHTABLE_HPP_ diff --git a/cie_sign_sdk/src/Util/UUCProperties.cpp b/cie_sign_sdk/src/Util/UUCProperties.cpp index b5d6435a..ab5166c2 100644 --- a/cie_sign_sdk/src/Util/UUCProperties.cpp +++ b/cie_sign_sdk/src/Util/UUCProperties.cpp @@ -1,7 +1,6 @@ /* UUCProperties.cpp: implementation of the UUCProperties class. * -* Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com -* All Rights Reserved +* Copyright (c) 2018 Istituto Poligrafico e Zecca dello Stato * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/cie_sign_sdk/src/Util/UUCProperties.h b/cie_sign_sdk/src/Util/UUCProperties.h index ea76f7d5..94098984 100644 --- a/cie_sign_sdk/src/Util/UUCProperties.h +++ b/cie_sign_sdk/src/Util/UUCProperties.h @@ -1,21 +1,20 @@ /* UUCProperties.h: interface for the UUCProperties class. -* -* Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com -* All Rights Reserved -* -* This program 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 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* +* Copyright (c) 2018 Istituto Poligrafico e Zecca dello Stato +* +* This program 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 of the License, or +* (at your option) any later version. +* +* This program 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 General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if !defined(AFX_UUCPROPERTIES_H__715BAE3B_069E_4D31_9FBF_54EA38AAEFEC__INCLUDED_) @@ -40,9 +39,9 @@ class UUCProperties long load(const UUCByteArray& props); void putProperty(const char* szName, const char* szValue); //void putProperty(char* szName, char* szValue); - const char* getProperty(const char* szName, const char* szDefaultValue = NULL) const; + const char* getProperty(const char* szName, const char* szDefaultValue = NULL) const; int getIntProperty(const char* szName, int nDefaultValue = 0) const; - + void remove(const char* szName); void removeAll(); diff --git a/cie_sign_sdk/src/Util/UUCStringTable.h b/cie_sign_sdk/src/Util/UUCStringTable.h index 5f4a558d..a7b2cf2c 100644 --- a/cie_sign_sdk/src/Util/UUCStringTable.h +++ b/cie_sign_sdk/src/Util/UUCStringTable.h @@ -1,21 +1,20 @@ /* UUCStringTable.h: interface for the UUCStringTable class. -* -* Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com -* All Rights Reserved -* -* This program 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 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* +* Copyright (c) 2018 Istituto Poligrafico e Zecca dello Stato +* +* This program 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 of the License, or +* (at your option) any later version. +* +* This program 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 General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if !defined(AFX_UUCSTRINGTABLE_H__4392B6C2_89AA_436D_8291_A3D22CFF877B__INCLUDED_) diff --git a/cie_sign_sdk/src/Util/UUCTextFileReader.cpp b/cie_sign_sdk/src/Util/UUCTextFileReader.cpp index 1758d4a9..82c46894 100644 --- a/cie_sign_sdk/src/Util/UUCTextFileReader.cpp +++ b/cie_sign_sdk/src/Util/UUCTextFileReader.cpp @@ -1,21 +1,6 @@ /* UUCTextFile.cpp: implementation of the UUCTextFile class. * - * Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com - * All Rights Reserved - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * SPDX-License-Identifier: BSD-3-Clause */ #include "UUCTextFileReader.h" diff --git a/cie_sign_sdk/src/Util/UUCTextFileReader.h b/cie_sign_sdk/src/Util/UUCTextFileReader.h index 697de49c..bf47675e 100644 --- a/cie_sign_sdk/src/Util/UUCTextFileReader.h +++ b/cie_sign_sdk/src/Util/UUCTextFileReader.h @@ -1,20 +1,5 @@ -/* UUCTextFile.h: interface for the UUCTextFile class. - * Copyright (c) 2000-2018 by Ugo Chirico - http://www.ugochirico.com - * All Rights Reserved - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* UUCTextFile.h: interface for the UUCTextFile class. + * SPDX-License-Identifier: BSD-3-Clause */ #if !defined(AFX_UUCTEXTFILE_H__CD3660A5_B4C5_4CD4_99AC_69AC96D1460F__INCLUDED_)