diff --git a/pkg/jsonsign/verify.go b/pkg/jsonsign/verify.go index d79def001..ddec0cb43 100644 --- a/pkg/jsonsign/verify.go +++ b/pkg/jsonsign/verify.go @@ -55,7 +55,7 @@ func reArmor(line string) string { fmt.Fprintf(buf, "%s\n", payload[0:chunkLen]) payload = payload[chunkLen:] } - fmt.Fprintf(buf, "%s\n-----BEGIN PGP SIGNATURE-----\n", crc) + fmt.Fprintf(buf, "%s\n-----END PGP SIGNATURE-----\n", crc) return buf.String() } diff --git a/pkg/jsonsign/verify_test.go b/pkg/jsonsign/verify_test.go new file mode 100644 index 000000000..ae4bc9827 --- /dev/null +++ b/pkg/jsonsign/verify_test.go @@ -0,0 +1,40 @@ +/* +Copyright 2021 The Perkeep Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package jsonsign + +import "testing" + +func TestRearmor(t *testing.T) { + camliSig := "iQEcBAABAgAGBQJO3/DNAAoJECkxpnwm9avaf6EH/3HVJC+6ybOJDTJIInQBum9YFzC1I8b6xNLN0yFdDtypZUotvW9pvU2pVpbfNSmcW/OL02eR2kgL55dHxbUjbN9CvXlvSb2QAy8IQMdA3721pMR41rNNn08w5bbAWgW/suiyN5z0pIKn3vPEHbguGeNQBStgOSq1WkgCozNBxPA7V5mcUx2rUOsWHYSmEY8foPdeDYcrw2pvxPN8kXk6zBrZilrtaY+Yx5zPLkq8trhHPgCdf4chL+Y2kmxXMKYjU+bkmJaNycUURdncZakTEv9YfbBp04kbHIaN6DttEoXuU96nTyuCFhIftmV+GPbvGpl3e2yhmae5hUUt1g0o8FE==aSCK" + expected := `-----BEGIN PGP SIGNATURE----- + +iQEcBAABAgAGBQJO3/DNAAoJECkxpnwm9avaf6EH/3HVJC+6ybOJDTJIInQB +um9YFzC1I8b6xNLN0yFdDtypZUotvW9pvU2pVpbfNSmcW/OL02eR2kgL55dH +xbUjbN9CvXlvSb2QAy8IQMdA3721pMR41rNNn08w5bbAWgW/suiyN5z0pIKn +3vPEHbguGeNQBStgOSq1WkgCozNBxPA7V5mcUx2rUOsWHYSmEY8foPdeDYcr +w2pvxPN8kXk6zBrZilrtaY+Yx5zPLkq8trhHPgCdf4chL+Y2kmxXMKYjU+bk +mJaNycUURdncZakTEv9YfbBp04kbHIaN6DttEoXuU96nTyuCFhIftmV+GPbv +Gpl3e2yhmae5hUUt1g0o8FE= +=aSCK +-----END PGP SIGNATURE----- +` + reArmored := reArmor(camliSig) + + if reArmored != expected { + t.Errorf("got %s; expected %s", reArmored, expected) + } +}