Skip to content

Commit bc3d497

Browse files
committed
caddytls: Fix broken refactor
Not sure how that happened...
1 parent a807fe0 commit bc3d497

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

caddyconfig/httpcaddyfile/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ func parseOptECH(d *caddyfile.Dispenser, _ any) (any, error) {
585585
publicNames := d.RemainingArgs()
586586
for _, publicName := range publicNames {
587587
ech.Configs = append(ech.Configs, caddytls.ECHConfiguration{
588-
OuterSNI: publicName,
588+
PublicName: publicName,
589589
})
590590
}
591591
if len(ech.Configs) == 0 {

caddyconfig/httpcaddyfile/tlsapp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ func (st ServerType) buildTLSApp(
375375
return nil, warnings, err
376376
}
377377
for _, cfg := range ech.Configs {
378-
ap.SubjectsRaw = append(ap.SubjectsRaw, cfg.OuterSNI)
378+
ap.SubjectsRaw = append(ap.SubjectsRaw, cfg.PublicName)
379379
}
380380
if tlsApp.Automation == nil {
381381
tlsApp.Automation = new(caddytls.AutomationConfig)

modules/caddytls/ech.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func (ech *ECH) Provision(ctx caddy.Context) ([]string, error) {
136136
// current/active, so they can be used for ECH retries
137137

138138
for _, cfg := range ech.Configs {
139-
publicName := strings.ToLower(strings.TrimSpace(cfg.OuterSNI))
139+
publicName := strings.ToLower(strings.TrimSpace(cfg.PublicName))
140140

141141
if list, ok := ech.configs[publicName]; ok && len(list) > 0 {
142142
// at least one config with this public name was loaded, so find the

0 commit comments

Comments
 (0)