Skip to content

Commit da03cf0

Browse files
committed
replace pkcs12 package by software.sslmate.com/src/go-pkcs12 + include intermediate certificates
1 parent 07c02cb commit da03cf0

File tree

4 files changed

+189
-128
lines changed

4 files changed

+189
-128
lines changed

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@ all: clean test build
1515
build:
1616
$(XCADDY) build --output $(OUT_DIR)/$(BINARY_NAME) --with $(MODULE_PATH)=./
1717
chmod u+x $(OUT_DIR)/$(BINARY_NAME)
18+
19+
setcap:
20+
setcap 'cap_net_bind_service=+ep' $(OUT_DIR)/$(BINARY_NAME)
21+
1822
test:
1923
go test -v ./...
2024
clean:
2125
rm -rf $(OUT_DIR)
2226
run:
23-
$(XCADDY) run
27+
XCADDY_SETCAP=1 $(XCADDY) run
2428
./$(OUT_DIR)/$(BINARY_NAME)

go.mod

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
module github.com/quix-labs/caddy-pfx-certificates
22

3-
go 1.21.0
3+
go 1.22.3
44

5-
toolchain go1.22.2
5+
toolchain go1.23.0
66

77
require (
88
github.com/caddyserver/caddy/v2 v2.8.4
9-
github.com/caddyserver/certmagic v0.21.3
10-
golang.org/x/crypto v0.23.0
9+
github.com/caddyserver/certmagic v0.21.4
10+
go.uber.org/zap v1.27.0
11+
software.sslmate.com/src/go-pkcs12 v0.5.0
1112
)
1213

1314
require (
1415
github.com/beorn7/perks v1.0.1 // indirect
1516
github.com/caddyserver/zerossl v0.1.3 // indirect
16-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
17-
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
18-
github.com/google/pprof v0.0.0-20240430035430-e4905b036c4e // indirect
17+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
18+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
19+
github.com/google/pprof v0.0.0-20231212022811-ec68065c825e // indirect
1920
github.com/google/uuid v1.6.0 // indirect
20-
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
21+
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
2122
github.com/libdns/libdns v0.2.2 // indirect
22-
github.com/mholt/acmez v1.2.0 // indirect
23-
github.com/mholt/acmez/v2 v2.0.1 // indirect
24-
github.com/miekg/dns v1.1.59 // indirect
25-
github.com/onsi/ginkgo/v2 v2.17.2 // indirect
23+
github.com/mholt/acmez/v2 v2.0.3 // indirect
24+
github.com/miekg/dns v1.1.62 // indirect
25+
github.com/onsi/ginkgo/v2 v2.13.2 // indirect
2626
github.com/prometheus/client_golang v1.19.1 // indirect
27-
github.com/prometheus/client_model v0.6.1 // indirect
28-
github.com/prometheus/common v0.53.0 // indirect
29-
github.com/prometheus/procfs v0.14.0 // indirect
27+
github.com/prometheus/client_model v0.5.0 // indirect
28+
github.com/prometheus/common v0.48.0 // indirect
29+
github.com/prometheus/procfs v0.12.0 // indirect
3030
github.com/quic-go/qpack v0.4.0 // indirect
3131
github.com/quic-go/quic-go v0.44.0 // indirect
32-
github.com/zeebo/blake3 v0.2.3 // indirect
32+
github.com/zeebo/blake3 v0.2.4 // indirect
3333
go.uber.org/mock v0.4.0 // indirect
3434
go.uber.org/multierr v1.11.0 // indirect
35-
go.uber.org/zap v1.27.0 // indirect
3635
go.uber.org/zap/exp v0.2.0 // indirect
36+
golang.org/x/crypto v0.27.0 // indirect
3737
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
38-
golang.org/x/mod v0.17.0 // indirect
39-
golang.org/x/net v0.25.0 // indirect
40-
golang.org/x/sync v0.7.0 // indirect
41-
golang.org/x/sys v0.20.0 // indirect
42-
golang.org/x/term v0.20.0 // indirect
43-
golang.org/x/text v0.15.0 // indirect
38+
golang.org/x/mod v0.18.0 // indirect
39+
golang.org/x/net v0.29.0 // indirect
40+
golang.org/x/sync v0.8.0 // indirect
41+
golang.org/x/sys v0.25.0 // indirect
42+
golang.org/x/term v0.24.0 // indirect
43+
golang.org/x/text v0.18.0 // indirect
4444
golang.org/x/time v0.5.0 // indirect
45-
golang.org/x/tools v0.21.0 // indirect
45+
golang.org/x/tools v0.22.0 // indirect
4646
google.golang.org/protobuf v1.34.1 // indirect
4747
)

0 commit comments

Comments
 (0)