Change license to BSD-2-Clause

.github/workflows/ci.yaml

@@ -34,3 +34,14 @@ jobs:
 
       - name: make windows
         run: make windows
+
+  reuse-compliance-check:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: REUSE Compliance Check
+      uses: fsfe/reuse-action@v4
+      with:
+        args: lint

.github/workflows/golangci-lint.yml

@@ -15,18 +15,18 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: '1.21'
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           # Require: The version of golangci-lint to use.
           # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
           # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.55.2
+          version: v1.61.0
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.golangci.yml

@@ -20,9 +20,10 @@ linters:
     - gocognit
     - nestif
     - exhaustruct  # TODO? annoying for now
-    - goerr113  # TODO enable later
+    - err113  # TODO enable later
     - godot
     - depguard
+    - perfsprint
 
 issues:
   max-issues-per-linter: 0

.goreleaser.yaml

@@ -156,7 +156,7 @@ nfpms:
        residing in the hardware TKey, a USB stick.
 
     # Your app's license.
-    license: GPL 2.0
+    license: BSD-2-clause
 
     # Formats to be generated.
     formats:

LICENSES/BSD-2-Clause.txt

@@ -0,0 +1,24 @@
+Copyright 2022 Tillitis AB <tillitis.se>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -241,26 +241,11 @@ For details on how we package and build an MSI installer, see
 
 ## Licenses and SPDX tags
 
-Unless otherwise noted, the project sources are licensed under the
-terms and conditions of the "GNU General Public License v2.0 only":
-
-> Copyright Tillitis AB.
->
-> These programs are 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, version 2 only.
->
-> These programs are 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:
->
-> https://www.gnu.org/licenses
-
-See [LICENSE](LICENSE) for the full GPLv2-only license text.
+Unless otherwise noted, the project sources are copyright Tillitis AB,
+licensed under the terms and conditions of the "BSD-2-Clause" license.
+See [LICENSE](LICENSE) for the full license text.
+
+Until Oct 22, 2024, the license was GPL-2.0 Only.
 
 External source code we have imported are isolated in their own
 directories. They may be released under other licenses. This is noted
@@ -278,5 +263,5 @@ the SPDX License List at:
 
 https://spdx.org/licenses/
 
-All contributors must adhere to the [Developer Certificate of Origin](dco.md).
-
+We attempt to follow the [REUSE
+specification](https://reuse.software/).

REUSE.toml

@@ -0,0 +1,48 @@
+# SPDX-FileCopyrightText: 2024 Tillitis AB <tillitis.se>
+# SPDX-License-Identifier: BSD-2-Clause
+version = 1
+
+[[annotations]]
+path = ".github/workflows/*"
+SPDX-FileCopyrightText = "2022 Tillitis AB <tillitis.se>"
+SPDX-License-Identifier = "BSD-2-Clause"
+
+[[annotations]]
+path = [
+     "cmd/tkey-ssh-agent/signer.bin-v1.0.2",
+     "cmd/tkey-ssh-agent/signer.bin.sha512",
+     "cmd/tkey-ssh-agent/winres/icon.png",
+     "cmd/tkey-ssh-agent/winres/icon16.png",
+     "cmd/tkey-ssh-agent/winres/winres.json",
+     "cmd/tkey-ssh-agent-tray/trayicon.ico",
+     "cmd/tkey-ssh-agent-tray/winres/icon.png",
+     "cmd/tkey-ssh-agent-tray/winres/icon16.png",
+     "cmd/tkey-ssh-agent-tray/winres/winres.json",
+     "docs/release_notes.md",
+     "gotools/Makefile",
+     "gotools/go.mod",
+     "gotools/go.sum",
+     "system/60-tkey.rules",
+     "system/copyright",
+     "system/tkey-ssh-agent.1",
+     "system/tkey-ssh-agent.service",
+     "system/tkey-ssh-agent.service.tmpl",
+     "system/windows/Dockerfile",
+     "system/windows/Makefile",
+     "system/windows/README.md",
+     "system/windows/tillitis-ant.ico",
+     "system/windows/tkey-ssh-agent.wxs",
+     "test/requirements.txt",
+     ".editorconfig",
+     ".gitignore",
+     ".golangci.yml",
+     ".goreleaser.yaml",
+     "Makefile",
+     "README.md",
+     "go.mod",
+     "go.sum",
+     "gon.hcl",
+     "tillitis-ant.png",
+]
+SPDX-FileCopyrightText = "2022 Tillitis AB <tillitis.se>"
+SPDX-License-Identifier = "BSD-2-Clause"

cmd/tkey-ssh-agent-tray/main.go

@@ -1,5 +1,5 @@
-// Copyright (C) 2023 - Tillitis AB
-// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: 2022 Tillitis AB <tillitis.se>
+// SPDX-License-Identifier: BSD-2-Clause
 
 //go:build windows
 

cmd/tkey-ssh-agent/listen_unix.go

@@ -1,5 +1,5 @@
-// Copyright (C) 2023 - Tillitis AB
-// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: 2023 Tillitis AB <tillitis.se>
+// SPDX-License-Identifier: BSD-2-Clause
 
 //go:build unix
 

cmd/tkey-ssh-agent/listen_windows.go

@@ -1,5 +1,5 @@
-// Copyright (C) 2023 - Tillitis AB
-// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: 2023 Tillitis AB <tillitis.se>
+// SPDX-License-Identifier: BSD-2-Clause
 
 //go:build windows
 

cmd/tkey-ssh-agent/main.go

@@ -1,5 +1,5 @@
-// Copyright (C) 2022, 2023 - Tillitis AB
-// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: 2022 Tillitis AB <tillitis.se>
+// SPDX-License-Identifier: BSD-2-Clause
 
 package main
 

cmd/tkey-ssh-agent/pinentry.go

@@ -1,5 +1,5 @@
-// Copyright (C) 2022, 2023 - Tillitis AB
-// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: 2022 Tillitis AB <tillitis.se>
+// SPDX-License-Identifier: BSD-2-Clause
 
 package main
 

cmd/tkey-ssh-agent/signer.bin.sha512

@@ -1 +1 @@
-fe4458e4125966885d9b745a25422948d76e60371165b97729fce1b423f22b87929c684b4381f2220aa0c94266ba035730d5f08a6e6e0aab7d7bf15165d2fff6  signer.bin-v1.0.0
+fe4458e4125966885d9b745a25422948d76e60371165b97729fce1b423f22b87929c684b4381f2220aa0c94266ba035730d5f08a6e6e0aab7d7bf15165d2fff6  signer.bin-v1.0.2

cmd/tkey-ssh-agent/signer.go

@@ -1,5 +1,5 @@
-// Copyright (C) 2022, 2023 - Tillitis AB
-// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: 2022 Tillitis AB <tillitis.se>
+// SPDX-License-Identifier: BSD-2-Clause
 
 package main
 
@@ -27,10 +27,10 @@ import (
 // nolint:typecheck // Avoid lint error when the embedding file is missing.
 // Makefile copies the built app here ./app.bin
 //
-//go:embed signer.bin-v1.0.0
+//go:embed signer.bin-v1.0.2
 var appBinary []byte
 
-const appName string = "tkey-device-signer 1.0.0"
+const appName string = "tkey-device-signer 1.0.2"
 
 var notify = func(msg string) {
 	tkeyutil.Notify(progname, msg)

cmd/tkey-ssh-agent/sshagent.go

@@ -1,5 +1,5 @@
-// Copyright (C) 2022, 2023 - Tillitis AB
-// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: 2022 Tillitis AB <tillitis.se>
+// SPDX-License-Identifier: BSD-2-Clause
 
 package main
 
@@ -51,7 +51,7 @@ func (s *SSHAgent) Serve(absSockPath string) error {
 }
 
 func (s *SSHAgent) handleConn(c net.Conn) {
-	if err := agent.ServeAgent(s, c); !errors.Is(io.EOF, err) {
+	if err := agent.ServeAgent(s, c); !errors.Is(err, io.EOF) {
 		le.Printf("Agent client connection ended with error: %s\n", err)
 	}
 }

go.mod

@@ -1,42 +1,48 @@
 module github.com/tillitis/tkey-ssh-agent
 
-go 1.19
+go 1.22.0
 
 require (
-	github.com/Microsoft/go-winio v0.6.1
+	github.com/Microsoft/go-winio v0.6.2
 	github.com/apenwarr/fixconsole v0.0.0-20191012055117-5a9f6489cc29
-	github.com/getlantern/systray v1.2.1
+	github.com/getlantern/systray v1.2.2
 	github.com/spf13/pflag v1.0.5
-	github.com/tawesoft/golib/v2 v2.9.0
-	github.com/tillitis/tkeyclient v1.0.0
-	github.com/tillitis/tkeysign v1.0.0
-	github.com/tillitis/tkeyutil v0.0.7
+	github.com/tawesoft/golib/v2 v2.16.0
+	github.com/tillitis/tkeyclient v1.1.0
+	github.com/tillitis/tkeysign v1.0.1
+	github.com/tillitis/tkeyutil v0.0.8
 	github.com/twpayne/go-pinentry-minimal v0.0.0-20220113210447-2a5dc4396c2a
-	golang.org/x/crypto v0.22.0
+	golang.org/x/crypto v0.29.0
 )
 
 require (
-	github.com/alessio/shellescape v1.4.1 // indirect
+	github.com/alessio/shellescape v1.4.2 // indirect
 	github.com/apenwarr/w32 v0.0.0-20190407065021-aa00fece76ab // indirect
+	github.com/ccoveille/go-safecast v1.1.0 // indirect
 	github.com/creack/goselect v0.1.2 // indirect
-	github.com/gen2brain/beeep v0.0.0-20230907135156-1a38885a97fc // indirect
-	github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 // indirect
-	github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7 // indirect
-	github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7 // indirect
-	github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 // indirect
-	github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 // indirect
-	github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/gen2brain/beeep v0.0.0-20240516210008-9c006672e7f4 // indirect
+	github.com/getlantern/context v0.0.0-20220418194847-3d5e7a086201 // indirect
+	github.com/getlantern/errors v1.0.4 // indirect
+	github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65 // indirect
+	github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect
+	github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770 // indirect
+	github.com/getlantern/ops v0.0.0-20231025133620-f368ab734534 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
 	github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
 	github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
 	github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
 	go.bug.st/serial v1.6.2 // indirect
-	golang.org/x/exp v0.0.0-20221208152030-732eee02a75a // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/term v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.16.0 // indirect
+	go.opentelemetry.io/otel v1.31.0 // indirect
+	go.opentelemetry.io/otel/metric v1.31.0 // indirect
+	go.opentelemetry.io/otel/trace v1.31.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	golang.org/x/term v0.26.0 // indirect
+	golang.org/x/text v0.20.0 // indirect
 )