Merge remote-tracking branch 'benma/license-header'

benma · benma · commit c7e4bdd1fb0b · 2025-12-15T19:13:26.000+01:00
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2023-2024 Shift Crypto AG, Switzerland. All rights reserved.
+Copyright 2023-2025 Shift Crypto AG, Switzerland. All rights reserved.
 
                                  Apache License
                            Version 2.0, January 2004
diff --git a/Makefile b/Makefile
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
 npm_version=$(shell cat NPM_VERSION)
 
 build-protos:
diff --git a/ci.sh b/ci.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: Apache-2.0
 
 set -e
 
diff --git a/examples/btc_miniscript.rs b/examples/btc_miniscript.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use std::str::FromStr;
 
 use bitbox_api::pb;
diff --git a/examples/btc_sign_msg.rs b/examples/btc_sign_msg.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use bitbox_api::pb;
 
 async fn signmsg<R: bitbox_api::runtime::Runtime>() {
diff --git a/examples/btc_sign_op_return.rs b/examples/btc_sign_op_return.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use std::str::FromStr;
 
 use bitbox_api::{pb, Keypath};
diff --git a/examples/btc_sign_psbt.rs b/examples/btc_sign_psbt.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use bitbox_api::pb;
 use std::str::FromStr;
 
diff --git a/examples/btc_signtx.rs b/examples/btc_signtx.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use bitbox_api::pb;
 
 async fn signtx<R: bitbox_api::runtime::Runtime>() {
diff --git a/examples/cardano.rs b/examples/cardano.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use bitbox_api::pb;
 
 async fn demo<R: bitbox_api::runtime::Runtime>() {
diff --git a/examples/eth.rs b/examples/eth.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 const EIP712_MSG: &str = r#"
         {
     "types": {
diff --git a/examples/multithreaded.rs b/examples/multithreaded.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 fn multithreading_type_check<T: Sync + Send>(_t: &T) {}
 
 async fn demo<R: bitbox_api::runtime::Runtime + Sync + Send>() {
diff --git a/examples/simulator.rs b/examples/simulator.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 async fn demo<R: bitbox_api::runtime::Runtime + Sync + Send>() {
     let noise_config = Box::new(bitbox_api::NoiseConfigNoCache {});
     let bitbox = bitbox_api::BitBox::<R>::from_simulator(None, noise_config)
diff --git a/examples/singlethreaded.rs b/examples/singlethreaded.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 async fn demo<R: bitbox_api::runtime::Runtime>() {
     let noise_config = Box::new(bitbox_api::NoiseConfigNoCache {});
     let bitbox = bitbox_api::BitBox::<R>::from_hid_device(
diff --git a/sandbox/src/Accordion.tsx b/sandbox/src/Accordion.tsx
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 import { useState } from 'react';
 import './Accordion.css';
 
diff --git a/sandbox/src/App.tsx b/sandbox/src/App.tsx
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 import { useState } from 'react'
 import * as bitbox from 'bitbox-api';
 import './App.css'
diff --git a/sandbox/src/Bitcoin.tsx b/sandbox/src/Bitcoin.tsx
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 import { ChangeEvent, FormEvent, useState } from 'react'
 import * as bitbox from 'bitbox-api';
 
diff --git a/sandbox/src/Cardano.tsx b/sandbox/src/Cardano.tsx
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 import { ChangeEvent, FormEvent, useState } from 'react'
 import * as bitbox from 'bitbox-api';
 import hexToArrayBuffer from 'hex-to-array-buffer'
diff --git a/sandbox/src/Error.tsx b/sandbox/src/Error.tsx
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 import * as bitbox from 'bitbox-api';
 import { ErrorNotification } from './ErrorNotification';
 import { useEffect, useState } from 'react';
diff --git a/sandbox/src/ErrorNotification.tsx b/sandbox/src/ErrorNotification.tsx
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 import { useEffect } from "react";
 import "./ErrorNotification.css";
 
diff --git a/sandbox/src/Ethereum.tsx b/sandbox/src/Ethereum.tsx
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 import { FormEvent, useState } from 'react'
 import * as bitbox from 'bitbox-api';
 import hexToArrayBuffer from 'hex-to-array-buffer'
diff --git a/sandbox/src/General.tsx b/sandbox/src/General.tsx
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 import { FormEvent, useState } from 'react'
 import * as bitbox from 'bitbox-api';
 
diff --git a/sandbox/src/main.tsx b/sandbox/src/main.tsx
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 import React from 'react'
 import ReactDOM from 'react-dom/client'
 import App from './App.tsx'
diff --git a/sandbox/src/vite-env.d.ts b/sandbox/src/vite-env.d.ts
@@ -1 +1,4 @@
 /// <reference types="vite/client" />
+// SPDX-License-Identifier: Apache-2.0
+
+// Intentionally only contains top-level type references.
diff --git a/sandbox/vite.config.ts b/sandbox/vite.config.ts
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 import { defineConfig } from 'vite'
 import react from '@vitejs/plugin-react-swc'
 import wasm from "vite-plugin-wasm";
diff --git a/scripts/build-protos.rs b/scripts/build-protos.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 //! ```cargo
 //! [dependencies]
 //! # If you change this, also change the version of prost in Cargo.toml.
diff --git a/src/antiklepto.rs b/src/antiklepto.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use thiserror::Error;
 
 use bitcoin::hashes::sha256;
diff --git a/src/btc.rs b/src/btc.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 //! Functions and methods related to Bitcoin.
 
 use crate::runtime::Runtime;
diff --git a/src/cardano.rs b/src/cardano.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use crate::runtime::Runtime;
 
 use crate::error::Error;
diff --git a/src/communication.rs b/src/communication.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use super::u2fframing::{self, U2FFraming};
 use crate::runtime::Runtime;
 use crate::util::Threading;
diff --git a/src/constants.rs b/src/constants.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 #[cfg(any(feature = "wasm", feature = "usb"))]
 pub const VENDOR_ID: u16 = 0x03eb;
 #[cfg(any(feature = "wasm", feature = "usb"))]
diff --git a/src/error.rs b/src/error.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use thiserror::Error;
 
 #[cfg(feature = "wasm")]
diff --git a/src/eth.rs b/src/eth.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use crate::runtime::Runtime;
 
 use crate::error::Error;
diff --git a/src/keypath.rs b/src/keypath.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use crate::error::Error;
 
 pub const HARDENED: u32 = 0x80000000;
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 //! Rust BitBox hardware wallet client library.
 
 #[cfg(all(feature = "wasm", feature = "multithreaded"))]
diff --git a/src/noise.rs b/src/noise.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use crate::util::Threading;
 use thiserror::Error;
 
diff --git a/src/runtime.rs b/src/runtime.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use async_trait::async_trait;
 
 #[cfg_attr(feature = "multithreaded", async_trait)]
diff --git a/src/simulator.rs b/src/simulator.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use async_trait::async_trait;
 use std::io::{Read, Write};
 use std::net::TcpStream;
diff --git a/src/u2fframing.rs b/src/u2fframing.rs
@@ -1,16 +1,4 @@
-// Copyright 2020 Shift Cryptosecurity AG
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: Apache-2.0
 
 use byteorder::BigEndian;
 use byteorder::ReadBytesExt;
diff --git a/src/usb.rs b/src/usb.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use super::constants::{PRODUCT_ID, VENDOR_ID};
 use async_trait::async_trait;
 use thiserror::Error;
diff --git a/src/util.rs b/src/util.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 pub fn remove_leading_zeroes(list: &[u8]) -> Vec<u8> {
     if let Some(first_non_zero) = list.iter().position(|&x| x != 0) {
         list[first_non_zero..].to_vec()
diff --git a/src/wasm/connect.rs b/src/wasm/connect.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use super::{noise, types::TsOnCloseCb, BitBox, JavascriptError};
 use crate::communication;
 use wasm_bindgen::prelude::*;
diff --git a/src/wasm/localstorage.rs b/src/wasm/localstorage.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 pub fn get<T: serde::de::DeserializeOwned>(key: &str) -> Result<T, ()> {
     let window = web_sys::window().ok_or(())?;
     let local_storage = match window.local_storage() {
diff --git a/src/wasm/mod.rs b/src/wasm/mod.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use std::str::FromStr;
 
 mod connect;
diff --git a/src/wasm/noise.rs b/src/wasm/noise.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use super::localstorage;
 
 use crate::noise::{ConfigError, NoiseConfigData};
diff --git a/src/wasm/types.rs b/src/wasm/types.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use super::JavascriptError;
 
 use wasm_bindgen::prelude::*;
diff --git a/tests/test_btc.rs b/tests/test_btc.rs
@@ -1,4 +1,6 @@
 #![cfg(feature = "simulator")]
+// SPDX-License-Identifier: Apache-2.0
+
 // Simulators only run on linux/amd64.
 #![cfg(all(target_os = "linux", target_arch = "x86_64"))]
 
diff --git a/tests/test_btc_psbt.rs b/tests/test_btc_psbt.rs
@@ -1,4 +1,6 @@
 #![cfg(feature = "simulator")]
+// SPDX-License-Identifier: Apache-2.0
+
 // Simulators only run on linux/amd64.
 #![cfg(all(target_os = "linux", target_arch = "x86_64"))]
 
diff --git a/tests/test_cardano.rs b/tests/test_cardano.rs
@@ -1,4 +1,6 @@
 #![cfg(feature = "simulator")]
+// SPDX-License-Identifier: Apache-2.0
+
 // Simulators only run on linux/amd64.
 #![cfg(all(target_os = "linux", target_arch = "x86_64"))]
 
diff --git a/tests/test_device.rs b/tests/test_device.rs
@@ -1,4 +1,6 @@
 #![cfg(feature = "simulator")]
+// SPDX-License-Identifier: Apache-2.0
+
 // Simulators only run on linux/amd64.
 #![cfg(all(target_os = "linux", target_arch = "x86_64"))]
 
diff --git a/tests/util/mod.rs b/tests/util/mod.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 // Since each integration test file is compiled independently and not all integration tests use all
 // of the util functions, the ones that are not used by all integration test files produce a
 // warning.
diff --git a/webhid.js b/webhid.js
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 export async function jsSleep(ms) {
   await new Promise(resolve => setTimeout(resolve, ms));
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright 2023-2024 Shift Crypto AG, Switzerland. All rights reserved.`
	`1`	`+Copyright 2023-2025 Shift Crypto AG, Switzerland. All rights reserved.`
`2`	`2`
`3`	`3`	`Apache License`
`4`	`4`	`Version 2.0, January 2004`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# SPDX-License-Identifier: Apache-2.0`
	`2`	`+`
`1`	`3`	`npm_version=$(shell cat NPM_VERSION)`
`2`	`4`
`3`	`5`	`build-protos:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#!/bin/bash`
	`2`	`+# SPDX-License-Identifier: Apache-2.0`
`2`	`3`
`3`	`4`	`set -e`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: Apache-2.0`
	`2`	`+`
`1`	`3`	`use std::str::FromStr;`
`2`	`4`
`3`	`5`	`use bitbox_api::pb;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: Apache-2.0`
	`2`	`+`
`1`	`3`	`const EIP712_MSG: &str = r#"`
`2`	`4`	`{`
`3`	`5`	`"types": {`