diff --git a/.cargo/config b/.cargo/config index 7ce14af..c91c3f3 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,5 +1,2 @@ -# Copyright (C) 2022 Nicolas Stalder -# SPDX-License-Identifier: Apache-2.0 OR MIT - [net] git-fetch-with-cli = true diff --git a/.gitignore b/.gitignore index ecd7ce7..71af5be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -# Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -# SPDX-License-Identifier: Apache-2.0 OR MIT - /target Cargo.lock tarpaulin-report.html diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d18f2f..c9aee8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,3 @@ -# Copyright (C) 2022 Nitrokey GmbH -# SPDX-License-Identifier: CC0-1.0 - include: 'https://raw.githubusercontent.com/Nitrokey/common-ci-jobs/master/common_jobs.yml' stages: diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index bdc1033..0000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,7 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: piv-authenticator -Source: https://github.com/Nitrokey/piv-authenticator - -Files: tests/default_admin_key -Copyright: 2022 Nitrokey GmbH -License: Apache-2.0 OR MIT diff --git a/CHANGELOG.md b/CHANGELOG.md index 55247b6..e5392df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,3 @@ - - # Changelog ## [v0.3.2][] (2023-06-13) diff --git a/Cargo.toml b/Cargo.toml index 556ac61..0cbbc65 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,3 @@ -# Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -# SPDX-License-Identifier: Apache-2.0 OR MIT - [package] name = "piv-authenticator" version = "0.3.2" diff --git a/Makefile b/Makefile index 16a9048..629d96f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,3 @@ -# Copyright (C) 2022 Nitrokey GmbH -# SPDX-License-Identifier: CC0-1.0 - .NOTPARALLEL: export RUST_LOG ?= info,cargo_tarpaulin=off @@ -24,7 +21,6 @@ lint: cargo check --all-features --all-targets cargo clippy --all-targets --all-features -- -Dwarnings RUSTDOCFLAGS='-Dwarnings' cargo doc --all-features - reuse lint .PHONY: tarpaulin tarpaulin: diff --git a/README.md b/README.md index 68408cb..fe7ac93 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,3 @@ - - PIV-Authenticator ================= @@ -20,7 +15,7 @@ See the [tracking issue for command support](https://github.com/Nitrokey/piv-aut License ------- -This project is licensed under [Apache-2.0][Apache-2.0] OR [MIT][MIT] For more information, see the license header in each file. +This project is licensed under [Apache-2.0][Apache-2.0] OR [MIT][MIT]. Configuration files and examples are licensed under the [CC0 1.0 license][CC0-1.0]. You can find a copy of the license texts in the [`LICENSES`](./LICENSES) directory. @@ -28,10 +23,6 @@ You can find a copy of the license texts in the [`LICENSES`](./LICENSES) directo [Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0.html [MIT]: https://en.wikipedia.org/wiki/MIT_License -This project complies with [version 3.0 of the REUSE specification][reuse]. - -[reuse]: https://reuse.software/practices/3.0/ - Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in `piv-authenticator` by you, shall be licensed as [Apache-2.0][Apache-2.0] OR [MIT][MIT], without any additional terms or conditions. Funding diff --git a/bacon.toml b/bacon.toml index 7642144..9b33895 100644 --- a/bacon.toml +++ b/bacon.toml @@ -1,6 +1,3 @@ -# Copyright (C) 2022 Nicolas Stalder -# SPDX-License-Identifier: Apache-2.0 OR MIT - # This is a configuration file for the bacon tool # More info at https://github.com/Canop/bacon diff --git a/ci/Dockerfile b/ci/Dockerfile index 7896c87..cf08d2e 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,6 +1,3 @@ -# Copyright (C) 2022 Nitrokey GmbH -# SPDX-License-Identifier: CC0-1.0 - FROM docker.io/rust:latest RUN apt update && apt install --yes libpcsclite-dev \ diff --git a/ci/Makefile b/ci/Makefile index 28ae5e9..62d42ff 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -1,6 +1,3 @@ -# Copyright (C) 2022 Nitrokey GmbH -# SPDX-License-Identifier: CC0-1.0 - -include config.mk TAG := registry.git.nitrokey.com/nitrokey/piv-authenticator/piv-authenticator-build diff --git a/ci/entrypoint.sh b/ci/entrypoint.sh index 4c27a27..3fb4bdd 100644 --- a/ci/entrypoint.sh +++ b/ci/entrypoint.sh @@ -1,6 +1,4 @@ #!/bin/sh -# Copyright (C) 2022 Nitrokey GmbH -# SPDX-License-Identifier: CC0-1.0 set -e mkdir -p /app/.cache diff --git a/examples/usbip.rs b/examples/usbip.rs index 065eb86..8e2f691 100644 --- a/examples/usbip.rs +++ b/examples/usbip.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nitrokey GmbH -// SPDX-License-Identifier: CC0-1.0 - use trussed::virt::{self, Ram, UserInterface}; use trussed::{ClientImplementation, Platform}; use trussed_usbip::ClientBuilder; diff --git a/examples/vpicc.rs b/examples/vpicc.rs index 687eed5..674f34f 100644 --- a/examples/vpicc.rs +++ b/examples/vpicc.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nitrokey GmbH -// SPDX-License-Identifier: CC0-1.0 - // To use this, make sure that you have vpcd from vsmartcard installed and configured (e. g. // install vsmartcard-vpcd on Debian). You might have to restart your pcscd, e. g. // `systemctl restart pcscd pcscd.socket`. diff --git a/src/commands.rs b/src/commands.rs index b34cae4..0705e5c 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - //! Parsed PIV commands. //! //! The types here should enforce all restrictions in the spec (such as padded_piv_pin.len() == 8), diff --git a/src/constants.rs b/src/constants.rs index 8bb925a..a2472ea 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - // https://developers.yubico.com/PIV/Introduction/Yubico_extensions.html use hex_literal::hex; diff --git a/src/container.rs b/src/container.rs index fc61edb..58a4aee 100644 --- a/src/container.rs +++ b/src/container.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - use core::convert::TryFrom; use hex_literal::hex; diff --git a/src/derp.rs b/src/derp.rs index f564e6c..bd0af07 100644 --- a/src/derp.rs +++ b/src/derp.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - pub use untrusted::{Input, Reader}; #[derive(Copy, Clone, Debug, Eq, PartialEq)] diff --git a/src/dispatch.rs b/src/dispatch.rs index 67d7e30..6f20256 100644 --- a/src/dispatch.rs +++ b/src/dispatch.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - use crate::{reply::Reply, Authenticator, /*constants::PIV_AID,*/ Result}; use apdu_dispatch::{app::App, command, response, Command}; diff --git a/src/lib.rs b/src/lib.rs index b50f50d..4bfd537 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - #![cfg_attr(not(any(test, feature = "std")), no_std)] #[cfg(not(feature = "delog"))] diff --git a/src/piv_types.rs b/src/piv_types.rs index 037bd85..7556903 100644 --- a/src/piv_types.rs +++ b/src/piv_types.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - use core::convert::{TryFrom, TryInto}; use flexiber::Encodable; diff --git a/src/reply.rs b/src/reply.rs index 477a568..74101c3 100644 --- a/src/reply.rs +++ b/src/reply.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - use iso7816::Status; use core::ops::{Deref, DerefMut}; diff --git a/src/state.rs b/src/state.rs index a4c1e3d..2c76f1b 100644 --- a/src/state.rs +++ b/src/state.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - use core::convert::{TryFrom, TryInto}; use core::mem::replace; diff --git a/src/tlv.rs b/src/tlv.rs index d99c509..4df4d64 100644 --- a/src/tlv.rs +++ b/src/tlv.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - //! Utilities for dealing with TLV (Tag-Length-Value) encoded data #[allow(unused)] diff --git a/src/virt.rs b/src/virt.rs index d08db71..5061559 100644 --- a/src/virt.rs +++ b/src/virt.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - //! Virtual trussed client (mostly for testing) pub mod dispatch { diff --git a/src/vpicc.rs b/src/vpicc.rs index a484105..fae35e8 100644 --- a/src/vpicc.rs +++ b/src/vpicc.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - use iso7816::{command::FromSliceError, Command, Status}; use trussed::virt::Ram; diff --git a/tests/card/mod.rs b/tests/card/mod.rs index 90dbca6..0021789 100644 --- a/tests/card/mod.rs +++ b/tests/card/mod.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - use piv_authenticator::{virt::with_ram_client, vpicc::VpiccCard, Authenticator, Options}; use std::{sync::mpsc, thread::sleep, time::Duration}; diff --git a/tests/command_response.ron b/tests/command_response.ron index e8ff10c..6c39720 100644 --- a/tests/command_response.ron +++ b/tests/command_response.ron @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - [ IoTest( name: "Verify", diff --git a/tests/command_response.rs b/tests/command_response.rs index 64f4a57..45f7e70 100644 --- a/tests/command_response.rs +++ b/tests/command_response.rs @@ -1,5 +1,3 @@ -// Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT #![cfg(feature = "virt")] mod setup; diff --git a/tests/opensc.rs b/tests/opensc.rs index a3d442e..aa140bd 100644 --- a/tests/opensc.rs +++ b/tests/opensc.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - #![cfg(all(feature = "vpicc", feature = "opensc-tests"))] mod card; diff --git a/tests/pivy.rs b/tests/pivy.rs index 0f8f50a..1ed9323 100644 --- a/tests/pivy.rs +++ b/tests/pivy.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - #![cfg(all(feature = "vpicc", feature = "pivy-tests"))] mod card; diff --git a/tests/setup/mod.rs b/tests/setup/mod.rs index ad56697..875f8a8 100644 --- a/tests/setup/mod.rs +++ b/tests/setup/mod.rs @@ -1,6 +1,3 @@ -// Copyright (C) 2022 Nicolas Stalder AND Nitrokey GmbH -// SPDX-License-Identifier: Apache-2.0 OR MIT - #[allow(unused)] pub const COMMAND_SIZE: usize = 3072;