tests: add armor tests

internal/testkit/testkit.go

@@ -63,6 +63,7 @@ type TestFile struct {
 	comment     string
 	identities  []string
 	passphrases []string
+	armor       bool
 }
 
 func NewTestFile() *TestFile {
@@ -87,7 +88,7 @@ func (f *TestFile) TextLine(s string) {
 
 func (f *TestFile) UnreadLine() string {
 	buf := bytes.TrimSuffix(f.Buf.Bytes(), []byte("\n"))
-	idx := bytes.LastIndex(buf[:len(buf)-1], []byte("\n")) + 1
+	idx := bytes.LastIndex(buf, []byte("\n")) + 1
 	f.Buf.Reset()
 	f.Buf.Write(buf[:idx])
 	return string(buf[idx:])
@@ -122,6 +123,16 @@ func (f *TestFile) Body(body []byte) {
 	}
 }
 
+func (f *TestFile) Base64Padding() {
+	line := f.UnreadLine()
+	paddingLen := 4 - len(line)%4
+	if paddingLen == 4 {
+		paddingLen = 0
+	}
+	padding := strings.Repeat("=", paddingLen)
+	f.TextLine(line + padding)
+}
+
 func (f *TestFile) AEADBody(key, body []byte) {
 	aead, _ := chacha20poly1305.New(key)
 	f.Body(aead.Seal(nil, make([]byte, chacha20poly1305.NonceSize), body, nil))
@@ -231,6 +242,11 @@ func (f *TestFile) ExpectHeaderFailure() {
 	f.expect = "header failure"
 }
 
+func (f *TestFile) ExpectArmorFailure() {
+	f.armor = true
+	f.expect = "armor failure"
+}
+
 func (f *TestFile) ExpectPayloadFailure() {
 	f.expect = "payload failure"
 	f.payload.Reset()
@@ -255,6 +271,22 @@ func (f *TestFile) Comment(c string) {
 	f.comment = c
 }
 
+func (f *TestFile) BeginArmor(t string) {
+	f.armor = true
+	f.TextLine("-----BEGIN " + t + "-----")
+}
+
+func (f *TestFile) EndArmor(t string) {
+	f.armor = true
+	f.TextLine("-----END " + t + "-----")
+}
+
+func (f *TestFile) Bytes() []byte {
+	out := make([]byte, f.Buf.Len())
+	copy(out, f.Buf.Bytes())
+	return out
+}
+
 func (f *TestFile) Generate() {
 	fmt.Printf("expect: %s\n", f.expect)
 	if f.expect == "success" || f.expect == "payload failure" {
@@ -267,6 +299,9 @@ func (f *TestFile) Generate() {
 	for _, p := range f.passphrases {
 		fmt.Printf("passphrase: %s\n", p)
 	}
+	if f.armor {
+		fmt.Printf("armored: yes\n")
+	}
 	if f.comment != "" {
 		fmt.Printf("comment: %s\n", f.comment)
 	}

testdata/testkit/armor

@@ -0,0 +1,13 @@
+expect: success
+payload: 013f54400c82da08037759ada907a8b864e97de81c088a182062c4b5622fd2ab
+file key: 59454c4c4f57205355424d4152494e45
+identity: AGE-SECRET-KEY-1XMWWC06LY3EE5RYTXM9MFLAZ2U56JJJ36S0MYPDRWSVLUL66MV4QX3S7F6
+armored: yes
+
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBURWlGMHlwcXIrYnB2Y3FY
+TnlDVkpwTDdPdXdQZFZ3UEw3S1FFYkZET0NjCkVtRUNBRWNLTituL1ZzOVNiV2lW
+K0h1MHIrRThSNzdEZFdZeWQ4M253N1UKLS0tIFZuKzU0anFpaVVDRStXWmNFVlkz
+ZjFzcUhqbHUvejFMQ1EvVDdYbTdxSTAK7s9ix86RtDMnTmjU8vkTTLdMW/73vqpS
+yPC8DpksHoMx+2Y=
+-----END AGE ENCRYPTED FILE-----

testdata/testkit/armor_crlf

@@ -0,0 +1,14 @@
+expect: success
+payload: 013f54400c82da08037759ada907a8b864e97de81c088a182062c4b5622fd2ab
+file key: 59454c4c4f57205355424d4152494e45
+identity: AGE-SECRET-KEY-1XMWWC06LY3EE5RYTXM9MFLAZ2U56JJJ36S0MYPDRWSVLUL66MV4QX3S7F6
+armored: yes
+comment: CRLF is allowed as a end of line for armored files
+
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBURWlGMHlwcXIrYnB2Y3FY
+TnlDVkpwTDdPdXdQZFZ3UEw3S1FFYkZET0NjCkVtRUNBRWNLTituL1ZzOVNiV2lW
+K0h1MHIrRThSNzdEZFdZeWQ4M253N1UKLS0tIFZuKzU0anFpaVVDRStXWmNFVlkz
+ZjFzcUhqbHUvejFMQ1EvVDdYbTdxSTAK7s9ix86RtDMnTmjU8vkTTLdMW/73vqpS
+yPC8DpksHoMx+2Y=
+-----END AGE ENCRYPTED FILE-----

testdata/testkit/armor_empty_line_begin

@@ -0,0 +1,13 @@
+expect: armor failure
+file key: 59454c4c4f57205355424d4152494e45
+identity: AGE-SECRET-KEY-1XMWWC06LY3EE5RYTXM9MFLAZ2U56JJJ36S0MYPDRWSVLUL66MV4QX3S7F6
+armored: yes
+
+-----BEGIN AGE ENCRYPTED FILE-----
+
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBURWlGMHlwcXIrYnB2Y3FY
+TnlDVkpwTDdPdXdQZFZ3UEw3S1FFYkZET0NjCkVtRUNBRWNLTituL1ZzOVNiV2lW
+K0h1MHIrRThSNzdEZFdZeWQ4M253N1UKLS0tIFZuKzU0anFpaVVDRStXWmNFVlkz
+ZjFzcUhqbHUvejFMQ1EvVDdYbTdxSTAK7s9ix86RtDMnTmjU8vkTTLdMW/73vqpS
+yPC8DpksHoMx+2Y=
+-----END AGE ENCRYPTED FILE-----

testdata/testkit/armor_empty_line_end

@@ -0,0 +1,13 @@
+expect: armor failure
+file key: 59454c4c4f57205355424d4152494e45
+identity: AGE-SECRET-KEY-1XMWWC06LY3EE5RYTXM9MFLAZ2U56JJJ36S0MYPDRWSVLUL66MV4QX3S7F6
+armored: yes
+
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBURWlGMHlwcXIrYnB2Y3FY
+TnlDVkpwTDdPdXdQZFZ3UEw3S1FFYkZET0NjCkVtRUNBRWNLTituL1ZzOVNiV2lW
+K0h1MHIrRThSNzdEZFdZeWQ4M253N1UKLS0tIFZuKzU0anFpaVVDRStXWmNFVlkz
+ZjFzcUhqbHUvejFMQ1EvVDdYbTdxSTAK7s9ix86RtDMnTmjU8vkTTLdMW/73vqpS
+yPC8DpksHoMx+2Y=
+
+-----END AGE ENCRYPTED FILE-----

testdata/testkit/armor_eol_between_padding

@@ -0,0 +1,13 @@
+expect: armor failure
+file key: 59454c4c4f57205355424d4152494e45
+identity: AGE-SECRET-KEY-1XMWWC06LY3EE5RYTXM9MFLAZ2U56JJJ36S0MYPDRWSVLUL66MV4QX3S7F6
+armored: yes
+
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBURWlGMHlwcXIrYnB2Y3FY
+TnlDVkpwTDdPdXdQZFZ3UEw3S1FFYkZET0NjCkVtRUNBRWNLTituL1ZzOVNiV2lW
+K0h1MHIrRThSNzdEZFdZeWQ4M253N1UKLS0tIFZuKzU0anFpaVVDRStXWmNFVlkz
+ZjFzcUhqbHUvejFMQ1EvVDdYbTdxSTAK7s9ix86RtDMnTmjU8vkTTLdMW2ewwwqo
+mNlxYv6gMOKyDNzgiw=
+=
+-----END AGE ENCRYPTED FILE-----

testdata/testkit/armor_full_last_line

@@ -0,0 +1,13 @@
+expect: success
+payload: 724a112a2cac139a4fca3ea0f799f2e5ccd1d0db46af654dee40567bff16ee33
+file key: 59454c4c4f57205355424d4152494e45
+identity: AGE-SECRET-KEY-1XMWWC06LY3EE5RYTXM9MFLAZ2U56JJJ36S0MYPDRWSVLUL66MV4QX3S7F6
+armored: yes
+
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBURWlGMHlwcXIrYnB2Y3FY
+TnlDVkpwTDdPdXdQZFZ3UEw3S1FFYkZET0NjCkVtRUNBRWNLTituL1ZzOVNiV2lW
+K0h1MHIrRThSNzdEZFdZeWQ4M253N1UKLS0tIFZuKzU0anFpaVVDRStXWmNFVlkz
+ZjFzcUhqbHUvejFMQ1EvVDdYbTdxSTAK7s9ix86RtDMnTmjU8vkTTLdMW3bj4iHS
+YS3WWUtZB5wJqKgEe8kpsp0iOnD2CNG4DVKBC0Z7SAcCFb8xdwV9CRavSEE7OU1c
+-----END AGE ENCRYPTED FILE-----