From 224c2a891dbb83332a1d582bab32a94dc3201215 Mon Sep 17 00:00:00 2001 From: Simon Zolin Date: Thu, 28 Feb 2019 11:55:16 +0300 Subject: [PATCH] * control: TLS: don't return empty error messages --- control_tls.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/control_tls.go b/control_tls.go index d444fe07..25be44d6 100644 --- a/control_tls.go +++ b/control_tls.go @@ -138,14 +138,14 @@ func verifyCertChain(data *tlsConfigStatus, certChain string, serverName string) parsed, err := x509.ParseCertificate(cert.Bytes) if err != nil { data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err) - return errors.New("") + return errors.New(data.WarningValidation) } parsedCerts = append(parsedCerts, parsed) } if len(parsedCerts) == 0 { data.WarningValidation = fmt.Sprintf("You have specified an empty certificate") - return errors.New("") + return errors.New(data.WarningValidation) } data.ValidCert = true @@ -214,14 +214,14 @@ func validatePkey(data *tlsConfigStatus, pkey string) error { if key == nil { data.WarningValidation = "No valid keys were found" - return errors.New("") + return errors.New(data.WarningValidation) } // parse the decoded key _, keytype, err := parsePrivateKey(key.Bytes) if err != nil { data.WarningValidation = fmt.Sprintf("Failed to parse private key: %s", err) - return errors.New("") + return errors.New(data.WarningValidation) } data.ValidKey = true