6b1afc3ae3
Fix the following test failures: FAIL: TestMessageInfoHandledError (0.00s) parse_test.go:53: could not parse envelope: date parsing failed: unrecognized date format: FAIL: TestReader (0.07s) gpg_test.go:27: using GNUPGHOME = /tmp/TestReader2384941142/001 reader_test.go:108: Test case: Invalid Signature reader_test.go:112: gpg.Read() = gpgmail: failed to read PGP message: gpg: failed to run verification: exit status 1 Fixes:5ca6022d00("lint: ensure errors are at least logged (errcheck)") Fixes:70bfcfef42("lint: work nicely with wrapped errors (errorlint)") Signed-off-by: Robin Jarry <robin@jarry.cc> Signed-off-by: Moritz Poldrack <moritz@poldrack.dev>
31 lines
615 B
Go
31 lines
615 B
Go
package gpgbin
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"io"
|
|
|
|
"git.sr.ht/~rjarry/aerc/models"
|
|
)
|
|
|
|
// Sign creates a detached signature based on the contents of r
|
|
func Sign(r io.Reader, from string) ([]byte, string, error) {
|
|
args := []string{
|
|
"--armor",
|
|
"--detach-sign",
|
|
"--default-key", from,
|
|
}
|
|
|
|
g := newGpg(r, args)
|
|
_ = g.cmd.Run()
|
|
|
|
outRdr := bytes.NewReader(g.stdout.Bytes())
|
|
var md models.MessageDetails
|
|
err := parse(outRdr, &md)
|
|
if err != nil {
|
|
return nil, "", fmt.Errorf("failed to parse messagedetails: %w", err)
|
|
}
|
|
var buf bytes.Buffer
|
|
_, _ = io.Copy(&buf, md.Body)
|
|
return buf.Bytes(), md.Micalg, nil
|
|
}
|