Mirror/ergo
1
0
Fork 0
mirror of https://github.com/jeremyd/ergo.git synced 2026-08-04 05:03:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

clean up loadCertWithLeaf (#2426)

Browse Source 
tls.LoadX509KeyPair started populating Leaf automatically in go1.23
This commit is contained in:
Shivaram Lingamneni
2026-07-22 04:31:58 -04:00
committed by GitHub
parent 1712a87074
commit a05b379c83
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
irc/config.go
+3 -18
View File
@@ -8,7 +8,6 @@ package irc
import (
"bytes"
"crypto/tls"
"crypto/x509"
"errors"
"fmt"
"io"
@@ -942,7 +941,7 @@ func loadTlsConfig(config listenerConfigBlock) (tlsConfig *tls.Config, err error
if len(config.TLSCertificates) != 0 {
// SNI configuration with multiple certificates
for _, certPairConf := range config.TLSCertificates {
cert, err := loadCertWithLeaf(certPairConf.Cert, certPairConf.Key)
cert, err := tls.LoadX509KeyPair(certPairConf.Cert, certPairConf.Key)
if err != nil {
return nil, err
}
@@ -950,7 +949,7 @@ func loadTlsConfig(config listenerConfigBlock) (tlsConfig *tls.Config, err error
}
} else if config.TLS.Cert != "" {
// normal configuration with one certificate
cert, err := loadCertWithLeaf(config.TLS.Cert, config.TLS.Key)
cert, err := tls.LoadX509KeyPair(config.TLS.Cert, config.TLS.Key)
if err != nil {
return nil, err
}
@@ -993,20 +992,6 @@ func tlsMinVersionFromString(version string) uint16 {
}
}
func loadCertWithLeaf(certFile, keyFile string) (cert tls.Certificate, err error) {
// LoadX509KeyPair: "On successful return, Certificate.Leaf will be nil because
// the parsed form of the certificate is not retained." tls.Config:
// "Note: if there are multiple Certificates, and they don't have the
// optional field Leaf set, certificate selection will incur a significant
// per-handshake performance cost."
cert, err = tls.LoadX509KeyPair(certFile, keyFile)
if err != nil {
return
}
cert.Leaf, err = x509.ParseCertificate(cert.Certificate[0])
return
}
// prepareListeners populates Config.Server.trueListeners
func (conf *Config) prepareListeners() (err error) {
if len(conf.Server.Listeners) == 0 {
@@ -1079,7 +1064,7 @@ func (config *Config) processAPI() (err error) {
var tlsConfig *tls.Config
if config.API.TLS.Cert != "" {
cert, err := loadCertWithLeaf(config.API.TLS.Cert, config.API.TLS.Key)
cert, err := tls.LoadX509KeyPair(config.API.TLS.Cert, config.API.TLS.Key)
if err != nil {
return err
}