Skip to content

Commit 7e96b8b

Browse files
authored
Merge pull request #56 from github/verify-output
Output for verify command
2 parents a1fe9f4 + 9656e67 commit 7e96b8b

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

command_verify.go

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"bytes"
55
"crypto/x509"
66
"encoding/pem"
7+
"fmt"
78
"io"
89
"os"
910

@@ -63,17 +64,25 @@ func verifyAttached() error {
6364
if len(chains) > 0 {
6465
emitBadSig(chains)
6566
} else {
66-
// TODO: We're ommitting a bunch of arguments here.
67+
// TODO: We're omitting a bunch of arguments here.
6768
sErrSig.emit()
6869
}
6970

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

74+
var (
75+
cert = chains[0][0][0]
76+
fpr = certHexFingerprint(cert)
77+
subj = cert.Subject.String()
78+
)
79+
80+
fmt.Fprintf(stderr, "smimesign: Signature made using certificate ID 0x%s\n", fpr)
7381
emitGoodSig(chains)
7482

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

7988
return nil
@@ -131,17 +140,25 @@ func verifyDetached() error {
131140
if len(chains) > 0 {
132141
emitBadSig(chains)
133142
} else {
134-
// TODO: We're ommitting a bunch of arguments here.
143+
// TODO: We're omitting a bunch of arguments here.
135144
sErrSig.emit()
136145
}
137146

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

150+
var (
151+
cert = chains[0][0][0]
152+
fpr = certHexFingerprint(cert)
153+
subj = cert.Subject.String()
154+
)
155+
156+
fmt.Fprintf(stderr, "smimesign: Signature made using certificate ID 0x%s\n", fpr)
141157
emitGoodSig(chains)
142158

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

147164
return nil

status.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,15 @@ func emitSigCreated(cert *x509.Certificate, isDetached bool) {
206206

207207
func emitGoodSig(chains [][][]*x509.Certificate) {
208208
cert := chains[0][0][0]
209-
subj := cert.Subject.ToRDNSequence().String()
209+
subj := cert.Subject.String()
210210
fpr := certHexFingerprint(cert)
211211

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

215215
func emitBadSig(chains [][][]*x509.Certificate) {
216216
cert := chains[0][0][0]
217-
subj := cert.Subject.ToRDNSequence().String
217+
subj := cert.Subject.String
218218
fpr := certHexFingerprint(cert)
219219

220220
sBadSig.emitf("%s %s", fpr, subj)

0 commit comments

Comments
 (0)