Merge pull request #79 from italia/copyright-fixes

Finalise license change - Fixes #16
italia · Jul 8, 2024 · 25c42c1 · 25c42c1
2 parents d370df8 + 6656ffb
commit 25c42c1
Show file tree

Hide file tree

Showing 43 changed files with 106 additions and 374 deletions.
diff --git 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 <iostream>
@@ -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
@@ -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
@@ -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
@@ -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 <string.h>
 #include "IAS.h"

diff --git 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 <string>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <stdio.h>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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_)