test(provenance): satisfy formatting and modernize checks

Signed-off-by: Raphael Zanarelli <zanarelli.dev@gmail.com>
pull/32610/head
Raphael Zanarelli 2 days ago
parent f0bed79ed6
commit eb1cb84875

@ -217,10 +217,7 @@ func rewrapArmoredKey(armored []byte, lineLen int) []byte {
if b64.Len() > 0 { if b64.Len() > 0 {
raw := b64.String() raw := b64.String()
for i := 0; i < len(raw); i += lineLen { for i := 0; i < len(raw); i += lineLen {
end := i + lineLen end := min(i+lineLen, len(raw))
if end > len(raw) {
end = len(raw)
}
out = append(out, raw[i:end]) out = append(out, raw[i:end])
} }
b64.Reset() b64.Reset()
@ -240,10 +237,7 @@ func rewrapArmoredKey(armored []byte, lineLen int) []byte {
if b64.Len() > 0 { if b64.Len() > 0 {
raw := b64.String() raw := b64.String()
for i := 0; i < len(raw); i += lineLen { for i := 0; i < len(raw); i += lineLen {
end := i + lineLen end := min(i+lineLen, len(raw))
if end > len(raw) {
end = len(raw)
}
out = append(out, raw[i:end]) out = append(out, raw[i:end])
} }
b64.Reset() b64.Reset()
@ -270,7 +264,6 @@ func TestLoadKeyRingArmoredMultiBlockLineAlignments(t *testing.T) {
} }
} }
func TestLoadArmoredKeyRingRejectsNonKeyBlocks(t *testing.T) { func TestLoadArmoredKeyRingRejectsNonKeyBlocks(t *testing.T) {
var buf bytes.Buffer var buf bytes.Buffer
w, err := armor.Encode(&buf, "PGP MESSAGE", nil) w, err := armor.Encode(&buf, "PGP MESSAGE", nil)

Loading…
Cancel
Save