github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-20 05:23:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

tls: fix CertConfigFromModule() return order

Browse source
This commit is contained in:
Lars Lehtonen 2019-11-13 14:31:38 -08:00
commit 372c2d6428
No known key found for this signature in database
GPG key ID: 8137D474EBCB04F2
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/api_rest/api_rest.go
View file

@ -213,7 +213,7 @@ func (mod *RestAPI) Configure() error {
if mod.isTLS() { if mod.isTLS() {
if !fs.Exists(mod.certFile) || !fs.Exists(mod.keyFile) { if !fs.Exists(mod.certFile) || !fs.Exists(mod.keyFile) {
err, cfg := tls.CertConfigFromModule("api.rest", mod.SessionModule) cfg, err := tls.CertConfigFromModule("api.rest", mod.SessionModule)
if err != nil { if err != nil {
return err return err
} }

2
modules/https_proxy/https_proxy.go
View file

@ -137,7 +137,7 @@ func (mod *HttpsProxy) Configure() error {
mod.proxy.Whitelist = str.Comma(whitelist) mod.proxy.Whitelist = str.Comma(whitelist)
if !fs.Exists(certFile) || !fs.Exists(keyFile) { if !fs.Exists(certFile) || !fs.Exists(keyFile) {
err, cfg := tls.CertConfigFromModule("https.proxy", mod.SessionModule) cfg, err := tls.CertConfigFromModule("https.proxy", mod.SessionModule)
if err != nil { if err != nil {
return err return err
} }

2
modules/https_server/https_server.go
View file

@ -129,7 +129,7 @@ func (mod *HttpsServer) Configure() error {
} }
if !fs.Exists(certFile) || !fs.Exists(keyFile) { if !fs.Exists(certFile) || !fs.Exists(keyFile) {
err, cfg := tls.CertConfigFromModule("https.server", mod.SessionModule) cfg, err := tls.CertConfigFromModule("https.server", mod.SessionModule)
if err != nil { if err != nil {
return err return err
} }

16
tls/cert.go
View file

@ -57,21 +57,21 @@ func CertConfigToModule(prefix string, m *session.SessionModule, defaults CertCo
"Common Name field of the generated HTTPS certificate.")) "Common Name field of the generated HTTPS certificate."))
} }
func CertConfigFromModule(prefix string, m session.SessionModule) (err error, cfg CertConfig) { func CertConfigFromModule(prefix string, m session.SessionModule) (cfg CertConfig, err error) {
if err, cfg.Bits = m.IntParam(prefix + ".certificate.bits"); err != nil { if err, cfg.Bits = m.IntParam(prefix + ".certificate.bits"); err != nil {
return err, cfg return cfg, err
} else if err, cfg.Country = m.StringParam(prefix + ".certificate.country"); err != nil { } else if err, cfg.Country = m.StringParam(prefix + ".certificate.country"); err != nil {
return err, cfg return cfg, err
} else if err, cfg.Locality = m.StringParam(prefix + ".certificate.locality"); err != nil { } else if err, cfg.Locality = m.StringParam(prefix + ".certificate.locality"); err != nil {
return err, cfg return cfg, err
} else if err, cfg.Organization = m.StringParam(prefix + ".certificate.organization"); err != nil { } else if err, cfg.Organization = m.StringParam(prefix + ".certificate.organization"); err != nil {
return err, cfg return cfg, err
} else if err, cfg.OrganizationalUnit = m.StringParam(prefix + ".certificate.organizationalunit"); err != nil { } else if err, cfg.OrganizationalUnit = m.StringParam(prefix + ".certificate.organizationalunit"); err != nil {
return err, cfg return cfg, err
} else if err, cfg.CommonName = m.StringParam(prefix + ".certificate.commonname"); err != nil { } else if err, cfg.CommonName = m.StringParam(prefix + ".certificate.commonname"); err != nil {
return err, cfg return cfg, err
} }
return nil, cfg return cfg, err
} }
func CreateCertificate(cfg CertConfig, ca bool) (*rsa.PrivateKey, []byte, error) { func CreateCertificate(cfg CertConfig, ca bool) (*rsa.PrivateKey, []byte, error) {