From 7354aa0d08a06eac42c635670a55f858bd23c943 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Fri, 23 Dec 2022 12:28:06 +0100
Subject: [PATCH 01/45] internal/bech32: remove data length limit

Fixes #453
---
 cmd/age/age_test.go            | 35 ++++++++++++++++++++++++++++++++++
 cmd/age/testdata/plugin.txt    | 20 +++++++++++++++++++
 internal/bech32/bech32.go      |  6 ------
 internal/bech32/bech32_test.go |  9 +++++----
 4 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 cmd/age/testdata/plugin.txt

diff --git a/cmd/age/age_test.go b/cmd/age/age_test.go
index 7dfd5fe..a95cdbe 100644
--- a/cmd/age/age_test.go
+++ b/cmd/age/age_test.go
@@ -5,6 +5,7 @@
 package main
 
 import (
+	"bufio"
 	"os"
 	"testing"
 
@@ -28,11 +29,45 @@ func TestMain(m *testing.M) {
 			main()
 			return 0
 		},
+		"age-plugin-test": func() (exitCode int) {
+			// TODO: use plugin server package once it's available.
+			switch os.Args[1] {
+			case "--age-plugin=recipient-v1":
+				scanner := bufio.NewScanner(os.Stdin)
+				scanner.Scan() // add-recipient
+				scanner.Scan() // body
+				scanner.Scan() // wrap-file-key
+				scanner.Scan() // body
+				fileKey := scanner.Text()
+				scanner.Scan() // done
+				scanner.Scan() // body
+				os.Stdout.WriteString("-> recipient-stanza 0 test\n")
+				os.Stdout.WriteString(fileKey + "\n")
+				os.Stdout.WriteString("-> done\n\n")
+				return 0
+			case "--age-plugin=identity-v1":
+				scanner := bufio.NewScanner(os.Stdin)
+				scanner.Scan() // add-identity
+				scanner.Scan() // body
+				scanner.Scan() // recipient-stanza
+				scanner.Scan() // body
+				fileKey := scanner.Text()
+				scanner.Scan() // done
+				scanner.Scan() // body
+				os.Stdout.WriteString("-> file-key 0\n")
+				os.Stdout.WriteString(fileKey + "\n")
+				os.Stdout.WriteString("-> done\n\n")
+				return 0
+			default:
+				return 1
+			}
+		},
 	}))
 }
 
 func TestScript(t *testing.T) {
 	testscript.Run(t, testscript.Params{
 		Dir: "testdata",
+		// TODO: enable AGEDEBUG=plugin without breaking stderr checks.
 	})
 }
diff --git a/cmd/age/testdata/plugin.txt b/cmd/age/testdata/plugin.txt
new file mode 100644
index 0000000..01e3ed8
--- /dev/null
+++ b/cmd/age/testdata/plugin.txt
@@ -0,0 +1,20 @@
+# encrypt and decrypt a file with a test plugin
+age -r age1test10qdmzv9q -o test.age input
+age -d -i key.txt test.age
+cmp stdout input
+! stderr .
+
+# very long identity and recipient
+age -R long-recipient.txt -o test.age input
+age -d -i long-key.txt test.age
+cmp stdout input
+! stderr .
+
+-- input --
+test
+-- key.txt --
+AGE-PLUGIN-TEST-10Q32NLXM
+-- long-recipient.txt --
+age1test10pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7qj6rl8p
+-- long-key.txt --
+AGE-PLUGIN-TEST-10PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7Q5U8SUD
diff --git a/internal/bech32/bech32.go b/internal/bech32/bech32.go
index c12864f..6f8a48c 100644
--- a/internal/bech32/bech32.go
+++ b/internal/bech32/bech32.go
@@ -111,9 +111,6 @@ func Encode(hrp string, data []byte) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	if len(hrp)+len(values)+7 > 90 {
-		return "", fmt.Errorf("too long: hrp length=%d, data length=%d", len(hrp), len(values))
-	}
 	if len(hrp) < 1 {
 		return "", fmt.Errorf("invalid HRP: %q", hrp)
 	}
@@ -144,9 +141,6 @@ func Encode(hrp string, data []byte) (string, error) {
 
 // Decode decodes a Bech32 string. If the string is uppercase, the HRP will be uppercase.
 func Decode(s string) (hrp string, data []byte, err error) {
-	if len(s) > 90 {
-		return "", nil, fmt.Errorf("too long: len=%d", len(s))
-	}
 	if strings.ToLower(s) != s && strings.ToUpper(s) != s {
 		return "", nil, fmt.Errorf("mixed case")
 	}
diff --git a/internal/bech32/bech32_test.go b/internal/bech32/bech32_test.go
index 4568d62..01ce361 100644
--- a/internal/bech32/bech32_test.go
+++ b/internal/bech32/bech32_test.go
@@ -28,7 +28,7 @@ func TestBech32(t *testing.T) {
 		str   string
 		valid bool
 	}{
-		{"A12UEL5L", true},
+		{"A12UEL5L", true}, // empty
 		{"a12uel5l", true},
 		{"an83characterlonghumanreadablepartthatcontainsthenumber1andtheexcludedcharactersbio1tt5tgs", true},
 		{"abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw", true},
@@ -44,11 +44,12 @@ func TestBech32(t *testing.T) {
 		{"1checkupstagehandshakeupstreamerranterredcaperred2y9e3w", false}, // empty hrp
 		// invalid character (DEL) in hrp
 		{"spl" + string(rune(127)) + "t1checkupstagehandshakeupstreamerranterredcaperred2y9e3w", false},
-		// too long
-		{"11qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqsqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqc8247j", false},
+
+		// long vectors that we do accept despite the spec, see Issue 453
+		{"long10pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7qfcsvr0", true},
+		{"an84characterslonghumanreadablepartthatcontainsthenumber1andtheexcludedcharactersbio1569pvx", true},
 
 		// BIP 173 invalid vectors.
-		{"an84characterslonghumanreadablepartthatcontainsthenumber1andtheexcludedcharactersbio1569pvx", false},
 		{"pzry9x0s0muk", false},
 		{"1pzry9x0s0muk", false},
 		{"x1b4n0q5v", false},

From a1fabee4c8c5ebe4569cc692f39489406ccd4ad0 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Mon, 26 Dec 2022 21:28:00 +0100
Subject: [PATCH 02/45] all: upgrade dependencies

---
 go.mod | 10 +++++-----
 go.sum | 22 ++++++++--------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/go.mod b/go.mod
index d4d5b40..eaaefd5 100644
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,12 @@
 module filippo.io/age
 
-go 1.17
+go 1.19
 
 require (
-	filippo.io/edwards25519 v1.0.0-rc.1
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
-	golang.org/x/sys v0.0.0-20210903071746-97244b99971b
-	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
+	filippo.io/edwards25519 v1.0.0
+	golang.org/x/crypto v0.4.0
+	golang.org/x/sys v0.3.0
+	golang.org/x/term v0.3.0
 )
 
 // Test dependencies.
diff --git a/go.sum b/go.sum
index c415032..3f691a9 100644
--- a/go.sum
+++ b/go.sum
@@ -1,20 +1,14 @@
-filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU=
-filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
+filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
+filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
 github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e h1:hLDldUUKSNgXte+2H8yZzPVStWa7697IJer9wwfW/dg=
 github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e/go.mod h1:dNbK7mWDMlmf5ttOAJJg+a4CyamnqDRrw+Uja1sBETc=
 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210903071746-97244b99971b h1:3Dq0eVHn0uaQJmPO+/aYPI/fRMqdrVDbu7MQcku54gg=
-golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
-golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
+golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=

From c6dcfa1efcaa27879762a934d5bea0d1b83a894c Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Mon, 26 Dec 2022 21:29:10 +0100
Subject: [PATCH 03/45] all: temporarily disable testscript tests

They require a replace directive that breaks "go install". Will revert
this after tagging a new latest release.
---
 cmd/age/age_test.go | 2 ++
 go.mod              | 9 ---------
 go.sum              | 6 ------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/cmd/age/age_test.go b/cmd/age/age_test.go
index a95cdbe..975af17 100644
--- a/cmd/age/age_test.go
+++ b/cmd/age/age_test.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
+
 package main
 
 import (
diff --git a/go.mod b/go.mod
index eaaefd5..ad5526b 100644
--- a/go.mod
+++ b/go.mod
@@ -8,12 +8,3 @@ require (
 	golang.org/x/sys v0.3.0
 	golang.org/x/term v0.3.0
 )
-
-// Test dependencies.
-require (
-	github.com/creack/pty v1.1.18 // indirect
-	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
-	github.com/rogpeppe/go-internal v1.8.1
-)
-
-replace github.com/rogpeppe/go-internal => github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e
diff --git a/go.sum b/go.sum
index 3f691a9..e5a1adc 100644
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,5 @@
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
-github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e h1:hLDldUUKSNgXte+2H8yZzPVStWa7697IJer9wwfW/dg=
-github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e/go.mod h1:dNbK7mWDMlmf5ttOAJJg+a4CyamnqDRrw+Uja1sBETc=
-github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
-github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
 golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=

From 5471e05672de168766f5f11453fd324c53c264e5 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Mon, 26 Dec 2022 22:09:03 +0100
Subject: [PATCH 04/45] Revert "all: temporarily disable testscript tests"

This reverts commit 90a446549a5f003c09e76ccb057051969eadd17a.
---
 cmd/age/age_test.go | 2 --
 go.mod              | 9 +++++++++
 go.sum              | 6 ++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/cmd/age/age_test.go b/cmd/age/age_test.go
index 975af17..a95cdbe 100644
--- a/cmd/age/age_test.go
+++ b/cmd/age/age_test.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build ignore
-
 package main
 
 import (
diff --git a/go.mod b/go.mod
index ad5526b..eaaefd5 100644
--- a/go.mod
+++ b/go.mod
@@ -8,3 +8,12 @@ require (
 	golang.org/x/sys v0.3.0
 	golang.org/x/term v0.3.0
 )
+
+// Test dependencies.
+require (
+	github.com/creack/pty v1.1.18 // indirect
+	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
+	github.com/rogpeppe/go-internal v1.8.1
+)
+
+replace github.com/rogpeppe/go-internal => github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e
diff --git a/go.sum b/go.sum
index e5a1adc..3f691a9 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,11 @@
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
+github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e h1:hLDldUUKSNgXte+2H8yZzPVStWa7697IJer9wwfW/dg=
+github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e/go.mod h1:dNbK7mWDMlmf5ttOAJJg+a4CyamnqDRrw+Uja1sBETc=
+github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
 golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=

From edf7388f7731b274b055dcab3ec4006cc4961b68 Mon Sep 17 00:00:00 2001
From: "Berk D. Demir" <bdd@mindcast.org>
Date: Thu, 29 Dec 2022 12:34:31 -0800
Subject: [PATCH 05/45] age: depend on c2sp.org/CCTV/age for TestVectors

Simplifies importing test data from CCTV without needing to invoke
"go mod download" from TestVectors. Makes life easier for package
builders with no networking, like Nixpkgs.
---
 go.mod          |  1 +
 go.sum          |  2 ++
 testkit_test.go | 33 ++++++---------------------------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/go.mod b/go.mod
index eaaefd5..7f5a6b8 100644
--- a/go.mod
+++ b/go.mod
@@ -11,6 +11,7 @@ require (
 
 // Test dependencies.
 require (
+	c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03
 	github.com/creack/pty v1.1.18 // indirect
 	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
 	github.com/rogpeppe/go-internal v1.8.1
diff --git a/go.sum b/go.sum
index 3f691a9..ec52009 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,5 @@
+c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03 h1:0e2QjhWG02SgzlUOvNYaFraf04OBsUPOLxf+K+Ae/yM=
+c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03/go.mod h1:FomMrUJ2Lxt5jCLmZkG3FHa72zUprnhd3v/Z18Snm4w=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
 github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e h1:hLDldUUKSNgXte+2H8yZzPVStWa7697IJer9wwfW/dg=
diff --git a/testkit_test.go b/testkit_test.go
index e4480b4..ab315e5 100644
--- a/testkit_test.go
+++ b/testkit_test.go
@@ -11,50 +11,29 @@ import (
 	"bytes"
 	"crypto/sha256"
 	"encoding/hex"
-	"encoding/json"
 	"errors"
 	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
+	"io/fs"
 	"strings"
 	"testing"
 
 	"filippo.io/age"
 	"filippo.io/age/armor"
+
+	agetest "c2sp.org/CCTV/age"
 )
 
 func TestVectors(t *testing.T) {
-	if _, err := exec.LookPath("go"); err != nil {
-		t.Skipf("skipping test because 'go' command is unavailable: %v", err)
-	}
-
-	// Download the testkit files from CCTV using `go mod download -json` so the
-	// cached source of the testdata can be reused.
-	path := "c2sp.org/CCTV/age@v0.0.0-20221027185432-cfaa74dc42af"
-	cmd := exec.Command("go", "mod", "download", "-json", path)
-	output, err := cmd.Output()
-	if err != nil {
-		t.Fatalf("failed to run `go mod download -json %s`, output: %s", path, output)
-	}
-	var dm struct {
-		Dir string // absolute path to cached source root directory
-	}
-	if err := json.Unmarshal(output, &dm); err != nil {
-		t.Fatal(err)
-	}
-	testkitDir := filepath.Join(dm.Dir, "testdata")
-
-	tests, err := filepath.Glob(testkitDir + "/*")
+	tests, err := fs.ReadDir(agetest.Vectors, ".")
 	if err != nil {
 		t.Fatal(err)
 	}
 	for _, test := range tests {
-		contents, err := os.ReadFile(test)
+		name := test.Name()
+		contents, err := fs.ReadFile(agetest.Vectors, name)
 		if err != nil {
 			t.Fatal(err)
 		}
-		name := filepath.Base(test)
 		t.Run(name, func(t *testing.T) {
 			testVector(t, contents)
 		})

From 8e3f74c283b2e9b3cd0ec661fa4008504e536d20 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Mon, 2 Jan 2023 13:31:28 +0100
Subject: [PATCH 06/45] cmd/age: deflake TestScript and update testscript

---
 cmd/age/age_test.go | 4 ++++
 go.mod              | 4 ++--
 go.sum              | 6 ++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cmd/age/age_test.go b/cmd/age/age_test.go
index a95cdbe..3d8793b 100644
--- a/cmd/age/age_test.go
+++ b/cmd/age/age_test.go
@@ -43,6 +43,8 @@ func TestMain(m *testing.M) {
 				scanner.Scan() // body
 				os.Stdout.WriteString("-> recipient-stanza 0 test\n")
 				os.Stdout.WriteString(fileKey + "\n")
+				scanner.Scan() // ok
+				scanner.Scan() // body
 				os.Stdout.WriteString("-> done\n\n")
 				return 0
 			case "--age-plugin=identity-v1":
@@ -56,6 +58,8 @@ func TestMain(m *testing.M) {
 				scanner.Scan() // body
 				os.Stdout.WriteString("-> file-key 0\n")
 				os.Stdout.WriteString(fileKey + "\n")
+				scanner.Scan() // ok
+				scanner.Scan() // body
 				os.Stdout.WriteString("-> done\n\n")
 				return 0
 			default:
diff --git a/go.mod b/go.mod
index 7f5a6b8..13f1712 100644
--- a/go.mod
+++ b/go.mod
@@ -12,9 +12,9 @@ require (
 // Test dependencies.
 require (
 	c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03
-	github.com/creack/pty v1.1.18 // indirect
 	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
 	github.com/rogpeppe/go-internal v1.8.1
 )
 
-replace github.com/rogpeppe/go-internal => github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e
+// https://github.com/rogpeppe/go-internal/pull/172
+replace github.com/rogpeppe/go-internal => github.com/FiloSottile/go-internal v1.8.2-0.20230102123319-d43ebe7f1660
diff --git a/go.sum b/go.sum
index ec52009..9bcb745 100644
--- a/go.sum
+++ b/go.sum
@@ -2,10 +2,8 @@ c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03 h1:0e2QjhWG02SgzlUOvNYaFraf
 c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03/go.mod h1:FomMrUJ2Lxt5jCLmZkG3FHa72zUprnhd3v/Z18Snm4w=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
-github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e h1:hLDldUUKSNgXte+2H8yZzPVStWa7697IJer9wwfW/dg=
-github.com/FiloSottile/go-internal v1.8.2-0.20220728122003-0ced171a3e0e/go.mod h1:dNbK7mWDMlmf5ttOAJJg+a4CyamnqDRrw+Uja1sBETc=
-github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
-github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+github.com/FiloSottile/go-internal v1.8.2-0.20230102123319-d43ebe7f1660 h1:o9Uw6fW8MF/K9RlbCO5e/5e6uXPdwND1NyRnn1NHjgE=
+github.com/FiloSottile/go-internal v1.8.2-0.20230102123319-d43ebe7f1660/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=

From 502b180b1708b8ec49a4e4e926ca8950c0b2b780 Mon Sep 17 00:00:00 2001
From: andros21 <andrea.ros21@murena.io>
Date: Sat, 22 Apr 2023 09:46:50 +0000
Subject: [PATCH 07/45] README: dark/light mode logo (#500)

https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#specifying-the-theme-an-image-is-shown-to
---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d630287..1b3e928 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,10 @@
-<p align="center"><img alt="The age logo, an wireframe of St. Peters dome in Rome, with the text: age, file encryption" width="600" src="https://user-images.githubusercontent.com/1225294/132245842-fda4da6a-1cea-4738-a3da-2dc860861c98.png"></p>
+<p align="center">
+    <picture>
+        <source media="(prefers-color-scheme: dark)" srcset="https://github.com/FiloSottile/age/blob/main/logo/logo_white.svg">
+        <source media="(prefers-color-scheme: light)" srcset="https://github.com/FiloSottile/age/blob/main/logo/logo.svg">
+        <img alt="The age logo, an wireframe of St. Peters dome in Rome, with the text: age, file encryption" width="600" src="https://github.com/FiloSottile/age/blob/main/logo/logo.svg">
+    </picture>
+</p>
 
 [![Go Reference](https://pkg.go.dev/badge/filippo.io/age.svg)](https://pkg.go.dev/filippo.io/age)
 [![man page](<https://img.shields.io/badge/age(1)-man%20page-lightgrey>)](https://filippo.io/age/age.1)

From 877ca247e3a8131cb486c78986868853a5fe603a Mon Sep 17 00:00:00 2001
From: zhsj <zsj950618@gmail.com>
Date: Sat, 22 Apr 2023 17:53:03 +0800
Subject: [PATCH 08/45] .github/workflows: update ronn to 0.9 (#483)

This fixes apostrophes in generated manpage.
Apostrophes should be entered as `'` ; using `\'` produces an acute accent.

ronn in Ubuntu is from https://github.com/apjanke/ronn-ng
---
 .github/workflows/ronn.yml          |   6 +-
 .github/workflows/ronn/Dockerfile   |   8 --
 .github/workflows/ronn/Gemfile      |   5 -
 .github/workflows/ronn/Gemfile.lock |  20 ----
 .github/workflows/ronn/action.yml   |   4 -
 doc/age-keygen.1                    |  38 +------
 doc/age-keygen.1.html               |  33 +++---
 doc/age.1                           | 155 +++-------------------------
 doc/age.1.html                      | 153 +++++++++++++++++----------
 9 files changed, 134 insertions(+), 288 deletions(-)
 delete mode 100644 .github/workflows/ronn/Dockerfile
 delete mode 100644 .github/workflows/ronn/Gemfile
 delete mode 100644 .github/workflows/ronn/Gemfile.lock
 delete mode 100644 .github/workflows/ronn/action.yml

diff --git a/.github/workflows/ronn.yml b/.github/workflows/ronn.yml
index eb4f50c..504a77b 100644
--- a/.github/workflows/ronn.yml
+++ b/.github/workflows/ronn.yml
@@ -6,7 +6,6 @@ on:
     paths:
       - '**.ronn'
       - '**/ronn.yml'
-      - '**/ronn/**'
 permissions:
   contents: read
 jobs:
@@ -16,9 +15,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Install ronn
+        run: sudo apt-get update && sudo apt-get install -y ronn
       - name: Run ronn
-        uses: ./.github/workflows/ronn
-        id: ronn
+        run: bash -O globstar -c 'ronn **/*.ronn'
       - name: Undo email mangling
         # rdiscount randomizes the output for no good reason, which causes
         # changes to always get committed. Sigh.
diff --git a/.github/workflows/ronn/Dockerfile b/.github/workflows/ronn/Dockerfile
deleted file mode 100644
index f373ec3..0000000
--- a/.github/workflows/ronn/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ruby:3.0.1-buster
-
-RUN apt-get update && apt-get install -y groff
-RUN bundle config --global frozen 1
-COPY Gemfile Gemfile.lock ./
-RUN bundle install
-ENTRYPOINT ["bash", "-O", "globstar", "-c", \
-    "/usr/local/bundle/bin/ronn **/*.ronn"]
diff --git a/.github/workflows/ronn/Gemfile b/.github/workflows/ronn/Gemfile
deleted file mode 100644
index 544b2e3..0000000
--- a/.github/workflows/ronn/Gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gem "ronn", "~> 0.7.3"
diff --git a/.github/workflows/ronn/Gemfile.lock b/.github/workflows/ronn/Gemfile.lock
deleted file mode 100644
index 45c7cd5..0000000
--- a/.github/workflows/ronn/Gemfile.lock
+++ /dev/null
@@ -1,20 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    hpricot (0.8.6)
-    mustache (1.1.1)
-    rdiscount (2.2.0.2)
-    ronn (0.7.3)
-      hpricot (>= 0.8.2)
-      mustache (>= 0.7.0)
-      rdiscount (>= 1.5.8)
-
-PLATFORMS
-  aarch64-linux
-  x86_64-linux
-
-DEPENDENCIES
-  ronn (~> 0.7.3)
-
-BUNDLED WITH
-   2.2.15
diff --git a/.github/workflows/ronn/action.yml b/.github/workflows/ronn/action.yml
deleted file mode 100644
index 4734499..0000000
--- a/.github/workflows/ronn/action.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Ronn
-runs:
-  using: docker
-  image: Dockerfile
diff --git a/doc/age-keygen.1 b/doc/age-keygen.1
index 3aced70..65f65aa 100644
--- a/doc/age-keygen.1
+++ b/doc/age-keygen.1
@@ -1,88 +1,56 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "AGE\-KEYGEN" "1" "September 2022" "" ""
-.
+.\" generated with Ronn-NG/v0.9.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
+.TH "AGE\-KEYGEN" "1" "January 2023" ""
 .SH "NAME"
 \fBage\-keygen\fR \- generate age(1) key pairs
-.
 .SH "SYNOPSIS"
 \fBage\-keygen\fR [\fB\-o\fR \fIOUTPUT\fR]
-.
 .br
 \fBage\-keygen\fR \fB\-y\fR [\fB\-o\fR \fIOUTPUT\fR] [\fIINPUT\fR]
-.
 .br
-.
 .SH "DESCRIPTION"
 \fBage\-keygen\fR generates a new native age(1) key pair, and outputs the identity to standard output or to the \fIOUTPUT\fR file\. The output includes the public key and the current time as comments\.
-.
 .P
 If the output is not going to a terminal, \fBage\-keygen\fR prints the public key to standard error\.
-.
 .SH "OPTIONS"
-.
 .TP
 \fB\-o\fR, \fB\-\-output\fR=\fIOUTPUT\fR
 Write the identity to \fIOUTPUT\fR instead of standard output\.
-.
 .IP
 If \fIOUTPUT\fR already exists, it is not overwritten\.
-.
 .TP
 \fB\-y\fR
 Read an identity file from \fIINPUT\fR or from standard input and output the corresponding recipient(s), one per line, with no comments\.
-.
 .TP
 \fB\-\-version\fR
 Print the version and exit\.
-.
 .SH "EXAMPLES"
 Generate a new identity:
-.
 .IP "" 4
-.
 .nf
-
 $ age\-keygen
 # created: 2021\-01\-02T15:30:45+01:00
 # public key: age1lvyvwawkr0mcnnnncaghunadrqkmuf9e6507x9y920xxpp866cnql7dp2z
 AGE\-SECRET\-KEY\-1N9JEPW6DWJ0ZQUDX63F5A03GX8QUW7PXDE39N8UYF82VZ9PC8UFS3M7XA9
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Write a new identity to \fBkey\.txt\fR:
-.
 .IP "" 4
-.
 .nf
-
 $ age\-keygen \-o key\.txt
 Public key: age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Convert an identity to a recipient:
-.
 .IP "" 4
-.
 .nf
-
 $ age\-keygen \-y key\.txt
 age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p
-.
 .fi
-.
 .IP "" 0
-.
 .SH "SEE ALSO"
 age(1)
-.
 .SH "AUTHORS"
 Filippo Valsorda \fIage@filippo\.io\fR
diff --git a/doc/age-keygen.1.html b/doc/age-keygen.1.html
index 167ca32..d0c69fd 100644
--- a/doc/age-keygen.1.html
+++ b/doc/age-keygen.1.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <meta http-equiv='content-type' content='text/html;charset=utf8'>
+  <meta name='generator' content='Ronn-NG/v0.9.1 (http://github.com/apjanke/ronn-ng/tree/0.9.1)'>
   <title>age-keygen(1) - generate age(1) key pairs</title>
   <style type='text/css' media='all'>
   /* style: man */
@@ -68,15 +68,16 @@
     <li class='tr'>age-keygen(1)</li>
   </ol>
 
-  <h2 id="NAME">NAME</h2>
+  
+
+<h2 id="NAME">NAME</h2>
 <p class="man-name">
   <code>age-keygen</code> - <span class="man-whatis">generate <a class="man-ref" href="age.1.html">age<span class="s">(1)</span></a> key pairs</span>
 </p>
-
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>age-keygen</code> [<code>-o</code> <var>OUTPUT</var>]<br />
-<code>age-keygen</code> <code>-y</code> [<code>-o</code> <var>OUTPUT</var>] [<var>INPUT</var>]<br /></p>
+<p><code>age-keygen</code> [<code>-o</code> <var>OUTPUT</var>]<br>
+<code>age-keygen</code> <code>-y</code> [<code>-o</code> <var>OUTPUT</var>] [<var>INPUT</var>]<br></p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
@@ -90,15 +91,20 @@ standard error.</p>
 <h2 id="OPTIONS">OPTIONS</h2>
 
 <dl>
-<dt><code>-o</code>, <code>--output</code>=<var>OUTPUT</var></dt><dd><p>  Write the identity to <var>OUTPUT</var> instead of standard output.</p>
+<dt>
+<code>-o</code>, <code>--output</code>=<var>OUTPUT</var>
+</dt>
+<dd>  Write the identity to <var>OUTPUT</var> instead of standard output.
 
-<p>  If <var>OUTPUT</var> already exists, it is not overwritten.</p></dd>
-<dt class="flush"><code>-y</code></dt><dd><p>  Read an identity file from <var>INPUT</var> or from standard input and output the
-  corresponding recipient(s), one per line, with no comments.</p></dd>
-<dt><code>--version</code></dt><dd><p>  Print the version and exit.</p></dd>
+    <p>If <var>OUTPUT</var> already exists, it is not overwritten.</p>
+</dd>
+<dt><code>-y</code></dt>
+<dd>  Read an identity file from <var>INPUT</var> or from standard input and output the
+  corresponding recipient(s), one per line, with no comments.</dd>
+<dt><code>--version</code></dt>
+<dd>  Print the version and exit.</dd>
 </dl>
 
-
 <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <p>Generate a new identity:</p>
@@ -129,10 +135,9 @@ age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p
 
 <p>Filippo Valsorda <a href="mailto:age@filippo.io" data-bare-link="true">age@filippo.io</a></p>
 
-
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>September 2022</li>
+    <li class='tc'>January 2023</li>
     <li class='tr'>age-keygen(1)</li>
   </ol>
 
diff --git a/doc/age.1 b/doc/age.1
index 1307843..b4a6a70 100644
--- a/doc/age.1
+++ b/doc/age.1
@@ -1,281 +1,184 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "AGE" "1" "September 2022" "" ""
-.
+.\" generated with Ronn-NG/v0.9.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
+.TH "AGE" "1" "January 2023" ""
 .SH "NAME"
 \fBage\fR \- simple, modern, and secure file encryption
-.
 .SH "SYNOPSIS"
-\fBage\fR [\fB\-\-encrypt\fR] (\fB\-r\fR \fIRECIPIENT\fR | \fB\-R\fR \fIPATH\fR)\.\.\. [\fB\-\-armor\fR] [\fB\-o\fR \fIOUTPUT\fR] [\fIINPUT\fR]
-.
+\fBage\fR [\fB\-\-encrypt\fR] (\fB\-r\fR \fIRECIPIENT\fR | \fB\-R\fR \fIPATH\fR)\|\.\|\.\|\. [\fB\-\-armor\fR] [\fB\-o\fR \fIOUTPUT\fR] [\fIINPUT\fR]
 .br
 \fBage\fR [\fB\-\-encrypt\fR] \fB\-\-passphrase\fR [\fB\-\-armor\fR] [\fB\-o\fR \fIOUTPUT\fR] [\fIINPUT\fR]
-.
 .br
-\fBage\fR \fB\-\-decrypt\fR [\fB\-i\fR \fIPATH\fR | \fB\-j\fR \fIPLUGIN\fR]\.\.\. [\fB\-o\fR \fIOUTPUT\fR] [\fIINPUT\fR]
-.
+\fBage\fR \fB\-\-decrypt\fR [\fB\-i\fR \fIPATH\fR | \fB\-j\fR \fIPLUGIN\fR]\|\.\|\.\|\. [\fB\-o\fR \fIOUTPUT\fR] [\fIINPUT\fR]
 .br
-.
 .SH "DESCRIPTION"
 \fBage\fR encrypts or decrypts \fIINPUT\fR to \fIOUTPUT\fR\. The \fIINPUT\fR argument is optional and defaults to standard input\. Only a single \fIINPUT\fR file may be specified\. If \fB\-o\fR is not specified, \fIOUTPUT\fR defaults to standard output\.
-.
 .P
-If \fB\-p\fR/\fB\-\-passphrase\fR is specified, the file is encrypted with a passphrase requested interactively\. Otherwise, it\'s encrypted to one or more \fIRECIPIENTS\fR specified with \fB\-r\fR/\fB\-\-recipient\fR or \fB\-R\fR/\fB\-\-recipients\-file\fR\. Every recipient can decrypt the file\.
-.
+If \fB\-p\fR/\fB\-\-passphrase\fR is specified, the file is encrypted with a passphrase requested interactively\. Otherwise, it's encrypted to one or more \fIRECIPIENTS\fR specified with \fB\-r\fR/\fB\-\-recipient\fR or \fB\-R\fR/\fB\-\-recipients\-file\fR\. Every recipient can decrypt the file\.
 .P
 In \fB\-d\fR/\fB\-\-decrypt\fR mode, passphrase\-encrypted files are detected automatically and the passphrase is requested interactively\. Otherwise, one or more \fIIDENTITIES\fR specified with \fB\-i\fR/\fB\-\-identity\fR are used to decrypt the file\.
-.
 .P
 \fBage\fR encrypted files are binary and not malleable, with around 200 bytes of overhead per recipient, plus 16 bytes every 64KiB of plaintext\.
-.
 .SH "OPTIONS"
-.
 .TP
 \fB\-o\fR, \fB\-\-output\fR=\fIOUTPUT\fR
 Write encrypted or decrypted file to \fIOUTPUT\fR instead of standard output\. If \fIOUTPUT\fR already exists it will be overwritten\.
-.
 .IP
 If encrypting without \fB\-\-armor\fR, \fBage\fR will refuse to output binary to a TTY\. This can be forced by specifying \fB\-\fR as \fIOUTPUT\fR\.
-.
 .TP
 \fB\-\-version\fR
 Print the version and exit\.
-.
 .SS "Encryption options"
-.
 .TP
 \fB\-e\fR, \fB\-\-encrypt\fR
 Encrypt \fIINPUT\fR to \fIOUTPUT\fR\. This is the default\.
-.
 .TP
 \fB\-r\fR, \fB\-\-recipient\fR=\fIRECIPIENT\fR
 Encrypt to the explicitly specified \fIRECIPIENT\fR\. See the \fIRECIPIENTS AND IDENTITIES\fR section for possible recipient formats\.
-.
 .IP
 This option can be repeated and combined with other recipient flags, and the file can be decrypted by all provided recipients independently\.
-.
 .TP
 \fB\-R\fR, \fB\-\-recipients\-file\fR=\fIPATH\fR
 Encrypt to the \fIRECIPIENTS\fR listed in the file at \fIPATH\fR, one per line\. Empty lines and lines starting with \fB#\fR are ignored as comments\.
-.
 .IP
 If \fIPATH\fR is \fB\-\fR, the recipients are read from standard input\. In this case, the \fIINPUT\fR argument must be specified\.
-.
 .IP
 This option can be repeated and combined with other recipient flags, and the file can be decrypted by all provided recipients independently\.
-.
 .TP
 \fB\-p\fR, \fB\-\-passphrase\fR
 Encrypt with a passphrase, requested interactively from the terminal\. \fBage\fR will offer to auto\-generate a secure passphrase\.
-.
 .IP
-This option can\'t be used with other recipient flags\.
-.
+This option can't be used with other recipient flags\.
 .TP
 \fB\-a\fR, \fB\-\-armor\fR
 Encrypt to an ASCII\-only "armored" encoding\.
-.
 .IP
 \fBage\fR armor is a strict version of PEM with type \fBAGE ENCRYPTED FILE\fR, canonical "strict" Base64, no headers, and no support for leading and trailing extra data\.
-.
 .IP
 Decryption transparently detects and decodes ASCII armoring\.
-.
 .TP
 \fB\-i\fR, \fB\-\-identity\fR=\fIPATH\fR
 Encrypt to the \fIRECIPIENTS\fR corresponding to the \fIIDENTITIES\fR listed in the file at \fIPATH\fR\. This is equivalent to converting the file at \fIPATH\fR to a recipients file with \fBage\-keygen \-y\fR and then passing that to \fB\-R\fR/\fB\-\-recipients\-file\fR\.
-.
 .IP
 For the format of \fIPATH\fR, see the definition of \fB\-i\fR/\fB\-\-identity\fR in the \fIDecryption options\fR section\.
-.
 .IP
 \fB\-e\fR/\fB\-\-encrypt\fR must be explicitly specified when using \fB\-i\fR/\fB\-\-identity\fR in encryption mode to avoid confusion\.
-.
 .TP
 \fB\-j\fR \fIPLUGIN\fR
 Encrypt using the data\-less \fIplugin\fR \fIPLUGIN\fR\.
-.
 .IP
 This is equivalent to using \fB\-i\fR/\fB\-\-identity\fR with a file that contains a single plugin \fBIDENTITY\fR that encodes no plugin\-specific data\.
-.
 .IP
 \fB\-e\fR/\fB\-\-encrypt\fR must be explicitly specified when using \fB\-j\fR in encryption mode to avoid confusion\.
-.
 .SS "Decryption options"
-.
 .TP
 \fB\-d\fR, \fB\-\-decrypt\fR
 Decrypt \fIINPUT\fR to \fIOUTPUT\fR\.
-.
 .IP
 If \fIINPUT\fR is passphrase encrypted, it will be automatically detected and the passphrase will be requested interactively\. Otherwise, the \fIIDENTITIES\fR specified with \fB\-i\fR/\fB\-\-identity\fR are used\.
-.
 .IP
 ASCII armoring is transparently detected and decoded\.
-.
 .TP
 \fB\-i\fR, \fB\-\-identity\fR=\fIPATH\fR
 Decrypt using the \fIIDENTITIES\fR at \fIPATH\fR\.
-.
 .IP
 \fIPATH\fR may be one of the following:
-.
 .IP
 a\. A file listing \fIIDENTITIES\fR one per line\. Empty lines and lines starting with "\fB#\fR" are ignored as comments\.
-.
 .IP
 b\. A passphrase encrypted age file, containing \fIIDENTITIES\fR one per line like above\. The passphrase is requested interactively\. Note that passphrase\-protected identity files are not necessary for most use cases, where access to the encrypted identity file implies access to the whole system\.
-.
 .IP
 c\. An SSH private key file, in PKCS#1, PKCS#8, or OpenSSH format\. If the private key is password\-protected, the password is requested interactively only if the SSH identity matches the file\. See the \fISSH keys\fR section for more information, including supported key types\.
-.
 .IP
 d\. "\fB\-\fR", causing one of the options above to be read from standard input\. In this case, the \fIINPUT\fR argument must be specified\.
-.
 .IP
-This option can be repeated\. Identities are tried in the order in which are provided, and the first one matching one of the file\'s recipients is used\. Unused identities are ignored, but it is an error if the \fIINPUT\fR file is passphrase\-encrypted and \fB\-i\fR/\fB\-\-identity\fR is specified\.
-.
+This option can be repeated\. Identities are tried in the order in which are provided, and the first one matching one of the file's recipients is used\. Unused identities are ignored, but it is an error if the \fIINPUT\fR file is passphrase\-encrypted and \fB\-i\fR/\fB\-\-identity\fR is specified\.
 .TP
 \fB\-j\fR \fIPLUGIN\fR
 Decrypt using the data\-less \fIplugin\fR \fIPLUGIN\fR\.
-.
 .IP
 This is equivalent to using \fB\-i\fR/\fB\-\-identity\fR with a file that contains a single plugin \fBIDENTITY\fR that encodes no plugin\-specific data\.
-.
 .SH "RECIPIENTS AND IDENTITIES"
 \fBRECIPIENTS\fR are public values, like a public key, that a file can be encrypted to\. \fBIDENTITIES\fR are private values, like a private key, that allow decrypting a file encrypted to the corresponding \fBRECIPIENT\fR\.
-.
 .SS "Native X25519 keys"
 Native \fBage\fR key pairs are generated with age\-keygen(1), and provide small encodings and strong encryption based on X25519\. They are the recommended recipient type for most applications\.
-.
 .P
 A \fBRECIPIENT\fR encoding begins with \fBage1\fR and looks like the following:
-.
 .IP "" 4
-.
 .nf
-
 age1gde3ncmahlqd9gg50tanl99r960llztrhfapnmx853s4tjum03uqfssgdh
-.
 .fi
-.
 .IP "" 0
-.
 .P
 An \fBIDENTITY\fR encoding begins with \fBAGE\-SECRET\-KEY\-1\fR and looks like the following:
-.
 .IP "" 4
-.
 .nf
-
 AGE\-SECRET\-KEY\-1KTYK6RVLN5TAPE7VF6FQQSKZ9HWWCDSKUGXXNUQDWZ7XXT5YK5LSF3UTKQ
-.
 .fi
-.
 .IP "" 0
-.
 .P
-An encrypted file can\'t be linked to the native recipient it\'s encrypted to without access to the corresponding identity\.
-.
+An encrypted file can't be linked to the native recipient it's encrypted to without access to the corresponding identity\.
 .SS "SSH keys"
 As a convenience feature, \fBage\fR also supports encrypting to RSA or Ed25519 ssh(1) keys\. RSA keys must be at least 2048 bits\. This feature employs more complex cryptography, and should only be used when a native key is not available for the recipient\. Note that SSH keys might not be protected long\-term by the recipient, since they are revokable when used only for authentication\.
-.
 .P
 A \fBRECIPIENT\fR encoding is an SSH public key in \fBauthorized_keys\fR format (see the \fBAUTHORIZED_KEYS FILE FORMAT\fR section of sshd(8)), starting with \fBssh\-rsa\fR or \fBssh\-ed25519\fR, like the following:
-.
 .IP "" 4
-.
 .nf
-
-ssh\-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDULTit0KUehbi[\.\.\.]GU4BtElAbzh8=
-ssh\-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH9pO5pz22JZEas[\.\.\.]l1uZc31FGYMXa
-.
+ssh\-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDULTit0KUehbi[\|\.\|\.\|\.]GU4BtElAbzh8=
+ssh\-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH9pO5pz22JZEas[\|\.\|\.\|\.]l1uZc31FGYMXa
 .fi
-.
 .IP "" 0
-.
 .P
 The comment at the end of the line, if present, is ignored\.
-.
 .P
 In recipient files passed to \fB\-R\fR/\fB\-\-recipients\-file\fR, unsupported but valid SSH public keys are ignored with a warning, to facilitate using \fBauthorized_keys\fR or GitHub \fB\.keys\fR files\. (See \fIEXAMPLES\fR\.)
-.
 .P
 An \fBIDENTITY\fR is an SSH private key \fIfile\fR passed individually to \fB\-i\fR/\fB\-\-identity\fR\. Note that keys held on hardware tokens such as YubiKeys or accessed via ssh\-agent(1) are not supported\.
-.
 .P
 An encrypted file \fIcan\fR be linked to the SSH public key it was encrypted to\. This is so that \fBage\fR can identify the correct SSH private key before requesting its password, if any\.
-.
 .SS "Plugins"
 \fBage\fR can be extended through plugins\. A plugin is only loaded if a corresponding \fBRECIPIENT\fR or \fBIDENTITY\fR is specified\. (Simply decrypting a file encrypted with a plugin will not cause it to load, for security reasons among others\.)
-.
 .P
 A \fBRECIPIENT\fR for a plugin named \fBexample\fR starts with \fBage1example1\fR, while an \fBIDENTITY\fR starts with \fBAGE\-PLUGIN\-EXAMPLE\-1\fR\. They both encode arbitrary plugin\-specific data, and are generated by the plugin\.
-.
 .P
 When either is specified, \fBage\fR searches for \fBage\-plugin\-example\fR in the PATH and executes it to perform the file header encryption or decryption\. The plugin may request input from the user through \fBage\fR to complete the operation\.
-.
 .P
 Plugins can be freely mixed with other plugins or natively supported keys\.
-.
 .P
 A plugin is not bound to only encrypt or decrypt files meant for or generated by the plugin\. For example, a plugin can be used to decrypt files encrypted to a native X25519 \fBRECIPIENT\fR or even with a passphrase\. Similarly, a plugin can encrypt a file such that it can be decrypted without the use of any plugin\.
-.
 .P
-Plugins for which the \fBIDENTITY\fR/\fBRECIPIENT\fR distinction doesn\'t make sense (such as a symmetric encryption plugin) may generate only an \fBIDENTITY\fR and instruct the user to perform encryption with the \fB\-e\fR/\fB\-\-encrypt\fR and \fB\-i\fR/\fB\-\-identity\fR flags\. Plugins for which the concept of separate identities doesn\'t make sense (such as a password\-encryption plugin) may instruct the user to use the \fB\-j\fR flag\.
-.
+Plugins for which the \fBIDENTITY\fR/\fBRECIPIENT\fR distinction doesn't make sense (such as a symmetric encryption plugin) may generate only an \fBIDENTITY\fR and instruct the user to perform encryption with the \fB\-e\fR/\fB\-\-encrypt\fR and \fB\-i\fR/\fB\-\-identity\fR flags\. Plugins for which the concept of separate identities doesn't make sense (such as a password\-encryption plugin) may instruct the user to use the \fB\-j\fR flag\.
 .SH "EXIT STATUS"
 \fBage\fR will exit 0 if and only if encryption or decryption are successful for the full length of the input\.
-.
 .P
 If an error occurs during decryption, partial output might still be generated, but only if it was possible to securely authenticate it\. No unauthenticated output is ever released\.
-.
 .SH "BACKWARDS COMPATIBILITY"
 Files encrypted with a stable version (not alpha, beta, or release candidate) of \fBage\fR, or with any v1\.0\.0 beta or release candidate, will decrypt with any later version of the tool\.
-.
 .P
 If decrypting older files poses a security risk, doing so might cause an error by default\. In this case, a flag will be provided to force the operation\.
-.
 .SH "EXAMPLES"
 Generate a new identity, encrypt data, and decrypt:
-.
 .IP "" 4
-.
 .nf
-
 $ age\-keygen \-o key\.txt
 Public key: age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p
 
 $ tar cvz ~/data | age \-r age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p > data\.tar\.gz\.age
 
 $ age \-d \-o data\.tar\.gz \-i key\.txt data\.tar\.gz\.age
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Encrypt \fBexample\.jpg\fR to multiple recipients and output to \fBexample\.jpg\.age\fR:
-.
 .IP "" 4
-.
 .nf
-
 $ age \-o example\.jpg\.age \-r age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p \e
     \-r age1lggyhqrw2nlhcxprm67z43rta597azn8gknawjehu9d9dl0jq3yqqvfafg example\.jpg
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Encrypt to a list of recipients:
-.
 .IP "" 4
-.
 .nf
-
 $ cat > recipients\.txt
 # Alice
 age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p
@@ -283,36 +186,24 @@ age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p
 age1lggyhqrw2nlhcxprm67z43rta597azn8gknawjehu9d9dl0jq3yqqvfafg
 
 $ age \-R recipients\.txt example\.jpg > example\.jpg\.age
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Encrypt and decrypt a file using a passphrase:
-.
 .IP "" 4
-.
 .nf
-
 $ age \-p secrets\.txt > secrets\.txt\.age
 Enter passphrase (leave empty to autogenerate a secure one):
 Using the autogenerated passphrase "release\-response\-step\-brand\-wrap\-ankle\-pair\-unusual\-sword\-train"\.
 
 $ age \-d secrets\.txt\.age > secrets\.txt
 Enter passphrase:
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Encrypt and decrypt with a passphrase\-protected identity file:
-.
 .IP "" 4
-.
 .nf
-
 $ age\-keygen | age \-p > key\.age
 Public key: age1yhm4gctwfmrpz87tdslm550wrx6m79y9f2hdzt0lndjnehwj0ukqrjpyx5
 Enter passphrase (leave empty to autogenerate a secure one):
@@ -322,58 +213,36 @@ $ age \-r age1yhm4gctwfmrpz87tdslm550wrx6m79y9f2hdzt0lndjnehwj0ukqrjpyx5 secrets
 
 $ age \-d \-i key\.age secrets\.txt\.age > secrets\.txt
 Enter passphrase for identity file "key\.age":
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Encrypt and decrypt with an SSH public key:
-.
 .IP "" 4
-.
 .nf
-
 $ age \-R ~/\.ssh/id_ed25519\.pub example\.jpg > example\.jpg\.age
 
 $ age \-d \-i ~/\.ssh/id_ed25519 example\.jpg\.age > example\.jpg
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Encrypt and decrypt with age\-plugin\-yubikey:
-.
 .IP "" 4
-.
 .nf
-
 $ age\-plugin\-yubikey # run interactive setup, generate identity file and obtain recipient
 
 $ age \-r age1yubikey1qwt50d05nh5vutpdzmlg5wn80xq5negm4uj9ghv0snvdd3yysf5yw3rhl3t secrets\.txt > secrets\.txt\.age
 
 $ age \-d \-i age\-yubikey\-identity\-388178f3\.txt secrets\.txt\.age
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Encrypt to the SSH keys of a GitHub user:
-.
 .IP "" 4
-.
 .nf
-
 $ curl https://github\.com/benjojo\.keys | age \-R \- example\.jpg > example\.jpg\.age
-.
 .fi
-.
 .IP "" 0
-.
 .SH "SEE ALSO"
 age\-keygen(1)
-.
 .SH "AUTHORS"
 Filippo Valsorda \fIage@filippo\.io\fR
diff --git a/doc/age.1.html b/doc/age.1.html
index 189a458..d94235d 100644
--- a/doc/age.1.html
+++ b/doc/age.1.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <meta http-equiv='content-type' content='text/html;charset=utf8'>
+  <meta name='generator' content='Ronn-NG/v0.9.1 (http://github.com/apjanke/ronn-ng/tree/0.9.1)'>
   <title>age(1) - simple, modern, and secure file encryption</title>
   <style type='text/css' media='all'>
   /* style: man */
@@ -71,16 +71,17 @@
     <li class='tr'>age(1)</li>
   </ol>
 
-  <h2 id="NAME">NAME</h2>
+  
+
+<h2 id="NAME">NAME</h2>
 <p class="man-name">
   <code>age</code> - <span class="man-whatis">simple, modern, and secure file encryption</span>
 </p>
-
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>age</code> [<code>--encrypt</code>] (<code>-r</code> <var>RECIPIENT</var> | <code>-R</code> <var>PATH</var>)... [<code>--armor</code>] [<code>-o</code> <var>OUTPUT</var>] [<var>INPUT</var>]<br />
-<code>age</code> [<code>--encrypt</code>] <code>--passphrase</code> [<code>--armor</code>] [<code>-o</code> <var>OUTPUT</var>] [<var>INPUT</var>]<br />
-<code>age</code> <code>--decrypt</code> [<code>-i</code> <var>PATH</var> | <code>-j</code> <var>PLUGIN</var>]... [<code>-o</code> <var>OUTPUT</var>] [<var>INPUT</var>]<br /></p>
+<p><code>age</code> [<code>--encrypt</code>] (<code>-r</code> <var>RECIPIENT</var> | <code>-R</code> <var>PATH</var>)... [<code>--armor</code>] [<code>-o</code> <var>OUTPUT</var>] [<var>INPUT</var>]<br>
+<code>age</code> [<code>--encrypt</code>] <code>--passphrase</code> [<code>--armor</code>] [<code>-o</code> <var>OUTPUT</var>] [<var>INPUT</var>]<br>
+<code>age</code> <code>--decrypt</code> [<code>-i</code> <var>PATH</var> | <code>-j</code> <var>PLUGIN</var>]... [<code>-o</code> <var>OUTPUT</var>] [<var>INPUT</var>]<br></p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
@@ -104,107 +105,148 @@ overhead per recipient, plus 16 bytes every 64KiB of plaintext.</p>
 <h2 id="OPTIONS">OPTIONS</h2>
 
 <dl>
-<dt><code>-o</code>, <code>--output</code>=<var>OUTPUT</var></dt><dd><p>  Write encrypted or decrypted file to <var>OUTPUT</var> instead of standard output.
-  If <var>OUTPUT</var> already exists it will be overwritten.</p>
+<dt>
+<code>-o</code>, <code>--output</code>=<var>OUTPUT</var>
+</dt>
+<dd>  Write encrypted or decrypted file to <var>OUTPUT</var> instead of standard output.
+  If <var>OUTPUT</var> already exists it will be overwritten.
 
-<p>  If encrypting without <code>--armor</code>, <code>age</code> will refuse to output binary to a
-  TTY. This can be forced by specifying <code>-</code> as <var>OUTPUT</var>.</p></dd>
-<dt><code>--version</code></dt><dd><p>  Print the version and exit.</p></dd>
+    <p>If encrypting without <code>--armor</code>, <code>age</code> will refuse to output binary to a
+  TTY. This can be forced by specifying <code>-</code> as <var>OUTPUT</var>.</p>
+</dd>
+<dt><code>--version</code></dt>
+<dd>  Print the version and exit.</dd>
 </dl>
 
-
 <h3 id="Encryption-options">Encryption options</h3>
 
 <dl>
-<dt><code>-e</code>, <code>--encrypt</code></dt><dd><p>  Encrypt <var>INPUT</var> to <var>OUTPUT</var>. This is the default.</p></dd>
-<dt><code>-r</code>, <code>--recipient</code>=<var>RECIPIENT</var></dt><dd><p>  Encrypt to the explicitly specified <var>RECIPIENT</var>. See the
-  <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">RECIPIENTS AND IDENTITIES</a> section for possible recipient formats.</p>
+<dt>
+<code>-e</code>, <code>--encrypt</code>
+</dt>
+<dd>  Encrypt <var>INPUT</var> to <var>OUTPUT</var>. This is the default.</dd>
+<dt>
+<code>-r</code>, <code>--recipient</code>=<var>RECIPIENT</var>
+</dt>
+<dd>  Encrypt to the explicitly specified <var>RECIPIENT</var>. See the
+  <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">RECIPIENTS AND IDENTITIES</a> section for possible recipient formats.
 
-<p>  This option can be repeated and combined with other recipient flags,
-  and the file can be decrypted by all provided recipients independently.</p></dd>
-<dt><code>-R</code>, <code>--recipients-file</code>=<var>PATH</var></dt><dd><p>  Encrypt to the <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">RECIPIENTS</a> listed in the
+    <p>This option can be repeated and combined with other recipient flags,
+  and the file can be decrypted by all provided recipients independently.</p>
+</dd>
+<dt>
+<code>-R</code>, <code>--recipients-file</code>=<var>PATH</var>
+</dt>
+<dd>  Encrypt to the <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">RECIPIENTS</a> listed in the
   file at <var>PATH</var>, one per line. Empty lines and lines starting with <code>#</code>
-  are ignored as comments.</p>
+  are ignored as comments.
 
-<p>  If <var>PATH</var> is <code>-</code>, the recipients are read from standard input. In
+    <p>If <var>PATH</var> is <code>-</code>, the recipients are read from standard input. In
   this case, the <var>INPUT</var> argument must be specified.</p>
 
-<p>  This option can be repeated and combined with other recipient flags,
-  and the file can be decrypted by all provided recipients independently.</p></dd>
-<dt><code>-p</code>, <code>--passphrase</code></dt><dd><p>  Encrypt with a passphrase, requested interactively from the terminal.
-  <code>age</code> will offer to auto-generate a secure passphrase.</p>
+    <p>This option can be repeated and combined with other recipient flags,
+  and the file can be decrypted by all provided recipients independently.</p>
+</dd>
+<dt>
+<code>-p</code>, <code>--passphrase</code>
+</dt>
+<dd>  Encrypt with a passphrase, requested interactively from the terminal.
+  <code>age</code> will offer to auto-generate a secure passphrase.
 
-<p>  This option can't be used with other recipient flags.</p></dd>
-<dt><code>-a</code>, <code>--armor</code></dt><dd><p>  Encrypt to an ASCII-only "armored" encoding.</p>
+    <p>This option can't be used with other recipient flags.</p>
+</dd>
+<dt>
+<code>-a</code>, <code>--armor</code>
+</dt>
+<dd>  Encrypt to an ASCII-only "armored" encoding.
 
-<p>  <code>age</code> armor is a strict version of PEM with type <code>AGE ENCRYPTED FILE</code>,
+    <p><code>age</code> armor is a strict version of PEM with type <code>AGE ENCRYPTED FILE</code>,
   canonical "strict" Base64, no headers, and no support for leading and
   trailing extra data.</p>
 
-<p>  Decryption transparently detects and decodes ASCII armoring.</p></dd>
-<dt><code>-i</code>, <code>--identity</code>=<var>PATH</var></dt><dd><p>  Encrypt to the <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">RECIPIENTS</a> corresponding to the
+    <p>Decryption transparently detects and decodes ASCII armoring.</p>
+</dd>
+<dt>
+<code>-i</code>, <code>--identity</code>=<var>PATH</var>
+</dt>
+<dd>  Encrypt to the <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">RECIPIENTS</a> corresponding to the
   <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">IDENTITIES</a> listed in the file at <var>PATH</var>. This
   is equivalent to converting the file at <var>PATH</var> to a recipients file with
-  <code>age-keygen -y</code> and then passing that to <code>-R</code>/<code>--recipients-file</code>.</p>
+  <code>age-keygen -y</code> and then passing that to <code>-R</code>/<code>--recipients-file</code>.
 
-<p>  For the format of <var>PATH</var>, see the definition of <code>-i</code>/<code>--identity</code> in the
+    <p>For the format of <var>PATH</var>, see the definition of <code>-i</code>/<code>--identity</code> in the
   <a href="#Decryption-options" title="Decryption options" data-bare-link="true">Decryption options</a> section.</p>
 
-<p>  <code>-e</code>/<code>--encrypt</code> must be explicitly specified when using <code>-i</code>/<code>--identity</code>
-  in encryption mode to avoid confusion.</p></dd>
-<dt><code>-j</code> <var>PLUGIN</var></dt><dd><p>  Encrypt using the data-less <a href="#Plugins" title="Plugins" data-bare-link="true">plugin</a> <var>PLUGIN</var>.</p>
+    <p><code>-e</code>/<code>--encrypt</code> must be explicitly specified when using <code>-i</code>/<code>--identity</code>
+  in encryption mode to avoid confusion.</p>
+</dd>
+<dt>
+<code>-j</code> <var>PLUGIN</var>
+</dt>
+<dd>  Encrypt using the data-less <a href="#Plugins" title="Plugins" data-bare-link="true">plugin</a> <var>PLUGIN</var>.
 
-<p>  This is equivalent to using <code>-i</code>/<code>--identity</code> with a file that contains a
+    <p>This is equivalent to using <code>-i</code>/<code>--identity</code> with a file that contains a
   single plugin <code>IDENTITY</code> that encodes no plugin-specific data.</p>
 
-<p>  <code>-e</code>/<code>--encrypt</code> must be explicitly specified when using <code>-j</code> in encryption
-  mode to avoid confusion.</p></dd>
+    <p><code>-e</code>/<code>--encrypt</code> must be explicitly specified when using <code>-j</code> in encryption
+  mode to avoid confusion.</p>
+</dd>
 </dl>
 
-
 <h3 id="Decryption-options">Decryption options</h3>
 
 <dl>
-<dt><code>-d</code>, <code>--decrypt</code></dt><dd><p>  Decrypt <var>INPUT</var> to <var>OUTPUT</var>.</p>
+<dt>
+<code>-d</code>, <code>--decrypt</code>
+</dt>
+<dd>  Decrypt <var>INPUT</var> to <var>OUTPUT</var>.
 
-<p>  If <var>INPUT</var> is passphrase encrypted, it will be automatically detected
+    <p>If <var>INPUT</var> is passphrase encrypted, it will be automatically detected
   and the passphrase will be requested interactively. Otherwise, the
   <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">IDENTITIES</a> specified with <code>-i</code>/<code>--identity</code>
   are used.</p>
 
-<p>  ASCII armoring is transparently detected and decoded.</p></dd>
-<dt><code>-i</code>, <code>--identity</code>=<var>PATH</var></dt><dd><p>  Decrypt using the <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">IDENTITIES</a> at <var>PATH</var>.</p>
+    <p>ASCII armoring is transparently detected and decoded.</p>
+</dd>
+<dt>
+<code>-i</code>, <code>--identity</code>=<var>PATH</var>
+</dt>
+<dd>  Decrypt using the <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">IDENTITIES</a> at <var>PATH</var>.
 
-<p>  <var>PATH</var> may be one of the following:</p>
+    <p><var>PATH</var> may be one of the following:</p>
 
-<p>  a. A file listing <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">IDENTITIES</a> one per line.
+    <p>a. A file listing <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">IDENTITIES</a> one per line.
   Empty lines and lines starting with "<code>#</code>" are ignored as comments.</p>
 
-<p>  b. A passphrase encrypted age file, containing
+    <p>b. A passphrase encrypted age file, containing
   <a href="#RECIPIENTS-AND-IDENTITIES" title="RECIPIENTS AND IDENTITIES" data-bare-link="true">IDENTITIES</a> one per line like above.
   The passphrase is requested interactively. Note that passphrase-protected
   identity files are not necessary for most use cases, where access to the
   encrypted identity file implies access to the whole system.</p>
 
-<p>  c. An SSH private key file, in PKCS#1, PKCS#8, or OpenSSH format.
+    <p>c. An SSH private key file, in PKCS#1, PKCS#8, or OpenSSH format.
   If the private key is password-protected, the password is requested
   interactively only if the SSH identity matches the file. See the
   <a href="#SSH-keys" title="SSH keys" data-bare-link="true">SSH keys</a> section for more information, including supported key types.</p>
 
-<p>  d. "<code>-</code>", causing one of the options above to be read from standard input.
+    <p>d. "<code>-</code>", causing one of the options above to be read from standard input.
   In this case, the <var>INPUT</var> argument must be specified.</p>
 
-<p>  This option can be repeated. Identities are tried in the order in which are
+    <p>This option can be repeated. Identities are tried in the order in which are
   provided, and the first one matching one of the file's recipients is used.
   Unused identities are ignored, but it is an error if the <var>INPUT</var> file is
-  passphrase-encrypted and <code>-i</code>/<code>--identity</code> is specified.</p></dd>
-<dt><code>-j</code> <var>PLUGIN</var></dt><dd><p>  Decrypt using the data-less <a href="#Plugins" title="Plugins" data-bare-link="true">plugin</a> <var>PLUGIN</var>.</p>
+  passphrase-encrypted and <code>-i</code>/<code>--identity</code> is specified.</p>
+</dd>
+<dt>
+<code>-j</code> <var>PLUGIN</var>
+</dt>
+<dd>  Decrypt using the data-less <a href="#Plugins" title="Plugins" data-bare-link="true">plugin</a> <var>PLUGIN</var>.
 
-<p>  This is equivalent to using <code>-i</code>/<code>--identity</code> with a file that contains a
-  single plugin <code>IDENTITY</code> that encodes no plugin-specific data.</p></dd>
+    <p>This is equivalent to using <code>-i</code>/<code>--identity</code> with a file that contains a
+  single plugin <code>IDENTITY</code> that encodes no plugin-specific data.</p>
+</dd>
 </dl>
 
-
 <h2 id="RECIPIENTS-AND-IDENTITIES">RECIPIENTS AND IDENTITIES</h2>
 
 <p><code>RECIPIENTS</code> are public values, like a public key, that a file can be encrypted
@@ -388,10 +430,9 @@ $ age -d -i age-yubikey-identity-388178f3.txt secrets.txt.age
 
 <p>Filippo Valsorda <a href="mailto:age@filippo.io" data-bare-link="true">age@filippo.io</a></p>
 
-
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>September 2022</li>
+    <li class='tc'>January 2023</li>
     <li class='tr'>age(1)</li>
   </ol>
 

From 486b6dac96f887f10e8c89394ddbc28f3a052225 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@users.noreply.github.com>
Date: Sat, 22 Apr 2023 09:53:44 +0000
Subject: [PATCH 09/45] doc: regenerate groff and html man pages

---
 doc/age-keygen.1      | 2 +-
 doc/age-keygen.1.html | 2 +-
 doc/age.1             | 2 +-
 doc/age.1.html        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/age-keygen.1 b/doc/age-keygen.1
index 65f65aa..b342c6c 100644
--- a/doc/age-keygen.1
+++ b/doc/age-keygen.1
@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "AGE\-KEYGEN" "1" "January 2023" ""
+.TH "AGE\-KEYGEN" "1" "April 2023" ""
 .SH "NAME"
 \fBage\-keygen\fR \- generate age(1) key pairs
 .SH "SYNOPSIS"
diff --git a/doc/age-keygen.1.html b/doc/age-keygen.1.html
index d0c69fd..d5712ee 100644
--- a/doc/age-keygen.1.html
+++ b/doc/age-keygen.1.html
@@ -137,7 +137,7 @@ age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>January 2023</li>
+    <li class='tc'>April 2023</li>
     <li class='tr'>age-keygen(1)</li>
   </ol>
 
diff --git a/doc/age.1 b/doc/age.1
index b4a6a70..d657224 100644
--- a/doc/age.1
+++ b/doc/age.1
@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "AGE" "1" "January 2023" ""
+.TH "AGE" "1" "April 2023" ""
 .SH "NAME"
 \fBage\fR \- simple, modern, and secure file encryption
 .SH "SYNOPSIS"
diff --git a/doc/age.1.html b/doc/age.1.html
index d94235d..ed74520 100644
--- a/doc/age.1.html
+++ b/doc/age.1.html
@@ -432,7 +432,7 @@ $ age -d -i age-yubikey-identity-388178f3.txt secrets.txt.age
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>January 2023</li>
+    <li class='tc'>April 2023</li>
     <li class='tr'>age(1)</li>
   </ol>
 

From b6537b186526fa13ebcef399534f8dd9fddaa3aa Mon Sep 17 00:00:00 2001
From: Helio Machado <0x2b3bfa0+git@googlemail.com>
Date: Sat, 22 Apr 2023 12:01:29 +0200
Subject: [PATCH 10/45] .github/workflows: trigger interop. tests using gh
 (#481)

---
 .github/workflows/interop.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/interop.yml b/.github/workflows/interop.yml
index 4b548e6..949a730 100644
--- a/.github/workflows/interop.yml
+++ b/.github/workflows/interop.yml
@@ -8,8 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger interoperability tests in str4d/rage
-        run: |
-          curl -X POST https://api.github.com/repos/str4d/rage/dispatches \
-          -H 'Accept: application/vnd.github.v3+json' \
-          -H 'Authorization: token ${{ secrets.RAGE_INTEROP_ACCESS_TOKEN }}' \
-          --data '{"event_type": "age-interop-request", "client_payload": { "sha": "'"$GITHUB_SHA"'" }}'
+        run: >
+          gh api repos/str4d/rage/dispatches
+            --field event_type="age-interop-request"
+            --field client_payload[sha]="$GITHUB_SHA"
+        env:
+          GITHUB_TOKEN: ${{ secrets.RAGE_INTEROP_ACCESS_TOKEN }}

From 9f0a2d25ac79da8100d68f3e8b3a1a57ea4a73ba Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sat, 22 Apr 2023 16:40:45 -0400
Subject: [PATCH 11/45] README: add link to awesome age list

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1b3e928..cf5efd8 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,9 @@ $ age --decrypt -i key.txt data.tar.gz.age > data.tar.gz
 
 🔑 Hardware PIV tokens such as YubiKeys are supported through the [age-plugin-yubikey](https://github.com/str4d/age-plugin-yubikey) plugin.
 
-💬 The author pronounces it `[aɡe̞]`, like the Italian [“aghe”](https://translate.google.com/?sl=it&text=aghe).
+✨ For more plugins, implementations, tools, and integrations, check out the [awesome age](https://github.com/FiloSottile/awesome-age) list.
+
+💬 The author pronounces it `[aɡe̞]` [with a hard *g*](https://translate.google.com/?sl=it&text=aghe), like GIF, and is always spelled lowercase.
 
 ## Installation
 

From 6c36e167c82e5b52bbce889f5052bdc719fdc487 Mon Sep 17 00:00:00 2001
From: Stepan <121534647+exsplashit@users.noreply.github.com>
Date: Fri, 30 Jun 2023 17:05:44 +0400
Subject: [PATCH 12/45] README: update release download link (#512)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf5efd8..890cb01 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ On Windows, Linux, macOS, and FreeBSD you can use the pre-built binaries.
 
 ```
 https://dl.filippo.io/age/latest?for=linux/amd64
-https://dl.filippo.io/age/v1.0.0-rc.1?for=darwin/arm64
+https://dl.filippo.io/age/v1.1.1?for=darwin/arm64
 ...
 ```
 

From 4740a92ef92e47ad7b8a0d031690f78f3599ed7f Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sat, 22 Jul 2023 16:34:17 +0200
Subject: [PATCH 13/45] age: use testkit vectors to test armor, header, and
 STREAM round-trips

Before

	filippo.io/age/armor	coverage: 72.3% of statements in filippo.io/age/...
	filippo.io/age/internal/format	coverage: 86.8% of statements in filippo.io/age/...
	filippo.io/age/internal/stream	coverage: 83.9% of statements in filippo.io/age/...

After

	filippo.io/age/armor	coverage: 88.0% of statements in filippo.io/age/...
	filippo.io/age/internal/format	coverage: 87.6% of statements in filippo.io/age/...
	filippo.io/age/internal/stream	coverage: 86.0% of statements in filippo.io/age/...
---
 testkit_test.go | 193 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 154 insertions(+), 39 deletions(-)

diff --git a/testkit_test.go b/testkit_test.go
index ab315e5..ae707ac 100644
--- a/testkit_test.go
+++ b/testkit_test.go
@@ -19,11 +19,15 @@ import (
 
 	"filippo.io/age"
 	"filippo.io/age/armor"
+	"filippo.io/age/internal/format"
+	"filippo.io/age/internal/stream"
+	"golang.org/x/crypto/chacha20poly1305"
+	"golang.org/x/crypto/hkdf"
 
 	agetest "c2sp.org/CCTV/age"
 )
 
-func TestVectors(t *testing.T) {
+func forEachVector(t *testing.T, f func(t *testing.T, v *vector)) {
 	tests, err := fs.ReadDir(agetest.Vectors, ".")
 	if err != nil {
 		t.Fatal(err)
@@ -35,25 +39,29 @@ func TestVectors(t *testing.T) {
 			t.Fatal(err)
 		}
 		t.Run(name, func(t *testing.T) {
-			testVector(t, contents)
+			t.Parallel()
+			f(t, parseVector(t, contents))
 		})
 	}
 }
 
-func testVector(t *testing.T, test []byte) {
-	var (
-		expect      string
-		payloadHash *[32]byte
-		identities  []age.Identity
-		armored     bool
-	)
+type vector struct {
+	expect      string
+	payloadHash *[32]byte
+	fileKey     *[16]byte
+	identities  []age.Identity
+	armored     bool
+	file        []byte
+}
 
+func parseVector(t *testing.T, test []byte) *vector {
+	v := &vector{file: test}
 	for {
-		line, rest, ok := bytes.Cut(test, []byte("\n"))
+		line, rest, ok := bytes.Cut(v.file, []byte("\n"))
 		if !ok {
 			t.Fatal("invalid test file: no payload")
 		}
-		test = rest
+		v.file = rest
 		if len(line) == 0 {
 			break
 		}
@@ -70,87 +78,194 @@ func testVector(t *testing.T, test []byte) {
 			default:
 				t.Fatal("invalid test file: unknown expect value:", value)
 			}
-			expect = value
+			v.expect = value
 		case "payload":
 			h, err := hex.DecodeString(value)
 			if err != nil {
 				t.Fatal(err)
 			}
-			payloadHash = (*[32]byte)(h)
+			v.payloadHash = (*[32]byte)(h)
+		case "file key":
+			h, err := hex.DecodeString(value)
+			if err != nil {
+				t.Fatal(err)
+			}
+			v.fileKey = (*[16]byte)(h)
 		case "identity":
 			i, err := age.ParseX25519Identity(value)
 			if err != nil {
 				t.Fatal(err)
 			}
-			identities = append(identities, i)
+			v.identities = append(v.identities, i)
 		case "passphrase":
 			i, err := age.NewScryptIdentity(value)
 			if err != nil {
 				t.Fatal(err)
 			}
-			identities = append(identities, i)
+			v.identities = append(v.identities, i)
 		case "armored":
-			armored = true
-		case "file key":
-			// Ignored.
+			v.armored = true
 		case "comment":
 			t.Log(value)
 		default:
 			t.Fatal("invalid test file: unknown header key:", key)
 		}
 	}
+	return v
+}
 
-	var in io.Reader = bytes.NewReader(test)
-	if armored {
+func TestVectors(t *testing.T) {
+	forEachVector(t, testVector)
+}
+
+func testVector(t *testing.T, v *vector) {
+	var in io.Reader = bytes.NewReader(v.file)
+	if v.armored {
 		in = armor.NewReader(in)
 	}
-	r, err := age.Decrypt(in, identities...)
+	r, err := age.Decrypt(in, v.identities...)
 	if err != nil && strings.HasSuffix(err.Error(), "bad header MAC") {
-		if expect == "HMAC failure" {
+		if v.expect == "HMAC failure" {
 			t.Log(err)
 			return
 		}
-		t.Fatalf("expected %s, got HMAC error", expect)
+		t.Fatalf("expected %s, got HMAC error", v.expect)
 	} else if e := new(armor.Error); errors.As(err, &e) {
-		if expect == "armor failure" {
+		if v.expect == "armor failure" {
 			t.Log(err)
 			return
 		}
-		t.Fatalf("expected %s, got: %v", expect, err)
+		t.Fatalf("expected %s, got: %v", v.expect, err)
 	} else if _, ok := err.(*age.NoIdentityMatchError); ok {
-		if expect == "no match" {
+		if v.expect == "no match" {
 			t.Log(err)
 			return
 		}
-		t.Fatalf("expected %s, got: %v", expect, err)
+		t.Fatalf("expected %s, got: %v", v.expect, err)
 	} else if err != nil {
-		if expect == "header failure" {
+		if v.expect == "header failure" {
 			t.Log(err)
 			return
 		}
-		t.Fatalf("expected %s, got: %v", expect, err)
-	} else if expect != "success" && expect != "payload failure" &&
-		expect != "armor failure" {
-		t.Fatalf("expected %s, got success", expect)
+		t.Fatalf("expected %s, got: %v", v.expect, err)
+	} else if v.expect != "success" && v.expect != "payload failure" &&
+		v.expect != "armor failure" {
+		t.Fatalf("expected %s, got success", v.expect)
 	}
 	out, err := io.ReadAll(r)
-	if err != nil && expect == "success" {
-		t.Fatalf("expected %s, got: %v", expect, err)
+	if err != nil && v.expect == "success" {
+		t.Fatalf("expected %s, got: %v", v.expect, err)
 	} else if err != nil {
 		t.Log(err)
-		if expect == "armor failure" {
+		if v.expect == "armor failure" {
 			if e := new(armor.Error); !errors.As(err, &e) {
 				t.Errorf("expected armor.Error, got %T", err)
 			}
 		}
-		if payloadHash != nil && sha256.Sum256(out) != *payloadHash {
+		if v.payloadHash != nil && sha256.Sum256(out) != *v.payloadHash {
 			t.Error("partial payload hash mismatch")
 		}
 		return
-	} else if expect != "success" {
-		t.Fatalf("expected %s, got success", expect)
+	} else if v.expect != "success" {
+		t.Fatalf("expected %s, got success", v.expect)
 	}
-	if sha256.Sum256(out) != *payloadHash {
+	if sha256.Sum256(out) != *v.payloadHash {
 		t.Error("payload hash mismatch")
 	}
 }
+
+// TestVectorsRoundTrip checks that any (valid) armor, header, and/or STREAM
+// payload in the test vectors re-encodes identically.
+func TestVectorsRoundTrip(t *testing.T) {
+	forEachVector(t, testVectorRoundTrip)
+}
+
+func testVectorRoundTrip(t *testing.T, v *vector) {
+	if v.armored {
+		t.Run("armor", func(t *testing.T) {
+			payload, err := io.ReadAll(armor.NewReader(bytes.NewReader(v.file)))
+			if err != nil {
+				// If the error is unexpected, it will be caught by TestVectors.
+				t.Skip(err)
+			}
+			buf := &bytes.Buffer{}
+			w := armor.NewWriter(buf)
+			if _, err := w.Write(payload); err != nil {
+				t.Fatal(err)
+			}
+			if err := w.Close(); err != nil {
+				t.Fatal(err)
+			}
+			// Armor format is not perfectly strict: CRLF ↔ LF and trailing and
+			// leading spaces are allowed and won't round-trip.
+			expect := bytes.Replace(v.file, []byte("\r\n"), []byte("\n"), -1)
+			expect = bytes.TrimSpace(expect)
+			expect = append(expect, '\n')
+			if !bytes.Equal(buf.Bytes(), expect) {
+				t.Error("got a different armor encoding")
+			}
+		})
+		// Armor tests are not interesting beyond their armor encoding.
+		return
+	}
+
+	hdr, p, err := format.Parse(bytes.NewReader(v.file))
+	if err != nil {
+		// If the error is unexpected, it will be caught by TestVectors.
+		t.Skip(err)
+	}
+	payload, err := io.ReadAll(p)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Run("header", func(t *testing.T) {
+		buf := &bytes.Buffer{}
+		if err := hdr.Marshal(buf); err != nil {
+			t.Fatal(err)
+		}
+		buf.Write(payload)
+		if !bytes.Equal(buf.Bytes(), v.file) {
+			t.Error("got a different header+payload encoding")
+		}
+	})
+
+	if v.fileKey != nil && len(payload) > 16 {
+		t.Run("STREAM", func(t *testing.T) {
+			nonce, payload := payload[:16], payload[16:]
+			key := streamKey(v.fileKey[:], nonce)
+			r, err := stream.NewReader(key, bytes.NewReader(payload))
+			if err != nil {
+				t.Fatal(err)
+			}
+			plaintext, err := io.ReadAll(r)
+			if err != nil {
+				// If the error is unexpected, it will be caught by TestVectors.
+				t.Skip(err)
+			}
+			buf := &bytes.Buffer{}
+			w, err := stream.NewWriter(key, buf)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if _, err := w.Write(plaintext); err != nil {
+				t.Fatal(err)
+			}
+			if err := w.Close(); err != nil {
+				t.Fatal(err)
+			}
+			if !bytes.Equal(buf.Bytes(), payload) {
+				t.Error("got a different STREAM ciphertext")
+			}
+		})
+	}
+}
+
+func streamKey(fileKey, nonce []byte) []byte {
+	h := hkdf.New(sha256.New, fileKey, nonce, []byte("payload"))
+	streamKey := make([]byte, chacha20poly1305.KeySize)
+	if _, err := io.ReadFull(h, streamKey); err != nil {
+		panic("age: internal error: failed to read from HKDF: " + err.Error())
+	}
+	return streamKey
+}

From 980763a16e30ea5c285c271344d2202fcb18c33b Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 23 Jul 2023 00:54:40 +0200
Subject: [PATCH 14/45] age: make TestVectorsRoundTrip a little stricter

---
 testkit_test.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/testkit_test.go b/testkit_test.go
index ae707ac..78ccc43 100644
--- a/testkit_test.go
+++ b/testkit_test.go
@@ -182,11 +182,13 @@ func TestVectorsRoundTrip(t *testing.T) {
 
 func testVectorRoundTrip(t *testing.T, v *vector) {
 	if v.armored {
+		if v.expect == "armor failure" {
+			t.SkipNow()
+		}
 		t.Run("armor", func(t *testing.T) {
 			payload, err := io.ReadAll(armor.NewReader(bytes.NewReader(v.file)))
 			if err != nil {
-				// If the error is unexpected, it will be caught by TestVectors.
-				t.Skip(err)
+				t.Fatal(err)
 			}
 			buf := &bytes.Buffer{}
 			w := armor.NewWriter(buf)
@@ -209,10 +211,12 @@ func testVectorRoundTrip(t *testing.T, v *vector) {
 		return
 	}
 
+	if v.expect == "header failure" {
+		t.SkipNow()
+	}
 	hdr, p, err := format.Parse(bytes.NewReader(v.file))
 	if err != nil {
-		// If the error is unexpected, it will be caught by TestVectors.
-		t.Skip(err)
+		t.Fatal(err)
 	}
 	payload, err := io.ReadAll(p)
 	if err != nil {
@@ -230,7 +234,7 @@ func testVectorRoundTrip(t *testing.T, v *vector) {
 		}
 	})
 
-	if v.fileKey != nil && len(payload) > 16 {
+	if v.expect == "success" {
 		t.Run("STREAM", func(t *testing.T) {
 			nonce, payload := payload[:16], payload[16:]
 			key := streamKey(v.fileKey[:], nonce)
@@ -240,8 +244,7 @@ func testVectorRoundTrip(t *testing.T, v *vector) {
 			}
 			plaintext, err := io.ReadAll(r)
 			if err != nil {
-				// If the error is unexpected, it will be caught by TestVectors.
-				t.Skip(err)
+				t.Fatal(err)
 			}
 			buf := &bytes.Buffer{}
 			w, err := stream.NewWriter(key, buf)

From 6976c5fca5d828b3e74e3a9721583af5478e8244 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Tue, 23 May 2023 16:19:41 +0200
Subject: [PATCH 15/45] plugin: expose package

---
 cmd/age/age.go                        | 2 +-
 cmd/age/parse.go                      | 2 +-
 cmd/age/tui.go                        | 2 +-
 {internal/plugin => plugin}/client.go | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {internal/plugin => plugin}/client.go (100%)

diff --git a/cmd/age/age.go b/cmd/age/age.go
index 8d44cf5..f81d3bb 100644
--- a/cmd/age/age.go
+++ b/cmd/age/age.go
@@ -18,7 +18,7 @@ import (
 	"filippo.io/age"
 	"filippo.io/age/agessh"
 	"filippo.io/age/armor"
-	"filippo.io/age/internal/plugin"
+	"filippo.io/age/plugin"
 	"golang.org/x/term"
 )
 
diff --git a/cmd/age/parse.go b/cmd/age/parse.go
index 709ee9e..4a59e7a 100644
--- a/cmd/age/parse.go
+++ b/cmd/age/parse.go
@@ -15,7 +15,7 @@ import (
 	"filippo.io/age"
 	"filippo.io/age/agessh"
 	"filippo.io/age/armor"
-	"filippo.io/age/internal/plugin"
+	"filippo.io/age/plugin"
 	"golang.org/x/crypto/cryptobyte"
 	"golang.org/x/crypto/ssh"
 )
diff --git a/cmd/age/tui.go b/cmd/age/tui.go
index 47a1360..c0b1b13 100644
--- a/cmd/age/tui.go
+++ b/cmd/age/tui.go
@@ -23,7 +23,7 @@ import (
 	"runtime"
 
 	"filippo.io/age/armor"
-	"filippo.io/age/internal/plugin"
+	"filippo.io/age/plugin"
 	"golang.org/x/term"
 )
 
diff --git a/internal/plugin/client.go b/plugin/client.go
similarity index 100%
rename from internal/plugin/client.go
rename to plugin/client.go

From 02181d83e952153472c6e8cd2b61a583a0e41391 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Tue, 23 May 2023 16:20:29 +0200
Subject: [PATCH 16/45] plugin: add identity and recipient encoding

---
 plugin/client.go | 24 +++++----------------
 plugin/encode.go | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 19 deletions(-)
 create mode 100644 plugin/encode.go

diff --git a/plugin/client.go b/plugin/client.go
index 6f97167..b4e0ff7 100644
--- a/plugin/client.go
+++ b/plugin/client.go
@@ -14,13 +14,11 @@ import (
 	"io"
 	"os"
 	"strconv"
-	"strings"
 	"time"
 
 	exec "golang.org/x/sys/execabs"
 
 	"filippo.io/age"
-	"filippo.io/age/internal/bech32"
 	"filippo.io/age/internal/format"
 )
 
@@ -36,14 +34,10 @@ type Recipient struct {
 var _ age.Recipient = &Recipient{}
 
 func NewRecipient(s string, ui *ClientUI) (*Recipient, error) {
-	hrp, _, err := bech32.Decode(s)
+	name, _, err := ParseRecipient(s)
 	if err != nil {
-		return nil, fmt.Errorf("invalid recipient encoding %q: %v", s, err)
+		return nil, err
 	}
-	if !strings.HasPrefix(hrp, "age1") {
-		return nil, fmt.Errorf("not a plugin recipient %q: %v", s, err)
-	}
-	name := strings.TrimPrefix(hrp, "age1")
 	return &Recipient{
 		name: name, encoding: s, ui: ui,
 	}, nil
@@ -151,25 +145,17 @@ type Identity struct {
 var _ age.Identity = &Identity{}
 
 func NewIdentity(s string, ui *ClientUI) (*Identity, error) {
-	hrp, _, err := bech32.Decode(s)
+	name, _, err := ParseIdentity(s)
 	if err != nil {
-		return nil, fmt.Errorf("invalid identity encoding: %v", err)
+		return nil, err
 	}
-	if !strings.HasPrefix(hrp, "AGE-PLUGIN-") || !strings.HasSuffix(hrp, "-") {
-		return nil, fmt.Errorf("not a plugin identity: %v", err)
-	}
-	name := strings.TrimSuffix(strings.TrimPrefix(hrp, "AGE-PLUGIN-"), "-")
-	name = strings.ToLower(name)
 	return &Identity{
 		name: name, encoding: s, ui: ui,
 	}, nil
 }
 
 func NewIdentityWithoutData(name string, ui *ClientUI) (*Identity, error) {
-	s, err := bech32.Encode("AGE-PLUGIN-"+strings.ToUpper(name)+"-", nil)
-	if err != nil {
-		return nil, err
-	}
+	s := EncodeIdentity(name, nil)
 	return &Identity{
 		name: name, encoding: s, ui: ui,
 	}, nil
diff --git a/plugin/encode.go b/plugin/encode.go
new file mode 100644
index 0000000..5000708
--- /dev/null
+++ b/plugin/encode.go
@@ -0,0 +1,55 @@
+// Copyright 2023 The age Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package plugin
+
+import (
+	"fmt"
+	"strings"
+
+	"filippo.io/age/internal/bech32"
+)
+
+// EncodeIdentity encodes a plugin identity string for a plugin with the given
+// name. If the name is invalid, it returns an empty string.
+func EncodeIdentity(name string, data []byte) string {
+	s, _ := bech32.Encode("AGE-PLUGIN-"+strings.ToUpper(name)+"-", data)
+	return s
+}
+
+// ParseIdentity decodes a plugin identity string. It returns the plugin name
+// in lowercase and the encoded data.
+func ParseIdentity(s string) (name string, data []byte, err error) {
+	hrp, data, err := bech32.Decode(s)
+	if err != nil {
+		return "", nil, fmt.Errorf("invalid identity encoding: %v", err)
+	}
+	if !strings.HasPrefix(hrp, "AGE-PLUGIN-") || !strings.HasSuffix(hrp, "-") {
+		return "", nil, fmt.Errorf("not a plugin identity: %v", err)
+	}
+	name = strings.TrimSuffix(strings.TrimPrefix(hrp, "AGE-PLUGIN-"), "-")
+	name = strings.ToLower(name)
+	return name, data, nil
+}
+
+// EncodeRecipient encodes a plugin recipient string for a plugin with the given
+// name. If the name is invalid, it returns an empty string.
+func EncodeRecipient(name string, data []byte) string {
+	s, _ := bech32.Encode("age1"+strings.ToLower(name), data)
+	return s
+}
+
+// ParseRecipient decodes a plugin recipient string. It returns the plugin name
+// in lowercase and the encoded data.
+func ParseRecipient(s string) (name string, data []byte, err error) {
+	hrp, data, err := bech32.Decode(s)
+	if err != nil {
+		return "", nil, fmt.Errorf("invalid recipient encoding: %v", err)
+	}
+	if !strings.HasPrefix(hrp, "age1") {
+		return "", nil, fmt.Errorf("not a plugin recipient: %v", err)
+	}
+	name = strings.TrimPrefix(hrp, "age1")
+	return name, data, nil
+}

From 004b544d838bbf016ee52109ee5e0cdc63bcb2e0 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Tue, 23 May 2023 17:36:32 +0200
Subject: [PATCH 17/45] plugin: add EncodeX25519Recipient

---
 plugin/encode.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugin/encode.go b/plugin/encode.go
index 5000708..44912e5 100644
--- a/plugin/encode.go
+++ b/plugin/encode.go
@@ -5,6 +5,7 @@
 package plugin
 
 import (
+	"crypto/ecdh"
 	"fmt"
 	"strings"
 
@@ -53,3 +54,13 @@ func ParseRecipient(s string) (name string, data []byte, err error) {
 	name = strings.TrimPrefix(hrp, "age1")
 	return name, data, nil
 }
+
+// EncodeX25519Recipient encodes a native X25519 recipient from a
+// [crypto/ecdh.X25519] public key. It's meant for plugins that implement
+// identities that are compatible with native recipients.
+func EncodeX25519Recipient(pk *ecdh.PublicKey) (string, error) {
+	if pk.Curve() != ecdh.X25519() {
+		return "", fmt.Errorf("wrong ecdh Curve")
+	}
+	return bech32.Encode("age", pk.Bytes())
+}

From dd733c5c0f64124dba2f51bd65f51f58813acc03 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sat, 5 Aug 2023 14:55:16 +0200
Subject: [PATCH 18/45] cmd/age: grease the client-controlled plugin phases

---
 cmd/age/age_test.go | 4 ++++
 plugin/client.go    | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/cmd/age/age_test.go b/cmd/age/age_test.go
index 3d8793b..53eb799 100644
--- a/cmd/age/age_test.go
+++ b/cmd/age/age_test.go
@@ -36,6 +36,8 @@ func TestMain(m *testing.M) {
 				scanner := bufio.NewScanner(os.Stdin)
 				scanner.Scan() // add-recipient
 				scanner.Scan() // body
+				scanner.Scan() // grease
+				scanner.Scan() // body
 				scanner.Scan() // wrap-file-key
 				scanner.Scan() // body
 				fileKey := scanner.Text()
@@ -51,6 +53,8 @@ func TestMain(m *testing.M) {
 				scanner := bufio.NewScanner(os.Stdin)
 				scanner.Scan() // add-identity
 				scanner.Scan() // body
+				scanner.Scan() // grease
+				scanner.Scan() // body
 				scanner.Scan() // recipient-stanza
 				scanner.Scan() // body
 				fileKey := scanner.Text()
diff --git a/plugin/client.go b/plugin/client.go
index b4e0ff7..a45587f 100644
--- a/plugin/client.go
+++ b/plugin/client.go
@@ -12,6 +12,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"math/rand"
 	"os"
 	"strconv"
 	"time"
@@ -71,6 +72,9 @@ func (r *Recipient) Wrap(fileKey []byte) (stanzas []*age.Stanza, err error) {
 	if err := writeStanza(conn, addType, r.encoding); err != nil {
 		return nil, err
 	}
+	if err := writeStanza(conn, fmt.Sprintf("grease-%x", rand.Int())); err != nil {
+		return nil, err
+	}
 	if err := writeStanzaWithBody(conn, "wrap-file-key", fileKey); err != nil {
 		return nil, err
 	}
@@ -197,6 +201,9 @@ func (i *Identity) Unwrap(stanzas []*age.Stanza) (fileKey []byte, err error) {
 	if err := writeStanza(conn, "add-identity", i.encoding); err != nil {
 		return nil, err
 	}
+	if err := writeStanza(conn, fmt.Sprintf("grease-%x", rand.Int())); err != nil {
+		return nil, err
+	}
 	for _, rs := range stanzas {
 		s := &format.Stanza{
 			Type: "recipient-stanza",

From c89f0b932ecd7222179f2fb46bbd033d40af65a0 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sat, 5 Aug 2023 19:19:26 +0200
Subject: [PATCH 19/45] age,plugin: add RecipientWithLabels

---
 age.go                |  59 ++++++++++++++-----
 age_test.go           |  64 +++++++++++++++++++++
 cmd/age/age_test.go   |   2 +
 go.mod                |   2 +-
 go.sum                |   4 +-
 plugin/client.go      |  59 +++++++++++++------
 plugin/client_test.go | 129 ++++++++++++++++++++++++++++++++++++++++++
 scrypt.go             |  24 ++++++++
 8 files changed, 310 insertions(+), 33 deletions(-)
 create mode 100644 plugin/client_test.go

diff --git a/age.go b/age.go
index a0ef0bb..c9b17bc 100644
--- a/age.go
+++ b/age.go
@@ -13,7 +13,7 @@
 // age encrypted files are binary and not malleable. For encoding them as text,
 // use the filippo.io/age/armor package.
 //
-// Key management
+// # Key management
 //
 // age does not have a global keyring. Instead, since age keys are small,
 // textual, and cheap, you are encouraged to generate dedicated keys for each
@@ -34,7 +34,7 @@
 // infrastructure, you might want to consider implementing your own Recipient
 // and Identity.
 //
-// Backwards compatibility
+// # Backwards compatibility
 //
 // Files encrypted with a stable version (not alpha, beta, or release candidate)
 // of age, or with any v1.0.0 beta or release candidate, will decrypt with any
@@ -51,6 +51,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"sort"
 
 	"filippo.io/age/internal/format"
 	"filippo.io/age/internal/stream"
@@ -84,6 +85,21 @@ type Recipient interface {
 	Wrap(fileKey []byte) ([]*Stanza, error)
 }
 
+// RecipientWithLabels can be optionally implemented by a Recipient, in which
+// case Encrypt will use WrapWithLabels instead of Wrap.
+//
+// Encrypt will succeed only if the labels returned by all the recipients
+// (assuming the empty set for those that don't implement RecipientWithLabels)
+// are the same.
+//
+// This can be used to ensure a recipient is only used with other recipients
+// with equivalent properties (for example by setting a "postquantum" label) or
+// to ensure a recipient is always used alone (by returning a random label, for
+// example to preserve its authentication properties).
+type RecipientWithLabels interface {
+	WrapWithLabels(fileKey []byte) (s []*Stanza, labels []string, err error)
+}
+
 // A Stanza is a section of the age header that encapsulates the file key as
 // encrypted to a specific recipient.
 //
@@ -111,27 +127,24 @@ func Encrypt(dst io.Writer, recipients ...Recipient) (io.WriteCloser, error) {
 		return nil, errors.New("no recipients specified")
 	}
 
-	// As a best effort, prevent an API user from generating a file that the
-	// ScryptIdentity will refuse to decrypt. This check can't unfortunately be
-	// implemented as part of the Recipient interface, so it lives as a special
-	// case in Encrypt.
-	for _, r := range recipients {
-		if _, ok := r.(*ScryptRecipient); ok && len(recipients) != 1 {
-			return nil, errors.New("an ScryptRecipient must be the only one for the file")
-		}
-	}
-
 	fileKey := make([]byte, fileKeySize)
 	if _, err := rand.Read(fileKey); err != nil {
 		return nil, err
 	}
 
 	hdr := &format.Header{}
+	var labels []string
 	for i, r := range recipients {
-		stanzas, err := r.Wrap(fileKey)
+		stanzas, l, err := wrapWithLabels(r, fileKey)
 		if err != nil {
 			return nil, fmt.Errorf("failed to wrap key for recipient #%d: %v", i, err)
 		}
+		sort.Strings(l)
+		if i == 0 {
+			labels = l
+		} else if !slicesEqual(labels, l) {
+			return nil, fmt.Errorf("incompatible recipients")
+		}
 		for _, s := range stanzas {
 			hdr.Recipients = append(hdr.Recipients, (*format.Stanza)(s))
 		}
@@ -156,6 +169,26 @@ func Encrypt(dst io.Writer, recipients ...Recipient) (io.WriteCloser, error) {
 	return stream.NewWriter(streamKey(fileKey, nonce), dst)
 }
 
+func wrapWithLabels(r Recipient, fileKey []byte) (s []*Stanza, labels []string, err error) {
+	if r, ok := r.(RecipientWithLabels); ok {
+		return r.WrapWithLabels(fileKey)
+	}
+	s, err = r.Wrap(fileKey)
+	return
+}
+
+func slicesEqual(s1, s2 []string) bool {
+	if len(s1) != len(s2) {
+		return false
+	}
+	for i := range s1 {
+		if s1[i] != s2[i] {
+			return false
+		}
+	}
+	return true
+}
+
 // NoIdentityMatchError is returned by Decrypt when none of the supplied
 // identities match the encrypted file.
 type NoIdentityMatchError struct {
diff --git a/age_test.go b/age_test.go
index 3ae95bf..8cf6867 100644
--- a/age_test.go
+++ b/age_test.go
@@ -220,3 +220,67 @@ AGE-SECRET-KEY--1D6K0SGAX3NU66R4GYFZY0UQWCLM3UUSF3CXLW4KXZM342WQSJ82QKU59Q`},
 		})
 	}
 }
+
+type testRecipient struct {
+	labels []string
+}
+
+func (testRecipient) Wrap(fileKey []byte) ([]*age.Stanza, error) {
+	panic("expected WrapWithLabels instead")
+}
+
+func (t testRecipient) WrapWithLabels(fileKey []byte) (s []*age.Stanza, labels []string, err error) {
+	return []*age.Stanza{{Type: "test"}}, t.labels, nil
+}
+
+func TestLabels(t *testing.T) {
+	scrypt, err := age.NewScryptRecipient("xxx")
+	if err != nil {
+		t.Fatal(err)
+	}
+	i, err := age.GenerateX25519Identity()
+	if err != nil {
+		t.Fatal(err)
+	}
+	x25519 := i.Recipient()
+	pqc := testRecipient{[]string{"postquantum"}}
+	pqcAndFoo := testRecipient{[]string{"postquantum", "foo"}}
+	fooAndPQC := testRecipient{[]string{"foo", "postquantum"}}
+
+	if _, err := age.Encrypt(io.Discard, scrypt, scrypt); err == nil {
+		t.Error("expected two scrypt recipients to fail")
+	}
+	if _, err := age.Encrypt(io.Discard, scrypt, x25519); err == nil {
+		t.Error("expected x25519 mixed with scrypt to fail")
+	}
+	if _, err := age.Encrypt(io.Discard, x25519, scrypt); err == nil {
+		t.Error("expected x25519 mixed with scrypt to fail")
+	}
+	if _, err := age.Encrypt(io.Discard, pqc, x25519); err == nil {
+		t.Error("expected x25519 mixed with pqc to fail")
+	}
+	if _, err := age.Encrypt(io.Discard, x25519, pqc); err == nil {
+		t.Error("expected x25519 mixed with pqc to fail")
+	}
+	if _, err := age.Encrypt(io.Discard, pqc, pqc); err != nil {
+		t.Errorf("expected two pqc to work, got %v", err)
+	}
+	if _, err := age.Encrypt(io.Discard, pqc); err != nil {
+		t.Errorf("expected one pqc to work, got %v", err)
+	}
+	if _, err := age.Encrypt(io.Discard, pqcAndFoo, pqc); err == nil {
+		t.Error("expected pqc+foo mixed with pqc to fail")
+	}
+	if _, err := age.Encrypt(io.Discard, pqc, pqcAndFoo); err == nil {
+		t.Error("expected pqc+foo mixed with pqc to fail")
+	}
+	if _, err := age.Encrypt(io.Discard, pqc, pqc, pqcAndFoo); err == nil {
+		t.Error("expected pqc+foo mixed with pqc to fail")
+	}
+	if _, err := age.Encrypt(io.Discard, pqcAndFoo, pqcAndFoo); err != nil {
+		t.Errorf("expected two pqc+foo to work, got %v", err)
+	}
+	if _, err := age.Encrypt(io.Discard, pqcAndFoo, fooAndPQC); err != nil {
+		t.Errorf("expected pqc+foo mixed with foo+pqc to work, got %v", err)
+	}
+}
diff --git a/cmd/age/age_test.go b/cmd/age/age_test.go
index 53eb799..9291829 100644
--- a/cmd/age/age_test.go
+++ b/cmd/age/age_test.go
@@ -41,6 +41,8 @@ func TestMain(m *testing.M) {
 				scanner.Scan() // wrap-file-key
 				scanner.Scan() // body
 				fileKey := scanner.Text()
+				scanner.Scan() // extension-labels
+				scanner.Scan() // body
 				scanner.Scan() // done
 				scanner.Scan() // body
 				os.Stdout.WriteString("-> recipient-stanza 0 test\n")
diff --git a/go.mod b/go.mod
index 13f1712..d382a0c 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	filippo.io/edwards25519 v1.0.0
 	golang.org/x/crypto v0.4.0
-	golang.org/x/sys v0.3.0
+	golang.org/x/sys v0.11.0
 	golang.org/x/term v0.3.0
 )
 
diff --git a/go.sum b/go.sum
index 9bcb745..98da6be 100644
--- a/go.sum
+++ b/go.sum
@@ -8,7 +8,7 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgc
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
 golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
-golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
 golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
diff --git a/plugin/client.go b/plugin/client.go
index a45587f..dca1a52 100644
--- a/plugin/client.go
+++ b/plugin/client.go
@@ -14,6 +14,7 @@ import (
 	"io"
 	"math/rand"
 	"os"
+	"path/filepath"
 	"strconv"
 	"time"
 
@@ -33,6 +34,7 @@ type Recipient struct {
 }
 
 var _ age.Recipient = &Recipient{}
+var _ age.RecipientWithLabels = &Recipient{}
 
 func NewRecipient(s string, ui *ClientUI) (*Recipient, error) {
 	name, _, err := ParseRecipient(s)
@@ -52,6 +54,11 @@ func (r *Recipient) Name() string {
 }
 
 func (r *Recipient) Wrap(fileKey []byte) (stanzas []*age.Stanza, err error) {
+	stanzas, _, err = r.WrapWithLabels(fileKey)
+	return
+}
+
+func (r *Recipient) WrapWithLabels(fileKey []byte) (stanzas []*age.Stanza, labels []string, err error) {
 	defer func() {
 		if err != nil {
 			err = fmt.Errorf("%s plugin: %w", r.name, err)
@@ -60,7 +67,7 @@ func (r *Recipient) Wrap(fileKey []byte) (stanzas []*age.Stanza, err error) {
 
 	conn, err := openClientConnection(r.name, "recipient-v1")
 	if err != nil {
-		return nil, fmt.Errorf("couldn't start plugin: %v", err)
+		return nil, nil, fmt.Errorf("couldn't start plugin: %v", err)
 	}
 	defer conn.Close()
 
@@ -70,16 +77,19 @@ func (r *Recipient) Wrap(fileKey []byte) (stanzas []*age.Stanza, err error) {
 		addType = "add-identity"
 	}
 	if err := writeStanza(conn, addType, r.encoding); err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	if err := writeStanza(conn, fmt.Sprintf("grease-%x", rand.Int())); err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	if err := writeStanzaWithBody(conn, "wrap-file-key", fileKey); err != nil {
-		return nil, err
+		return nil, nil, err
+	}
+	if err := writeStanza(conn, "extension-labels"); err != nil {
+		return nil, nil, err
 	}
 	if err := writeStanza(conn, "done"); err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	// Phase 2: plugin responds with stanzas
@@ -88,21 +98,21 @@ ReadLoop:
 	for {
 		s, err := r.ui.readStanza(r.name, sr)
 		if err != nil {
-			return nil, err
+			return nil, nil, err
 		}
 
 		switch s.Type {
 		case "recipient-stanza":
 			if len(s.Args) < 2 {
-				return nil, fmt.Errorf("malformed recipient stanza: unexpected argument count")
+				return nil, nil, fmt.Errorf("malformed recipient stanza: unexpected argument count")
 			}
 			n, err := strconv.Atoi(s.Args[0])
 			if err != nil {
-				return nil, fmt.Errorf("malformed recipient stanza: invalid index")
+				return nil, nil, fmt.Errorf("malformed recipient stanza: invalid index")
 			}
 			// We only send a single file key, so the index must be 0.
 			if n != 0 {
-				return nil, fmt.Errorf("malformed recipient stanza: unexpected index")
+				return nil, nil, fmt.Errorf("malformed recipient stanza: unexpected index")
 			}
 
 			stanzas = append(stanzas, &age.Stanza{
@@ -112,32 +122,41 @@ ReadLoop:
 			})
 
 			if err := writeStanza(conn, "ok"); err != nil {
-				return nil, err
+				return nil, nil, err
+			}
+		case "labels":
+			if labels != nil {
+				return nil, nil, fmt.Errorf("repeated labels stanza")
+			}
+			labels = s.Args
+
+			if err := writeStanza(conn, "ok"); err != nil {
+				return nil, nil, err
 			}
 		case "error":
 			if err := writeStanza(conn, "ok"); err != nil {
-				return nil, err
+				return nil, nil, err
 			}
 
-			return nil, fmt.Errorf("%s", s.Body)
+			return nil, nil, fmt.Errorf("%s", s.Body)
 		case "done":
 			break ReadLoop
 		default:
 			if ok, err := r.ui.handle(r.name, conn, s); err != nil {
-				return nil, err
+				return nil, nil, err
 			} else if !ok {
 				if err := writeStanza(conn, "unsupported"); err != nil {
-					return nil, err
+					return nil, nil, err
 				}
 			}
 		}
 	}
 
 	if len(stanzas) == 0 {
-		return nil, fmt.Errorf("received zero recipient stanzas")
+		return nil, nil, fmt.Errorf("received zero recipient stanzas")
 	}
 
-	return stanzas, nil
+	return stanzas, labels, nil
 }
 
 type Identity struct {
@@ -367,8 +386,14 @@ type clientConnection struct {
 	close     func()
 }
 
+var testOnlyPluginPath string
+
 func openClientConnection(name, protocol string) (*clientConnection, error) {
-	cmd := exec.Command("age-plugin-"+name, "--age-plugin="+protocol)
+	path := "age-plugin-" + name
+	if testOnlyPluginPath != "" {
+		path = filepath.Join(testOnlyPluginPath, path)
+	}
+	cmd := exec.Command(path, "--age-plugin="+protocol)
 
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
diff --git a/plugin/client_test.go b/plugin/client_test.go
new file mode 100644
index 0000000..c4cad60
--- /dev/null
+++ b/plugin/client_test.go
@@ -0,0 +1,129 @@
+// Copyright 2023 The age Authors
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+package plugin
+
+import (
+	"bufio"
+	"io"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"filippo.io/age"
+	"filippo.io/age/internal/bech32"
+)
+
+func TestMain(m *testing.M) {
+	switch filepath.Base(os.Args[0]) {
+	// TODO: deduplicate from cmd/age TestMain.
+	case "age-plugin-test":
+		switch os.Args[1] {
+		case "--age-plugin=recipient-v1":
+			scanner := bufio.NewScanner(os.Stdin)
+			scanner.Scan() // add-recipient
+			scanner.Scan() // body
+			scanner.Scan() // grease
+			scanner.Scan() // body
+			scanner.Scan() // wrap-file-key
+			scanner.Scan() // body
+			fileKey := scanner.Text()
+			scanner.Scan() // extension-labels
+			scanner.Scan() // body
+			scanner.Scan() // done
+			scanner.Scan() // body
+			os.Stdout.WriteString("-> recipient-stanza 0 test\n")
+			os.Stdout.WriteString(fileKey + "\n")
+			scanner.Scan() // ok
+			scanner.Scan() // body
+			os.Stdout.WriteString("-> done\n\n")
+			os.Exit(0)
+		default:
+			panic(os.Args[1])
+		}
+	case "age-plugin-testpqc":
+		switch os.Args[1] {
+		case "--age-plugin=recipient-v1":
+			scanner := bufio.NewScanner(os.Stdin)
+			scanner.Scan() // add-recipient
+			scanner.Scan() // body
+			scanner.Scan() // grease
+			scanner.Scan() // body
+			scanner.Scan() // wrap-file-key
+			scanner.Scan() // body
+			fileKey := scanner.Text()
+			scanner.Scan() // extension-labels
+			scanner.Scan() // body
+			scanner.Scan() // done
+			scanner.Scan() // body
+			os.Stdout.WriteString("-> recipient-stanza 0 test\n")
+			os.Stdout.WriteString(fileKey + "\n")
+			scanner.Scan() // ok
+			scanner.Scan() // body
+			os.Stdout.WriteString("-> labels postquantum\n\n")
+			scanner.Scan() // ok
+			scanner.Scan() // body
+			os.Stdout.WriteString("-> done\n\n")
+			os.Exit(0)
+		default:
+			panic(os.Args[1])
+		}
+	default:
+		os.Exit(m.Run())
+	}
+}
+
+func TestLabels(t *testing.T) {
+	temp := t.TempDir()
+	testOnlyPluginPath = temp
+	t.Cleanup(func() { testOnlyPluginPath = "" })
+	ex, err := os.Executable()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Link(ex, filepath.Join(temp, "age-plugin-test")); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Chmod(filepath.Join(temp, "age-plugin-test"), 0755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Link(ex, filepath.Join(temp, "age-plugin-testpqc")); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Chmod(filepath.Join(temp, "age-plugin-testpqc"), 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	name, err := bech32.Encode("age1test", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	testPlugin, err := NewRecipient(name, &ClientUI{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	namePQC, err := bech32.Encode("age1testpqc", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	testPluginPQC, err := NewRecipient(namePQC, &ClientUI{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if _, err := age.Encrypt(io.Discard, testPluginPQC); err != nil {
+		t.Errorf("expected one pqc to work, got %v", err)
+	}
+	if _, err := age.Encrypt(io.Discard, testPluginPQC, testPluginPQC); err != nil {
+		t.Errorf("expected two pqc to work, got %v", err)
+	}
+	if _, err := age.Encrypt(io.Discard, testPluginPQC, testPlugin); err == nil {
+		t.Errorf("expected one pqc and one normal to fail")
+	}
+	if _, err := age.Encrypt(io.Discard, testPlugin, testPluginPQC); err == nil {
+		t.Errorf("expected one pqc and one normal to fail")
+	}
+}
diff --git a/scrypt.go b/scrypt.go
index 1346ad1..73d13b7 100644
--- a/scrypt.go
+++ b/scrypt.go
@@ -6,6 +6,7 @@ package age
 
 import (
 	"crypto/rand"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"regexp"
@@ -87,6 +88,29 @@ func (r *ScryptRecipient) Wrap(fileKey []byte) ([]*Stanza, error) {
 	return []*Stanza{l}, nil
 }
 
+// WrapWithLabels implements [age.RecipientWithLabels], returning a random
+// label. This ensures a ScryptRecipient can't be mixed with other recipients
+// (including other ScryptRecipients).
+//
+// Users reasonably expect files encrypted to a passphrase to be [authenticated]
+// by that passphrase, i.e. for it to be impossible to produce a file that
+// decrypts successfully with a passphrase without knowing it. If a file is
+// encrypted to other recipients, those parties can produce different files that
+// would break that expectation.
+//
+// [authenticated]: https://words.filippo.io/dispatches/age-authentication/
+func (r *ScryptRecipient) WrapWithLabels(fileKey []byte) (stanzas []*Stanza, labels []string, err error) {
+	stanzas, err = r.Wrap(fileKey)
+
+	random := make([]byte, 16)
+	if _, err := rand.Read(random); err != nil {
+		return nil, nil, err
+	}
+	labels = []string{hex.EncodeToString(random)}
+
+	return
+}
+
 // ScryptIdentity is a password-based identity.
 type ScryptIdentity struct {
 	password      []byte

From 9fd564d5430f9e340f9ad01332623dde648ab240 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 6 Aug 2023 18:29:16 +0200
Subject: [PATCH 20/45] .github/workflows: update and fix CI

---
 .github/workflows/test.yml          | 4 ++--
 cmd/age/testdata/encrypted_keys.txt | 1 +
 cmd/age/testdata/scrypt.txt         | 1 +
 cmd/age/testdata/terminal.txt       | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3059198..565963a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: [1.18.x, 1.19.x]
+        go: [1.19.x, 1.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -24,7 +24,7 @@ jobs:
         run: go test -race ./...
   freebsd:
     name: Test (FreeBSD)
-    runs-on: macos-10.15
+    runs-on: macos-12
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
diff --git a/cmd/age/testdata/encrypted_keys.txt b/cmd/age/testdata/encrypted_keys.txt
index 8671079..7b4f716 100644
--- a/cmd/age/testdata/encrypted_keys.txt
+++ b/cmd/age/testdata/encrypted_keys.txt
@@ -2,6 +2,7 @@
 # age file password prompt during encryption
 
 [windows] skip # no pty support
+[go1.20] skip # https://go.dev/issue/61779
 
 # use an encrypted OpenSSH private key without .pub file
 age -R key_ed25519.pub -o ed25519.age input
diff --git a/cmd/age/testdata/scrypt.txt b/cmd/age/testdata/scrypt.txt
index 987cfbb..8a1b684 100644
--- a/cmd/age/testdata/scrypt.txt
+++ b/cmd/age/testdata/scrypt.txt
@@ -1,4 +1,5 @@
 [windows] skip # no pty support
+[go1.20] skip # https://go.dev/issue/61779
 
 # encrypt with a provided passphrase
 stdin input
diff --git a/cmd/age/testdata/terminal.txt b/cmd/age/testdata/terminal.txt
index cd2f5d4..849e772 100644
--- a/cmd/age/testdata/terminal.txt
+++ b/cmd/age/testdata/terminal.txt
@@ -1,4 +1,5 @@
 [windows] skip # no pty support
+[go1.20] skip # https://go.dev/issue/61779
 
 # controlling terminal is used instead of stdin/stderr
 pty terminal

From f1f96c25e062c56098f7b91a378e5858af7dbd34 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 6 Aug 2023 18:36:06 +0200
Subject: [PATCH 21/45] plugin: build tag EncodeX25519Recipient which uses
 crypto/ecdh

---
 plugin/encode.go        | 11 -----------
 plugin/encode_go1.20.go | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 plugin/encode_go1.20.go

diff --git a/plugin/encode.go b/plugin/encode.go
index 44912e5..5000708 100644
--- a/plugin/encode.go
+++ b/plugin/encode.go
@@ -5,7 +5,6 @@
 package plugin
 
 import (
-	"crypto/ecdh"
 	"fmt"
 	"strings"
 
@@ -54,13 +53,3 @@ func ParseRecipient(s string) (name string, data []byte, err error) {
 	name = strings.TrimPrefix(hrp, "age1")
 	return name, data, nil
 }
-
-// EncodeX25519Recipient encodes a native X25519 recipient from a
-// [crypto/ecdh.X25519] public key. It's meant for plugins that implement
-// identities that are compatible with native recipients.
-func EncodeX25519Recipient(pk *ecdh.PublicKey) (string, error) {
-	if pk.Curve() != ecdh.X25519() {
-		return "", fmt.Errorf("wrong ecdh Curve")
-	}
-	return bech32.Encode("age", pk.Bytes())
-}
diff --git a/plugin/encode_go1.20.go b/plugin/encode_go1.20.go
new file mode 100644
index 0000000..6b17166
--- /dev/null
+++ b/plugin/encode_go1.20.go
@@ -0,0 +1,24 @@
+// Copyright 2023 The age Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build go1.20
+
+package plugin
+
+import (
+	"crypto/ecdh"
+	"fmt"
+
+	"filippo.io/age/internal/bech32"
+)
+
+// EncodeX25519Recipient encodes a native X25519 recipient from a
+// [crypto/ecdh.X25519] public key. It's meant for plugins that implement
+// identities that are compatible with native recipients.
+func EncodeX25519Recipient(pk *ecdh.PublicKey) (string, error) {
+	if pk.Curve() != ecdh.X25519() {
+		return "", fmt.Errorf("wrong ecdh Curve")
+	}
+	return bech32.Encode("age", pk.Bytes())
+}

From 294b0aa1e35ad48e22fc0a93ca60787714347ee1 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 6 Aug 2023 19:03:27 +0200
Subject: [PATCH 22/45] plugin: skip execution tests on Windows for now

---
 plugin/client_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugin/client_test.go b/plugin/client_test.go
index c4cad60..fc28789 100644
--- a/plugin/client_test.go
+++ b/plugin/client_test.go
@@ -11,6 +11,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"runtime"
 	"testing"
 
 	"filippo.io/age"
@@ -77,6 +78,9 @@ func TestMain(m *testing.M) {
 }
 
 func TestLabels(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("Windows support is TODO")
+	}
 	temp := t.TempDir()
 	testOnlyPluginPath = temp
 	t.Cleanup(func() { testOnlyPluginPath = "" })

From 93055632adee9025d196e483d8e2ac43ff9a3fdc Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 6 Aug 2023 19:28:49 +0200
Subject: [PATCH 23/45] cmd/age: fix FreeBSD tests

---
 cmd/age/testdata/encrypted_keys.txt | 20 ++++++++++----------
 cmd/age/testdata/scrypt.txt         | 22 +++++++++++-----------
 cmd/age/testdata/terminal.txt       | 24 ++++++++++++------------
 go.mod                              |  4 ++--
 go.sum                              |  8 ++++----
 5 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/cmd/age/testdata/encrypted_keys.txt b/cmd/age/testdata/encrypted_keys.txt
index 7b4f716..050bf13 100644
--- a/cmd/age/testdata/encrypted_keys.txt
+++ b/cmd/age/testdata/encrypted_keys.txt
@@ -1,20 +1,20 @@
 # TODO: age-encrypted private keys, multiple identities, -i ordering, -e -i,
 # age file password prompt during encryption
 
-[windows] skip # no pty support
-[go1.20] skip # https://go.dev/issue/61779
+[!linux] [!darwin] skip # no pty support
+[darwin] [go1.20] skip # https://go.dev/issue/61779
 
 # use an encrypted OpenSSH private key without .pub file
 age -R key_ed25519.pub -o ed25519.age input
 rm key_ed25519.pub
-pty terminal
+ttyin terminal
 age -d -i key_ed25519 ed25519.age
 cmp stdout input
 ! stderr .
 
 # -e -i with an encrypted OpenSSH private key
 age -e -i key_ed25519 -o ed25519.age input
-pty terminal
+ttyin terminal
 age -d -i key_ed25519 ed25519.age
 cmp stdout input
 
@@ -25,7 +25,7 @@ stderr 'no identity matched any of the recipients'
 
 # use an encrypted legacy PEM private key with a .pub file
 age -R key_rsa_legacy.pub -o rsa_legacy.age input
-pty terminal
+ttyin terminal
 age -d -i key_rsa_legacy rsa_legacy.age
 cmp stdout input
 ! stderr .
@@ -35,7 +35,7 @@ stderr 'no identity matched any of the recipients'
 
 # -e -i with an encrypted legacy PEM private key
 age -e -i key_rsa_legacy -o rsa_legacy.age input
-pty terminal
+ttyin terminal
 age -d -i key_rsa_legacy rsa_legacy.age
 cmp stdout input
 
@@ -46,17 +46,17 @@ stderr 'key_rsa_legacy.pub'
 
 # mismatched .pub file causes an error
 cp key_rsa_legacy key_rsa_other
-pty terminal
+ttyin terminal
 ! age -d -i key_rsa_other rsa_other.age
 stderr 'mismatched private and public SSH key'
 
 # buffer armored ciphertext before prompting if stdin is the terminal
-pty terminal
+ttyin terminal
 age -e -i key_ed25519 -a -o test.age input
 exec cat test.age terminal # concatenated ciphertext + password
-pty -stdin stdout
+ttyin -stdin stdout
 age -d -i key_ed25519
-ptyout 'Enter passphrase'
+ttyout 'Enter passphrase'
 ! stderr .
 cmp stdout input
 
diff --git a/cmd/age/testdata/scrypt.txt b/cmd/age/testdata/scrypt.txt
index 8a1b684..9329885 100644
--- a/cmd/age/testdata/scrypt.txt
+++ b/cmd/age/testdata/scrypt.txt
@@ -1,43 +1,43 @@
-[windows] skip # no pty support
-[go1.20] skip # https://go.dev/issue/61779
+[!linux] [!darwin] skip # no pty support
+[darwin] [go1.20] skip # https://go.dev/issue/61779
 
 # encrypt with a provided passphrase
 stdin input
-pty terminal
+ttyin terminal
 age -p -o test.age
-ptyout 'Enter passphrase'
+ttyout 'Enter passphrase'
 ! stderr .
 ! stdout .
 
 # decrypt with a provided passphrase
-pty terminal
+ttyin terminal
 age -d test.age
-ptyout 'Enter passphrase'
+ttyout 'Enter passphrase'
 ! stderr .
 cmp stdout input
 
 # decrypt with the wrong passphrase
-pty wrong
+ttyin wrong
 ! age -d test.age
 stderr 'incorrect passphrase'
 
 # encrypt with a generated passphrase
 stdin input
-pty empty
+ttyin empty
 age -p -o test.age
 ! stderr .
 ! stdout .
-pty autogenerated
+ttyin autogenerated
 age -d test.age
 cmp stdout input
 
 # fail when -i is present
-pty terminal
+ttyin terminal
 ! age -d -i key.txt test.age
 stderr 'file is passphrase-encrypted but identities were specified'
 
 # fail when passphrases don't match
-pty wrong
+ttyin wrong
 ! age -p -o fail.age
 stderr 'passphrases didn''t match'
 ! exists fail.age
diff --git a/cmd/age/testdata/terminal.txt b/cmd/age/testdata/terminal.txt
index 849e772..b2cf007 100644
--- a/cmd/age/testdata/terminal.txt
+++ b/cmd/age/testdata/terminal.txt
@@ -1,22 +1,22 @@
-[windows] skip # no pty support
-[go1.20] skip # https://go.dev/issue/61779
+[!linux] [!darwin] skip # no pty support
+[darwin] [go1.20] skip # https://go.dev/issue/61779
 
 # controlling terminal is used instead of stdin/stderr
-pty terminal
+ttyin terminal
 age -p -o test.age input
 ! stderr .
 
 # autogenerated passphrase is printed to terminal
-pty empty
+ttyin empty
 age -p -o test.age input
-ptyout 'autogenerated passphrase'
+ttyout 'autogenerated passphrase'
 ! stderr .
 
 # with no controlling terminal, stdin terminal is used
 ## TODO: enable once https://golang.org/issue/53601 is fixed
 ## and Noctty is added to testscript.
 # noctty
-# pty -stdin terminal
+# ttyin -stdin terminal
 # age -p -o test.age input
 # ! stderr .
 
@@ -29,22 +29,22 @@ ptyout 'autogenerated passphrase'
 
 # prompt for password before plaintext if stdin is the terminal
 exec cat terminal input # concatenated password + input
-pty -stdin stdout
+ttyin -stdin stdout
 age -p -a -o test.age
-ptyout 'Enter passphrase'
+ttyout 'Enter passphrase'
 ! stderr .
 # check the file was encrypted correctly
-pty terminal
+ttyin terminal
 age -d test.age
 cmp stdout input
 
 # buffer armored ciphertext before prompting if stdin is the terminal
-pty terminal
+ttyin terminal
 age -p -a -o test.age input
 exec cat test.age terminal # concatenated ciphertext + password
-pty -stdin stdout
+ttyin -stdin stdout
 age -d
-ptyout 'Enter passphrase'
+ttyout 'Enter passphrase'
 ! stderr .
 cmp stdout input
 
diff --git a/go.mod b/go.mod
index d382a0c..4c0eed9 100644
--- a/go.mod
+++ b/go.mod
@@ -12,9 +12,9 @@ require (
 // Test dependencies.
 require (
 	c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03
-	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
 	github.com/rogpeppe/go-internal v1.8.1
+	golang.org/x/tools v0.1.12 // indirect
 )
 
 // https://github.com/rogpeppe/go-internal/pull/172
-replace github.com/rogpeppe/go-internal => github.com/FiloSottile/go-internal v1.8.2-0.20230102123319-d43ebe7f1660
+replace github.com/rogpeppe/go-internal => github.com/FiloSottile/go-internal v1.8.2-0.20230806172430-94b0f0dc0b1e
diff --git a/go.sum b/go.sum
index 98da6be..a71308c 100644
--- a/go.sum
+++ b/go.sum
@@ -2,13 +2,13 @@ c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03 h1:0e2QjhWG02SgzlUOvNYaFraf
 c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03/go.mod h1:FomMrUJ2Lxt5jCLmZkG3FHa72zUprnhd3v/Z18Snm4w=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
-github.com/FiloSottile/go-internal v1.8.2-0.20230102123319-d43ebe7f1660 h1:o9Uw6fW8MF/K9RlbCO5e/5e6uXPdwND1NyRnn1NHjgE=
-github.com/FiloSottile/go-internal v1.8.2-0.20230102123319-d43ebe7f1660/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/FiloSottile/go-internal v1.8.2-0.20230806172430-94b0f0dc0b1e h1:1pkMKBSmMMOXQT5lFTmciWn86GGymBssr1bOOOoo2GI=
+github.com/FiloSottile/go-internal v1.8.2-0.20230806172430-94b0f0dc0b1e/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
 golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
 golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

From 6ad4560f4afc3fe46b6cda0bc568e50b89a22e4c Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Mon, 7 Aug 2023 18:44:57 -0400
Subject: [PATCH 24/45] .github/workflows: drop FreeBSD tests

This is unfortunate, but without a live platform to test on,
I can't investigate issues, and CI is now failing with just

   ?   	filippo.io/age/cmd/age-keygen	[no test files]
  Killed

which really could be anything.
---
 .github/workflows/test.yml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 565963a..55b7ca8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,23 +22,6 @@ jobs:
           fetch-depth: 0
       - name: Run tests
         run: go test -race ./...
-  freebsd:
-    name: Test (FreeBSD)
-    runs-on: macos-12
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Run tests
-        # Unpinned Action allowed with read-only permissions.
-        uses: vmactions/freebsd-vm@v0
-        with:
-          prepare: |
-            freebsd-version
-            pkg install -y go
-            go version
-          run: go test -buildvcs=false -race ./...
   gotip:
     name: Test (Go tip)
     strategy:

From 101cc8676386b0503571a929a88618cae2f0b1cd Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Wed, 20 Sep 2023 08:41:00 -0400
Subject: [PATCH 25/45] README: Debian 12 installation instructions

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 890cb01..060d6db 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,13 @@ $ age --decrypt -i key.txt data.tar.gz.age > data.tar.gz
         </td>
     </tr>
     <tr>
-        <td>Debian 11+ (Bullseye)</td>
+        <td>Debian 12+ (Bookworm)</td>
+        <td>
+            <code>apt install age</code>
+        </td>
+    </tr>
+    <tr>
+        <td>Debian 11 (Bullseye)</td>
         <td>
             <code>apt install age/bullseye-backports</code>
             (<a href="https://backports.debian.org/Instructions/#index2h2">enable backports</a> for age v1.0.0+)

From 29b68c20fc241bf2e11bdd3e59b4368fe689e12a Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@jwilk.net>
Date: Wed, 10 Jan 2024 12:40:17 +0100
Subject: [PATCH 26/45] README: fix typo (#534)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 060d6db..088dfb6 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
     <picture>
         <source media="(prefers-color-scheme: dark)" srcset="https://github.com/FiloSottile/age/blob/main/logo/logo_white.svg">
         <source media="(prefers-color-scheme: light)" srcset="https://github.com/FiloSottile/age/blob/main/logo/logo.svg">
-        <img alt="The age logo, an wireframe of St. Peters dome in Rome, with the text: age, file encryption" width="600" src="https://github.com/FiloSottile/age/blob/main/logo/logo.svg">
+        <img alt="The age logo, a wireframe of St. Peters dome in Rome, with the text: age, file encryption" width="600" src="https://github.com/FiloSottile/age/blob/main/logo/logo.svg">
     </picture>
 </p>
 

From 35cf02b1d039d22073ab8937b10b7362315c1a8e Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 05:03:03 -0400
Subject: [PATCH 27/45] .github: link maintenance policy from CONTRIBUTING.md

---
 .github/CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index d847166..168e049 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -12,6 +12,8 @@ age is a little unusual in how it is maintained. I like to keep the code style c
 
 Therefore, **be prepared for your change to get reimplemented rather than merged**, and please don't be offended if that happens. PRs are still appreciated as a way to clarify the intended behavior, but are not at all required: prefer focusing on providing detailed context in an issue report instead.
 
+To learn more, please see my [maintenance policy](https://github.com/FiloSottile/FiloSottile/blob/main/maintenance.md).
+
 <!-- ## Feature requests
 
 age is small, simple, and config-free by design. A lot of effort is put into resisting scope creep and enabling use cases by integrating and interoperating well with other projects rather than by adding features.

From 69c21b83fbacf70470f2ff81ee9f8b07d3246535 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 05:06:58 -0400
Subject: [PATCH 28/45] README: fix scoop command

Closes #564
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 088dfb6..ccc5d22 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,7 @@ $ age --decrypt -i key.txt data.tar.gz.age > data.tar.gz
     <tr>
         <td>Scoop (Windows)</td>
         <td>
-            <code>scoop bucket add extras; scoop install age</code>
+            <code>scoop bucket add extras && scoop install age</code>
         </td>
     </tr>
 </table>

From bc21ece49802700de669b0f28e3b97ddf1756488 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 11:36:03 +0200
Subject: [PATCH 29/45] .github/workflows: disable environment

It's very spammy, just move the secret to a repository secret.
---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7cb0bbb..7c23556 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,6 @@ jobs:
   build:
     name: Build binaries
     runs-on: ubuntu-latest
-    environment: "Build, sign, release binaries"
     strategy:
       matrix:
         include:

From 5ef63b61535d326f9ea1ff30e53199954b0f9496 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 11:39:21 +0200
Subject: [PATCH 30/45] .github/workflows: install bootstrap Go

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 55b7ca8..ddbe4a0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,6 +30,8 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install bootstrap Go
+        uses: actions/setup-go@v2
       - name: Install Go tip (UNIX)
         if: runner.os != 'Windows'
         run: |

From 98e7afcbacd30cb8df023ec70ef685c58261148f Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 11:41:15 +0200
Subject: [PATCH 31/45] all: upgrade dependencies

---
 go.mod | 17 +++++++----------
 go.sum | 28 ++++++++++++++--------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/go.mod b/go.mod
index 4c0eed9..31df01f 100644
--- a/go.mod
+++ b/go.mod
@@ -3,18 +3,15 @@ module filippo.io/age
 go 1.19
 
 require (
-	filippo.io/edwards25519 v1.0.0
-	golang.org/x/crypto v0.4.0
-	golang.org/x/sys v0.11.0
-	golang.org/x/term v0.3.0
+	filippo.io/edwards25519 v1.1.0
+	golang.org/x/crypto v0.24.0
+	golang.org/x/sys v0.21.0
+	golang.org/x/term v0.21.0
 )
 
 // Test dependencies.
 require (
-	c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03
-	github.com/rogpeppe/go-internal v1.8.1
-	golang.org/x/tools v0.1.12 // indirect
+	c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805
+	github.com/rogpeppe/go-internal v1.12.0
+	golang.org/x/tools v0.22.0 // indirect
 )
-
-// https://github.com/rogpeppe/go-internal/pull/172
-replace github.com/rogpeppe/go-internal => github.com/FiloSottile/go-internal v1.8.2-0.20230806172430-94b0f0dc0b1e
diff --git a/go.sum b/go.sum
index a71308c..fd0f776 100644
--- a/go.sum
+++ b/go.sum
@@ -1,14 +1,14 @@
-c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03 h1:0e2QjhWG02SgzlUOvNYaFraf04OBsUPOLxf+K+Ae/yM=
-c2sp.org/CCTV/age v0.0.0-20221230231406-5ea85644bd03/go.mod h1:FomMrUJ2Lxt5jCLmZkG3FHa72zUprnhd3v/Z18Snm4w=
-filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
-filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
-github.com/FiloSottile/go-internal v1.8.2-0.20230806172430-94b0f0dc0b1e h1:1pkMKBSmMMOXQT5lFTmciWn86GGymBssr1bOOOoo2GI=
-github.com/FiloSottile/go-internal v1.8.2-0.20230806172430-94b0f0dc0b1e/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
-golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
-golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
-golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805 h1:u2qwJeEvnypw+OCPUHmoZE3IqwfuN5kgDfo5MLzpNM0=
+c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805/go.mod h1:FomMrUJ2Lxt5jCLmZkG3FHa72zUprnhd3v/Z18Snm4w=
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
+github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
+golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
+golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
+golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=

From 2a761fcb8ccb23308751c844532ad5858bbee6e4 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 11:45:32 +0200
Subject: [PATCH 32/45] .github/workflows: update GitHub Actions

---
 .github/workflows/build.yml | 2 +-
 .github/workflows/ronn.yml  | 4 ++--
 .github/workflows/test.yml  | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c23556..5bb6a88 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           go-version: 1.x
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Build binary
diff --git a/.github/workflows/ronn.yml b/.github/workflows/ronn.yml
index 504a77b..2900bb5 100644
--- a/.github/workflows/ronn.yml
+++ b/.github/workflows/ronn.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install ronn
         run: sudo apt-get update && sudo apt-get install -y ronn
       - name: Run ronn
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Download generated files
         uses: actions/download-artifact@v2
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ddbe4a0..896fc03 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,11 +13,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install Go ${{ matrix.go }}
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Run tests
@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install bootstrap Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
       - name: Install Go tip (UNIX)
         if: runner.os != 'Windows'
         run: |
@@ -45,7 +45,7 @@ jobs:
           cd $HOME/gotip/src && ./make.bat
           echo "$HOME/gotip/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - run: go version

From 7ed486868a4f10f35043e89ab8fc759e2620fbaa Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 11:47:25 +0200
Subject: [PATCH 33/45] .github/workflows: apparently setup-go has no defaults

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 896fc03..747e0df 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,6 +32,8 @@ jobs:
     steps:
       - name: Install bootstrap Go
         uses: actions/setup-go@v5
+        with:
+          go-version: 1.22
       - name: Install Go tip (UNIX)
         if: runner.os != 'Windows'
         run: |

From 0a40718a932c99edea34b6fc7f1e255b02049b0f Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@users.noreply.github.com>
Date: Sun, 16 Jun 2024 10:03:57 +0000
Subject: [PATCH 34/45] doc: regenerate groff and html man pages

---
 doc/age-keygen.1      | 2 +-
 doc/age-keygen.1.html | 2 +-
 doc/age.1             | 2 +-
 doc/age.1.html        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/age-keygen.1 b/doc/age-keygen.1
index b342c6c..b60958f 100644
--- a/doc/age-keygen.1
+++ b/doc/age-keygen.1
@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "AGE\-KEYGEN" "1" "April 2023" ""
+.TH "AGE\-KEYGEN" "1" "June 2024" ""
 .SH "NAME"
 \fBage\-keygen\fR \- generate age(1) key pairs
 .SH "SYNOPSIS"
diff --git a/doc/age-keygen.1.html b/doc/age-keygen.1.html
index d5712ee..c05c175 100644
--- a/doc/age-keygen.1.html
+++ b/doc/age-keygen.1.html
@@ -137,7 +137,7 @@ age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2023</li>
+    <li class='tc'>June 2024</li>
     <li class='tr'>age-keygen(1)</li>
   </ol>
 
diff --git a/doc/age.1 b/doc/age.1
index d657224..6a3f3ea 100644
--- a/doc/age.1
+++ b/doc/age.1
@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "AGE" "1" "April 2023" ""
+.TH "AGE" "1" "June 2024" ""
 .SH "NAME"
 \fBage\fR \- simple, modern, and secure file encryption
 .SH "SYNOPSIS"
diff --git a/doc/age.1.html b/doc/age.1.html
index ed74520..20c62ce 100644
--- a/doc/age.1.html
+++ b/doc/age.1.html
@@ -432,7 +432,7 @@ $ age -d -i age-yubikey-identity-388178f3.txt secrets.txt.age
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2023</li>
+    <li class='tc'>June 2024</li>
     <li class='tr'>age(1)</li>
   </ol>
 

From febaaded8756511fd12b7aea122e44be80c35862 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 13:50:52 +0200
Subject: [PATCH 35/45] cmd/age: create file for empty decryptions

Fixes #555
Updates #159
Updates #57
---
 cmd/age/age.go                   |  1 +
 cmd/age/testdata/output_file.txt | 55 ++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 cmd/age/testdata/output_file.txt

diff --git a/cmd/age/age.go b/cmd/age/age.go
index f81d3bb..c49ce34 100644
--- a/cmd/age/age.go
+++ b/cmd/age/age.go
@@ -465,6 +465,7 @@ func decrypt(identities []age.Identity, in io.Reader, out io.Writer) {
 	if err != nil {
 		errorf("%v", err)
 	}
+	out.Write(nil) // trigger the lazyOpener even if r is empty
 	if _, err := io.Copy(out, r); err != nil {
 		errorf("%v", err)
 	}
diff --git a/cmd/age/testdata/output_file.txt b/cmd/age/testdata/output_file.txt
new file mode 100644
index 0000000..e7952a7
--- /dev/null
+++ b/cmd/age/testdata/output_file.txt
@@ -0,0 +1,55 @@
+# https://github.com/FiloSottile/age/issues/57
+age -r age1xmwwc06ly3ee5rytxm9mflaz2u56jjj36s0mypdrwsvlul66mv4q47ryef -o test.age input
+! age -o test.out -d -i wrong.txt test.age
+! exists test.out
+! age -o test.out -d test.age
+! exists test.out
+! age -o test.out -d -i notexist test.age
+! exists test.out
+! age -o test.out -d -i wrong.txt notexist
+! exists test.out
+! age -o test.out -r BAD
+! exists test.out
+! age -o test.out -r age1xmwwc06ly3ee5rytxm9mflaz2u56jjj36s0mypdrwsvlul66mv4q47ryef notexist
+! exists test.out
+! age -o test.out -p notexist
+! exists test.out
+
+# https://github.com/FiloSottile/age/issues/555
+age -r age1xmwwc06ly3ee5rytxm9mflaz2u56jjj36s0mypdrwsvlul66mv4q47ryef -o empty.age empty
+exists empty.age
+age -d -i key.txt empty.age
+! stdout .
+! stderr .
+age -d -i key.txt -o new empty.age
+! stderr .
+cmp new empty
+
+[!linux] [!darwin] skip # no pty support
+[darwin] [go1.20] skip # https://go.dev/issue/61779
+
+# https://github.com/FiloSottile/age/issues/159
+ttyin terminal
+age -p -a -o test.age input
+ttyin terminalwrong
+! age -o test.out -d test.age
+ttyout 'Enter passphrase'
+stderr 'incorrect passphrase'
+! exists test.out
+
+-- terminal --
+password
+password
+-- terminalwrong --
+wrong
+-- input --
+age
+-- empty --
+-- key.txt --
+# created: 2021-02-02T13:09:43+01:00
+# public key: age1xmwwc06ly3ee5rytxm9mflaz2u56jjj36s0mypdrwsvlul66mv4q47ryef
+AGE-SECRET-KEY-1EGTZVFFV20835NWYV6270LXYVK2VKNX2MMDKWYKLMGR48UAWX40Q2P2LM0
+-- wrong.txt --
+# created: 2024-06-16T12:14:00+02:00
+# public key: age10k7vsqmeg3sp8elfyq5ts55feg4huarpcaf9dmljn9umydg3gymsvx4dp9
+AGE-SECRET-KEY-1NPX08S4LELW9K68FKU0U05XXEKG6X7GT004TPNYLF86H3M00D3FQ3VQQNN

From bd0511b415355bf84a3861c77d47d9337ab367b1 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 14:40:13 +0200
Subject: [PATCH 36/45] cmd/age: detect output/input file reuse when possible

Fixes #491
---
 cmd/age/age.go                   | 25 +++++++++++++++++++++++++
 cmd/age/testdata/output_file.txt | 23 +++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/cmd/age/age.go b/cmd/age/age.go
index c49ce34..e5d17e2 100644
--- a/cmd/age/age.go
+++ b/cmd/age/age.go
@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 	"regexp"
 	"runtime/debug"
 	"strings"
@@ -223,9 +224,21 @@ func main() {
 		}
 	}
 
+	var inUseFiles []string
+	for _, i := range identityFlags {
+		if i.Type != "i" {
+			continue
+		}
+		inUseFiles = append(inUseFiles, absPath(i.Value))
+	}
+	for _, f := range recipientsFileFlags {
+		inUseFiles = append(inUseFiles, absPath(f))
+	}
+
 	var in io.Reader = os.Stdin
 	var out io.Writer = os.Stdout
 	if name := flag.Arg(0); name != "" && name != "-" {
+		inUseFiles = append(inUseFiles, absPath(name))
 		f, err := os.Open(name)
 		if err != nil {
 			errorf("failed to open input file %q: %v", name, err)
@@ -246,6 +259,11 @@ func main() {
 		}
 	}
 	if name := outFlag; name != "" && name != "-" {
+		for _, f := range inUseFiles {
+			if f == absPath(name) {
+				errorf("input and output file are the same: %q", name)
+			}
+		}
 		f := newLazyOpener(name)
 		defer func() {
 			if err := f.Close(); err != nil {
@@ -532,3 +550,10 @@ func (l *lazyOpener) Close() error {
 	}
 	return nil
 }
+
+func absPath(name string) string {
+	if abs, err := filepath.Abs(name); err == nil {
+		return abs
+	}
+	return name
+}
diff --git a/cmd/age/testdata/output_file.txt b/cmd/age/testdata/output_file.txt
index e7952a7..5b16d65 100644
--- a/cmd/age/testdata/output_file.txt
+++ b/cmd/age/testdata/output_file.txt
@@ -25,9 +25,32 @@ age -d -i key.txt -o new empty.age
 ! stderr .
 cmp new empty
 
+# https://github.com/FiloSottile/age/issues/491
+cp input inputcopy
+! age -r age1xmwwc06ly3ee5rytxm9mflaz2u56jjj36s0mypdrwsvlul66mv4q47ryef -o inputcopy inputcopy
+stderr 'input and output file are the same'
+cmp inputcopy input
+! age -r age1xmwwc06ly3ee5rytxm9mflaz2u56jjj36s0mypdrwsvlul66mv4q47ryef -o ./inputcopy inputcopy
+stderr 'input and output file are the same'
+cmp inputcopy input
+mkdir foo
+! age -r age1xmwwc06ly3ee5rytxm9mflaz2u56jjj36s0mypdrwsvlul66mv4q47ryef -o inputcopy foo/../inputcopy
+stderr 'input and output file are the same'
+cmp inputcopy input
+cp key.txt keycopy
+age -e -i keycopy -o test.age input
+! age -d -i keycopy -o keycopy test.age
+stderr 'input and output file are the same'
+cmp key.txt keycopy
+
 [!linux] [!darwin] skip # no pty support
 [darwin] [go1.20] skip # https://go.dev/issue/61779
 
+ttyin terminal
+! age -p -o inputcopy inputcopy
+stderr 'input and output file are the same'
+cmp inputcopy input
+
 # https://github.com/FiloSottile/age/issues/159
 ttyin terminal
 age -p -a -o test.age input

From 01fe9cd84aa5380cd09b8761af919e5d0a1386ad Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 14:49:24 +0200
Subject: [PATCH 37/45] README: add pkgx installation instructions

Closes #529
---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index ccc5d22..b2ccbd0 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,12 @@ $ age --decrypt -i key.txt data.tar.gz.age > data.tar.gz
             <code>scoop bucket add extras && scoop install age</code>
         </td>
     </tr>
+    <tr>
+        <td>pkgx</td>
+        <td>
+            <code>pkgx install age</code>
+        </td>
+    </tr>
 </table>
 
 On Windows, Linux, macOS, and FreeBSD you can use the pre-built binaries.

From 2293a9afef6984915cb28d2a7264b145604d61e9 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 14:51:17 +0200
Subject: [PATCH 38/45] .github/workflows: use latest Go for bootstrap

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 747e0df..3aea0c4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Install bootstrap Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: latest
       - name: Install Go tip (UNIX)
         if: runner.os != 'Windows'
         run: |

From 1e1badabf74064ee800d19817a725f4803fa4e94 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 14:59:53 +0200
Subject: [PATCH 39/45] .github/workflows: go-version stable, not latest

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3aea0c4..4331fa3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Install bootstrap Go
         uses: actions/setup-go@v5
         with:
-          go-version: latest
+          go-version: stable
       - name: Install Go tip (UNIX)
         if: runner.os != 'Windows'
         run: |

From bbe6ce5eeb1bb70cfc705d0961c943f0dd637ffd Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sun, 16 Jun 2024 15:58:53 +0200
Subject: [PATCH 40/45] .github/workflows: update artifacts Actions

Co-authored-by: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com>
---
 .github/workflows/build.yml | 11 ++++++-----
 .github/workflows/ronn.yml  |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5bb6a88..dc687bd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
           - {GOOS: freebsd, GOARCH: amd64}
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: 1.x
       - name: Checkout repository
@@ -62,9 +62,9 @@ jobs:
           GOARCH: ${{ matrix.GOARCH }}
           GOARM: ${{ matrix.GOARM }}
       - name: Upload workflow artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: age-binaries
+          name: age-binaries-${{ matrix.GOOS }}-${{ matrix.GOARCH }}
           path: age-*
   upload:
     name: Upload release binaries
@@ -75,9 +75,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download workflow artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
-          name: age-binaries
+          pattern: age-binaries-*
+          merge-multiple: true
       - name: Upload release artifacts
         run: gh release upload "$GITHUB_REF_NAME" age-*
         env:
diff --git a/.github/workflows/ronn.yml b/.github/workflows/ronn.yml
index 2900bb5..9d4d0ae 100644
--- a/.github/workflows/ronn.yml
+++ b/.github/workflows/ronn.yml
@@ -29,7 +29,7 @@ jobs:
             mv "$f.tmp" "$f"
           done
       - name: Upload generated files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: man-pages
           path: |
@@ -45,7 +45,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Download generated files
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: man-pages
           path: doc/

From faefdc3c81efa89fd41998b77c62234ca56be10b Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Wed, 19 Jun 2024 10:40:55 +0200
Subject: [PATCH 41/45] README: document Sigsum proofs

---
 README.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/README.md b/README.md
index b2ccbd0..5d2c678 100644
--- a/README.md
+++ b/README.md
@@ -157,6 +157,38 @@ go install filippo.io/age/cmd/...@latest
 
 Help from new packagers is very welcome.
 
+### Verifying the release signatures
+
+If you download the pre-built binaries, you can check their
+[Sigsum](https://www.sigsum.org) proofs, which are like signatures with extra
+transparency: you can cryptographically verify that every proof is logged in a
+public append-only log, so you can hold the age project accountable for every
+binary release we ever produced. This is similar to what the [Go Checksum
+Database](https://go.dev/blog/module-mirror-launch) provides.
+
+```
+cat << EOF > age-sigsum-key.pub
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEjDYFJ4WVbxRLcgbppmPaMFS/Wbq+1r9cl4qdJTyRVL
+EOF
+cat << EOF > sigsum-trust-policy.txt
+log 154f49976b59ff09a123675f58cb3e346e0455753c3c3b15d465dcb4f6512b0b https://poc.sigsum.org/jellyfish
+witness poc.sigsum.org/nisse 1c25f8a44c635457e2e391d1efbca7d4c2951a0aef06225a881e46b98962ac6c
+witness rgdd.se/poc-witness  28c92a5a3a054d317c86fc2eeb6a7ab2054d6217100d0be67ded5b74323c5806
+group  demo-quorum-rule all poc.sigsum.org/nisse rgdd.se/poc-witness
+quorum demo-quorum-rule
+EOF
+
+curl -JO "https://dl.filippo.io/age/v1.2.0?for=darwin/arm64"
+curl -JO "https://dl.filippo.io/age/v1.2.0?for=darwin/arm64&proof"
+
+go install sigsum.org/sigsum-go/cmd/sigsum-verify@v0.6.2
+sigsum-verify -k age-sigsum-key.pub -p sigsum-trust-policy.txt \
+    age-v1.2.0-darwin-arm64.tar.gz.proof < age-v1.2.0-darwin-arm64.tar.gz
+```
+
+You can learn more about what's happening above in the [Sigsum
+docs](https://www.sigsum.org/getting-started/).
+
 ## Usage
 
 For the full documentation, read [the age(1) man page](https://filippo.io/age/age.1).

From 176e245b3cb3ada322c21eef0bce166dc5a5e4c7 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Fri, 28 Jun 2024 17:11:09 +0200
Subject: [PATCH 42/45] README: rotate Sigsum keys

Switched to a pair of keys, one kept offline and one on a Tillitis key.

The following script provides key continuity from the previous key.

---

cat << EOF > msg.txt
These are the new age Sigsum keys as of 2024-06-28.
The previous one won't be used anymore
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM1WpnEswJLPzvXJDiswowy48U+G+G1kmgwUE2eaRHZG
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAz2WM5CyPLqiNjk7CLl4roDXwKhQ0QExXLebukZEZFS
EOF

cat << EOF > msg.txt.proof
version=1
log=c9e525b98f412ede185ff2ac5abf70920a2e63a6ae31c88b1138b85de328706b
leaf=e2f0 61d17df1ab563aedf70a662d5344b2d163c7a35aaeaa1ecc6c1631c02d46883e c4564b0b0b70ebb4236e26f971cb467c59200575c01c4d07a5d8e298a6d2319c59bbc162363ffb4f690b581851621bd3de311e9559a1a0432522e2b567647e03

size=24226
root_hash=03b0fc19c812e51e764474d161b944db4ea20dfc13815b738fa4f433f56954c0
signature=b95530661d716886926a49ad4e08435c7980348836eefe4706cc611a6af9dc6ddb160189d4aa177c97f807fa0240cb27b9d5f075084cf3a4a2514eade7d40f00
cosignature=1c997261f16e6e81d13f420900a2542a4b6a049c2d996324ee5d82a90ca3360c 1719587282 02d3f9b34d62f1b735e6c13f2ad7766ed2066a167dba25d526a2acbbf628588c58a888f9abab50ff151f8440076e8bf39564e4f893a32be432e97cd18b936c0e
cosignature=70b861a010f25030de6ff6a5267e0b951e70c04b20ba4a3ce41e7fba7b9b7dfc 1719587283 14b8654586763b6798dc7e7b46565236618f2824135076ba71e18908bf893d73be95c143b8c8cbe48de9ea6267ff5f23f8d870ded7d22ed6e54811393d174402

leaf_index=24157
node_hash=c5782abde765bc2c460d25f0bc1f8f89d787e5b8a141e862eeb550631cb61ca2
node_hash=283f014735692dfda045ca9c32352d5d0f99207862c35214dfaa69810eec6e2f
node_hash=24987bf3ec7c3c8932783faf0fe01ff49c7793c3d25925da180165c3292b786d
node_hash=ba14f9dd00a506474251599083e83a4bf7327491f6ebd5cca1ac8a6863456eb5
node_hash=55aceb2864d26c9c04c85a294e92dfdfa13bb45eeda0286d21f19411763237f5
node_hash=69cc9e7f7ad56da996abeb315dc2ffb3e1e1f02e8097facfae75f06f9e8f9bc9
node_hash=1408251ffc0d485551b058813d7b1227bb91a179b9f0851a6e69e9bb99623eec
node_hash=ca99c77b91c6aa9f55fba8d6d9c80058dcc0444a2e9df3f7a616d7e2d274fb58
node_hash=b95d29a868d7e4413dab001a414cfe4cab65e113bc831cf41ab9003250ede3c9
node_hash=5ced132a7cc05272b797b7ad2e71208366d8023d09bad755514cd86e37a849fd
node_hash=95803b981443b4ff080b5a14927e24e5efc8186b327320b633005213ca3aeff4
node_hash=3aad6b63102dede3851d575b01bb60a5832d9f31eb3405b73aa7d629a1acaaa8
node_hash=c929af9f6731f63a493668627f58810d892dc51f8aa1c9a4de1573cd3e51e62f
EOF

sigsum-verify -k age-sigsum-key.pub -p sigsum-trust-policy.txt msg.txt.proof < msg.txt
---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5d2c678..3d69d5b 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,8 @@ Database](https://go.dev/blog/module-mirror-launch) provides.
 
 ```
 cat << EOF > age-sigsum-key.pub
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEjDYFJ4WVbxRLcgbppmPaMFS/Wbq+1r9cl4qdJTyRVL
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM1WpnEswJLPzvXJDiswowy48U+G+G1kmgwUE2eaRHZG
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAz2WM5CyPLqiNjk7CLl4roDXwKhQ0QExXLebukZEZFS
 EOF
 cat << EOF > sigsum-trust-policy.txt
 log 154f49976b59ff09a123675f58cb3e346e0455753c3c3b15d465dcb4f6512b0b https://poc.sigsum.org/jellyfish
@@ -178,10 +179,10 @@ group  demo-quorum-rule all poc.sigsum.org/nisse rgdd.se/poc-witness
 quorum demo-quorum-rule
 EOF
 
-curl -JO "https://dl.filippo.io/age/v1.2.0?for=darwin/arm64"
-curl -JO "https://dl.filippo.io/age/v1.2.0?for=darwin/arm64&proof"
+curl -JLO "https://dl.filippo.io/age/v1.2.0?for=darwin/arm64"
+curl -JLO "https://dl.filippo.io/age/v1.2.0?for=darwin/arm64&proof"
 
-go install sigsum.org/sigsum-go/cmd/sigsum-verify@v0.6.2
+go install sigsum.org/sigsum-go/cmd/sigsum-verify@v0.8.0
 sigsum-verify -k age-sigsum-key.pub -p sigsum-trust-policy.txt \
     age-v1.2.0-darwin-arm64.tar.gz.proof < age-v1.2.0-darwin-arm64.tar.gz
 ```

From cda3988cc76a139426281a1d812914b71435bd18 Mon Sep 17 00:00:00 2001
From: Alexander Yastrebov <yastrebov.alex@gmail.com>
Date: Wed, 18 Dec 2024 15:55:57 +0100
Subject: [PATCH 43/45] all: fix staticcheck warnings (#589)

Co-authored-by: Filippo Valsorda <github@bip.filippo.io>
---
 cmd/age-keygen/keygen.go  | 2 +-
 internal/format/format.go | 2 +-
 internal/stream/stream.go | 3 +--
 plugin/client.go          | 2 --
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cmd/age-keygen/keygen.go b/cmd/age-keygen/keygen.go
index 3971d37..549d3cf 100644
--- a/cmd/age-keygen/keygen.go
+++ b/cmd/age-keygen/keygen.go
@@ -158,5 +158,5 @@ func errorf(format string, v ...interface{}) {
 }
 
 func warning(msg string) {
-	log.Printf("age-keygen: warning: " + msg)
+	log.Printf("age-keygen: warning: %s", msg)
 }
diff --git a/internal/format/format.go b/internal/format/format.go
index aa77b75..0f22e6f 100644
--- a/internal/format/format.go
+++ b/internal/format/format.go
@@ -201,7 +201,7 @@ func (r *StanzaReader) ReadStanza() (s *Stanza, err error) {
 		b, err := DecodeString(strings.TrimSuffix(string(line), "\n"))
 		if err != nil {
 			if bytes.HasPrefix(line, footerPrefix) || bytes.HasPrefix(line, stanzaPrefix) {
-				return nil, fmt.Errorf("malformed body line %q: stanza ended without a short line\nNote: this might be a file encrypted with an old beta version of age or rage. Use age v1.0.0-beta6 or rage to decrypt it.", line)
+				return nil, fmt.Errorf("malformed body line %q: stanza ended without a short line\nnote: this might be a file encrypted with an old beta version of age or rage; use age v1.0.0-beta6 or rage to decrypt it", line)
 			}
 			return nil, errorf("malformed body line %q: %v", line, err)
 		}
diff --git a/internal/stream/stream.go b/internal/stream/stream.go
index 7cf02c4..7551274 100644
--- a/internal/stream/stream.go
+++ b/internal/stream/stream.go
@@ -12,7 +12,6 @@ import (
 	"io"
 
 	"golang.org/x/crypto/chacha20poly1305"
-	"golang.org/x/crypto/poly1305"
 )
 
 const ChunkSize = 64 * 1024
@@ -29,7 +28,7 @@ type Reader struct {
 }
 
 const (
-	encChunkSize  = ChunkSize + poly1305.TagSize
+	encChunkSize  = ChunkSize + chacha20poly1305.Overhead
 	lastChunkFlag = 0x01
 )
 
diff --git a/plugin/client.go b/plugin/client.go
index dca1a52..2b50989 100644
--- a/plugin/client.go
+++ b/plugin/client.go
@@ -9,7 +9,6 @@ package plugin
 
 import (
 	"bufio"
-	"bytes"
 	"fmt"
 	"io"
 	"math/rand"
@@ -382,7 +381,6 @@ type clientConnection struct {
 	cmd       *exec.Cmd
 	io.Reader // stdout
 	io.Writer // stdin
-	stderr    bytes.Buffer
 	close     func()
 }
 

From 482cf6fc9babd3ab06f6606762aac10447222201 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Wed, 18 Dec 2024 16:01:18 +0100
Subject: [PATCH 44/45] plugin: restrict characters in plugin names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to ⬡-49016 for reporting this issue.

Fixes GHSA-32gq-x56h-299c
---
 cmd/age/testdata/plugin.txt | 14 ++++++++++++++
 plugin/client.go            |  6 ++++++
 plugin/encode.go            | 25 +++++++++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/cmd/age/testdata/plugin.txt b/cmd/age/testdata/plugin.txt
index 01e3ed8..95cc029 100644
--- a/cmd/age/testdata/plugin.txt
+++ b/cmd/age/testdata/plugin.txt
@@ -10,6 +10,15 @@ age -d -i long-key.txt test.age
 cmp stdout input
 ! stderr .
 
+# check that path separators are rejected
+chmod 755 age-plugin-pwn/pwn
+mkdir $TMPDIR/age-plugin-pwn
+cp age-plugin-pwn/pwn $TMPDIR/age-plugin-pwn/pwn
+! age -r age1pwn/pwn19gt89dfz input
+! age -d -i pwn-identity.txt test.age
+! age -d -j pwn/pwn test.age
+! exists pwn
+
 -- input --
 test
 -- key.txt --
@@ -18,3 +27,8 @@ AGE-PLUGIN-TEST-10Q32NLXM
 age1test10pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7qj6rl8p
 -- long-key.txt --
 AGE-PLUGIN-TEST-10PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7RC0PU8S7Q5U8SUD
+-- pwn-identity.txt --
+AGE-PLUGIN-PWN/PWN-19GYK4WLY
+-- age-plugin-pwn/pwn --
+#!/bin/sh
+touch "$WORK/pwn"
diff --git a/plugin/client.go b/plugin/client.go
index 2b50989..051ec40 100644
--- a/plugin/client.go
+++ b/plugin/client.go
@@ -15,6 +15,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"time"
 
 	exec "golang.org/x/sys/execabs"
@@ -178,6 +179,9 @@ func NewIdentity(s string, ui *ClientUI) (*Identity, error) {
 
 func NewIdentityWithoutData(name string, ui *ClientUI) (*Identity, error) {
 	s := EncodeIdentity(name, nil)
+	if s == "" {
+		return nil, fmt.Errorf("invalid plugin name: %q", name)
+	}
 	return &Identity{
 		name: name, encoding: s, ui: ui,
 	}, nil
@@ -390,6 +394,8 @@ func openClientConnection(name, protocol string) (*clientConnection, error) {
 	path := "age-plugin-" + name
 	if testOnlyPluginPath != "" {
 		path = filepath.Join(testOnlyPluginPath, path)
+	} else if strings.ContainsRune(name, os.PathSeparator) {
+		return nil, fmt.Errorf("invalid plugin name: %q", name)
 	}
 	cmd := exec.Command(path, "--age-plugin="+protocol)
 
diff --git a/plugin/encode.go b/plugin/encode.go
index 5000708..0a59fbe 100644
--- a/plugin/encode.go
+++ b/plugin/encode.go
@@ -14,6 +14,9 @@ import (
 // EncodeIdentity encodes a plugin identity string for a plugin with the given
 // name. If the name is invalid, it returns an empty string.
 func EncodeIdentity(name string, data []byte) string {
+	if !validPluginName(name) {
+		return ""
+	}
 	s, _ := bech32.Encode("AGE-PLUGIN-"+strings.ToUpper(name)+"-", data)
 	return s
 }
@@ -30,12 +33,18 @@ func ParseIdentity(s string) (name string, data []byte, err error) {
 	}
 	name = strings.TrimSuffix(strings.TrimPrefix(hrp, "AGE-PLUGIN-"), "-")
 	name = strings.ToLower(name)
+	if !validPluginName(name) {
+		return "", nil, fmt.Errorf("invalid plugin name: %q", name)
+	}
 	return name, data, nil
 }
 
 // EncodeRecipient encodes a plugin recipient string for a plugin with the given
 // name. If the name is invalid, it returns an empty string.
 func EncodeRecipient(name string, data []byte) string {
+	if !validPluginName(name) {
+		return ""
+	}
 	s, _ := bech32.Encode("age1"+strings.ToLower(name), data)
 	return s
 }
@@ -51,5 +60,21 @@ func ParseRecipient(s string) (name string, data []byte, err error) {
 		return "", nil, fmt.Errorf("not a plugin recipient: %v", err)
 	}
 	name = strings.TrimPrefix(hrp, "age1")
+	if !validPluginName(name) {
+		return "", nil, fmt.Errorf("invalid plugin name: %q", name)
+	}
 	return name, data, nil
 }
+
+func validPluginName(name string) bool {
+	if name == "" {
+		return false
+	}
+	allowed := "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-._"
+	for _, r := range name {
+		if !strings.ContainsRune(allowed, r) {
+			return false
+		}
+	}
+	return true
+}

From 3d91014ea095e8d70f7c6c4833f89b53a96e0832 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sat, 1 Feb 2025 18:15:20 +0100
Subject: [PATCH 45/45] README: link to typage

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3d69d5b..38152df 100644
--- a/README.md
+++ b/README.md
@@ -23,10 +23,10 @@ $ age --decrypt -i key.txt data.tar.gz.age > data.tar.gz
 
 📜 The format specification is at [age-encryption.org/v1](https://age-encryption.org/v1). age was designed by [@Benjojo12](https://twitter.com/Benjojo12) and [@FiloSottile](https://twitter.com/FiloSottile).
 
-📬 Follow the maintenance of this project by subscribing to [Maintainer Dispatches](https://filippo.io/newsletter)!
-
 🦀 An alternative interoperable Rust implementation is available at [github.com/str4d/rage](https://github.com/str4d/rage).
 
+🌍 [Typage](https://github.com/FiloSottile/typage) is a TypeScript implementation. It works in the browser, in Node.js, and in Bun.
+
 🔑 Hardware PIV tokens such as YubiKeys are supported through the [age-plugin-yubikey](https://github.com/str4d/age-plugin-yubikey) plugin.
 
 ✨ For more plugins, implementations, tools, and integrations, check out the [awesome age](https://github.com/FiloSottile/awesome-age) list.