From 47fbed75048ab03355f839015664e12757b5540a Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Wed, 2 Sep 2020 21:40:32 -0700 Subject: Adjust copyright & license specification to comply with REUSE 3.0 With this change we switch to using a REUSE compliant way of specifying the copyright & license of the program. To be fully in conformance we also add additional license specifications for the remaining files in the project. Lastly, a new CI pipeline rule takes care of verifying compliance on an ongoing basis. --- src/arg_util.rs | 18 ++---------------- src/args.rs | 18 ++---------------- src/commands.rs | 18 ++---------------- src/config.rs | 18 ++---------------- src/main.rs | 18 ++---------------- src/pinentry.rs | 18 ++---------------- src/redefine.rs | 18 ++---------------- src/tests/config.rs | 18 ++---------------- src/tests/encrypted.rs | 18 ++---------------- src/tests/hidden.rs | 18 ++---------------- src/tests/list.rs | 18 ++---------------- src/tests/lock.rs | 18 ++---------------- src/tests/mod.rs | 18 ++---------------- src/tests/otp.rs | 18 ++---------------- src/tests/pin.rs | 18 ++---------------- src/tests/pws.rs | 18 ++---------------- src/tests/reset.rs | 18 ++---------------- src/tests/run.rs | 18 ++---------------- src/tests/status.rs | 18 ++---------------- src/tests/unencrypted.rs | 18 ++---------------- 20 files changed, 40 insertions(+), 320 deletions(-) (limited to 'src') diff --git a/src/arg_util.rs b/src/arg_util.rs index 1c5d38f..b1dd60f 100644 --- a/src/arg_util.rs +++ b/src/arg_util.rs @@ -1,21 +1,7 @@ // arg_util.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later macro_rules! count { ($head:ident) => { 1 }; diff --git a/src/args.rs b/src/args.rs index 4b12ceb..3052afa 100644 --- a/src/args.rs +++ b/src/args.rs @@ -1,21 +1,7 @@ // args.rs -// ************************************************************************* -// * Copyright (C) 2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later /// Provides access to a Nitrokey device #[derive(Debug, structopt::StructOpt)] diff --git a/src/commands.rs b/src/commands.rs index 30651c1..67d230e 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -1,21 +1,7 @@ // commands.rs -// ************************************************************************* -// * Copyright (C) 2018-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2018-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use std::convert::TryFrom as _; use std::fmt; diff --git a/src/config.rs b/src/config.rs index c0f150c..aceda38 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,21 +1,7 @@ // config.rs -// ************************************************************************* -// * Copyright (C) 2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use std::fs; use std::path; diff --git a/src/main.rs b/src/main.rs index e4ff601..baad15c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,21 +1,7 @@ // main.rs -// ************************************************************************* -// * Copyright (C) 2017-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2017-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later #![warn( bad_style, diff --git a/src/pinentry.rs b/src/pinentry.rs index 0121754..3bf67c1 100644 --- a/src/pinentry.rs +++ b/src/pinentry.rs @@ -1,21 +1,7 @@ // pinentry.rs -// ************************************************************************* -// * Copyright (C) 2017-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2017-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use std::borrow; use std::fmt; diff --git a/src/redefine.rs b/src/redefine.rs index 2e37b1e..dad4529 100644 --- a/src/redefine.rs +++ b/src/redefine.rs @@ -1,21 +1,7 @@ // redefine.rs -// ************************************************************************* -// * Copyright (C) 2019 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later // A replacement of the standard println!() macro that requires an // execution context as the first argument and prints to its stdout. diff --git a/src/tests/config.rs b/src/tests/config.rs index c4d412f..75ec983 100644 --- a/src/tests/config.rs +++ b/src/tests/config.rs @@ -1,21 +1,7 @@ // config.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use super::*; diff --git a/src/tests/encrypted.rs b/src/tests/encrypted.rs index ec0fb51..485bb6e 100644 --- a/src/tests/encrypted.rs +++ b/src/tests/encrypted.rs @@ -1,21 +1,7 @@ // encrypted.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use super::*; diff --git a/src/tests/hidden.rs b/src/tests/hidden.rs index e261a72..82a4630 100644 --- a/src/tests/hidden.rs +++ b/src/tests/hidden.rs @@ -1,21 +1,7 @@ // hidden.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use super::*; diff --git a/src/tests/list.rs b/src/tests/list.rs index 63aeac1..7ff88a7 100644 --- a/src/tests/list.rs +++ b/src/tests/list.rs @@ -1,21 +1,7 @@ // list.rs -// ************************************************************************* -// * Copyright (C) 2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use super::*; diff --git a/src/tests/lock.rs b/src/tests/lock.rs index 4a32c9c..e04e8eb 100644 --- a/src/tests/lock.rs +++ b/src/tests/lock.rs @@ -1,21 +1,7 @@ // lock.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use super::*; diff --git a/src/tests/mod.rs b/src/tests/mod.rs index 298dde9..e1f93a9 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -1,21 +1,7 @@ // mod.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use std::ffi; diff --git a/src/tests/otp.rs b/src/tests/otp.rs index 59fd319..d907f18 100644 --- a/src/tests/otp.rs +++ b/src/tests/otp.rs @@ -1,21 +1,7 @@ // otp.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use super::*; diff --git a/src/tests/pin.rs b/src/tests/pin.rs index 416a7f8..551454c 100644 --- a/src/tests/pin.rs +++ b/src/tests/pin.rs @@ -1,21 +1,7 @@ // pin.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use nitrokey::Authenticate; use nitrokey::Device; diff --git a/src/tests/pws.rs b/src/tests/pws.rs index d0e8907..45c4400 100644 --- a/src/tests/pws.rs +++ b/src/tests/pws.rs @@ -1,21 +1,7 @@ // pws.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use super::*; diff --git a/src/tests/reset.rs b/src/tests/reset.rs index cbac676..a7b2097 100644 --- a/src/tests/reset.rs +++ b/src/tests/reset.rs @@ -1,21 +1,7 @@ // reset.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use nitrokey::Authenticate; use nitrokey::GetPasswordSafe; diff --git a/src/tests/run.rs b/src/tests/run.rs index 90e3067..4d470f6 100644 --- a/src/tests/run.rs +++ b/src/tests/run.rs @@ -1,21 +1,7 @@ // run.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use std::path; diff --git a/src/tests/status.rs b/src/tests/status.rs index 983afa7..0fd5b5b 100644 --- a/src/tests/status.rs +++ b/src/tests/status.rs @@ -1,21 +1,7 @@ // status.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use super::*; diff --git a/src/tests/unencrypted.rs b/src/tests/unencrypted.rs index 574b53a..26c6604 100644 --- a/src/tests/unencrypted.rs +++ b/src/tests/unencrypted.rs @@ -1,21 +1,7 @@ // unencrypted.rs -// ************************************************************************* -// * Copyright (C) 2019-2020 The Nitrocli Developers * -// * * -// * 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 3 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, see . * -// ************************************************************************* +// Copyright (C) 2019-2020 The Nitrocli Developers +// SPDX-License-Identifier: GPL-3.0-or-later use super::*; -- cgit v1.2.1