kris/th5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tris: drop QuietError

Browse Source
This commit is contained in:
Filippo Valsorda 2016-11-30 03:08:13 +00:00 committed by Peter Wu
parent 2b667f2952
commit 5c4af70647
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
13.go
View File

@ -532,23 +532,10 @@ func (hs *serverHandshakeState) sendSessionTicket13() error {
return nil return nil
} }
// QuietError is an error wrapper that prevents the verbose handshake log
// dump on errors. Exposed for use by GetCertificate.
type QuietError struct {
Err error
}
func (e QuietError) Error() string {
return e.Err.Error() + " [quiet]"
}
func (hs *serverHandshakeState) traceErr(err error) { func (hs *serverHandshakeState) traceErr(err error) {
if err == nil { if err == nil {
return return
} }
if _, ok := err.(QuietError); ok {
return
}
if os.Getenv("TLSDEBUG") == "error" { if os.Getenv("TLSDEBUG") == "error" {
if hs != nil && hs.clientHello != nil { if hs != nil && hs.clientHello != nil {
os.Stderr.WriteString(hex.Dump(hs.clientHello.marshal())) os.Stderr.WriteString(hex.Dump(hs.clientHello.marshal()))

4
handshake_server.go
View File

@ -282,9 +282,7 @@ Curves:
hs.cert, err = c.config.getCertificate(hs.clientHelloInfo()) hs.cert, err = c.config.getCertificate(hs.clientHelloInfo())
if err != nil { if err != nil {
if _, ok := err.(QuietError); ok { c.out.traceErr, c.in.traceErr = nil, nil // disable tracing
c.out.traceErr, c.in.traceErr = nil, nil
}
c.sendAlert(alertInternalError) c.sendAlert(alertInternalError)
return false, err return false, err
} }