Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions command_verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"crypto/x509"
"encoding/pem"
"fmt"
"io"
"os"

Expand Down Expand Up @@ -63,17 +64,25 @@ func verifyAttached() error {
if len(chains) > 0 {
emitBadSig(chains)
} else {
// TODO: We're ommitting a bunch of arguments here.
// TODO: We're omitting a bunch of arguments here.
sErrSig.emit()
}

return errors.Wrap(err, "failed to verify signature")
}

var (
cert = chains[0][0][0]
fpr = certHexFingerprint(cert)
subj = cert.Subject.String()
)

fmt.Fprintf(stderr, "smimesign: Signature made using certificate ID 0x%s\n", fpr)
emitGoodSig(chains)

// TODO: Maybe split up signature checking and certificate checking so we can
// output something more meaningful.
fmt.Fprintf(stderr, "smimesign: Good signature from \"%s\"\n", subj)
emitTrustFully()

return nil
Expand Down Expand Up @@ -131,17 +140,25 @@ func verifyDetached() error {
if len(chains) > 0 {
emitBadSig(chains)
} else {
// TODO: We're ommitting a bunch of arguments here.
// TODO: We're omitting a bunch of arguments here.
sErrSig.emit()
}

return errors.Wrap(err, "failed to verify signature")
}

var (
cert = chains[0][0][0]
fpr = certHexFingerprint(cert)
subj = cert.Subject.String()
)

fmt.Fprintf(stderr, "smimesign: Signature made using certificate ID 0x%s\n", fpr)
emitGoodSig(chains)

// TODO: Maybe split up signature checking and certificate checking so we can
// output something more meaningful.
fmt.Fprintf(stderr, "smimesign: Good signature from \"%s\"\n", subj)
emitTrustFully()

return nil
Expand Down
4 changes: 2 additions & 2 deletions status.go
Original file line number Diff line number Diff line change
Expand Up @@ -206,15 +206,15 @@ func emitSigCreated(cert *x509.Certificate, isDetached bool) {

func emitGoodSig(chains [][][]*x509.Certificate) {
cert := chains[0][0][0]
subj := cert.Subject.ToRDNSequence().String()
subj := cert.Subject.String()
fpr := certHexFingerprint(cert)

sGoodSig.emitf("%s %s", fpr, subj)
}

func emitBadSig(chains [][][]*x509.Certificate) {
cert := chains[0][0][0]
subj := cert.Subject.ToRDNSequence().String
subj := cert.Subject.String
fpr := certHexFingerprint(cert)

sBadSig.emitf("%s %s", fpr, subj)
Expand Down