Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a04be88

Browse files
ameryamery
committedSep 27, 2024·
WIP
Signed-off-by: Alejandro Mery <[email protected]>
1 parent 73846d8 commit a04be88

File tree

6 files changed

+53
-47
lines changed

6 files changed

+53
-47
lines changed
 

‎pkg/ca/config.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
"darvaza.org/core"
1414
"darvaza.org/darvaza/shared/x509utils"
15-
"golang.org/x/exp/slices"
1615
)
1716

1817
// KeyAlgorithm specifies the algorithm to use when generating a Private Key
@@ -68,7 +67,7 @@ func (cfg Config) LoadCA(key x509utils.PrivateKey, certs []*x509.Certificate) (*
6867
ca := &CA{
6968
cfg: cfg,
7069
caKey: key,
71-
caCert: slices.Clone(certs),
70+
caCert: core.SliceCopy(certs),
7271
}
7372

7473
if !ca.validate() {

‎pkg/ca/go.mod

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ go 1.21
55
require (
66
darvaza.org/acmefy v0.4.4
77
darvaza.org/acmefy/pkg/respond v0.1.2
8-
darvaza.org/core v0.9.9
8+
darvaza.org/core v0.14.8
99
darvaza.org/darvaza/shared v0.5.9
10-
darvaza.org/darvaza/shared/web v0.3.10 // indirect
1110
darvaza.org/slog v0.5.4 // indirect
1211
darvaza.org/slog/handlers/discard v0.4.6 // indirect
12+
darvaza.org/x/fs v0.3.1 // indirect
13+
darvaza.org/x/web v0.8.6 // indirect
1314
)
1415

15-
require golang.org/x/exp v0.0.0-20230905200255-921286631fa9
16-
1716
require (
1817
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
19-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
20-
github.com/zeebo/blake3 v0.2.3 // indirect
21-
golang.org/x/net v0.15.0 // indirect
22-
golang.org/x/sync v0.3.0 // indirect
23-
golang.org/x/sys v0.12.0 // indirect
24-
golang.org/x/text v0.13.0 // indirect
18+
github.com/gobwas/glob v0.2.3 // indirect
19+
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
20+
github.com/zeebo/blake3 v0.2.4 // indirect
21+
golang.org/x/net v0.29.0 // indirect
22+
golang.org/x/sync v0.8.0 // indirect
23+
golang.org/x/sys v0.25.0 // indirect
24+
golang.org/x/text v0.18.0 // indirect
2525
)
2626

2727
replace (

‎pkg/ca/go.sum

+20-19
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
1-
darvaza.org/core v0.9.9 h1:nUNvkGJzWUEQcFSCMjZU8L+yQml8OPWGg7xh7MlSpM4=
2-
darvaza.org/core v0.9.9/go.mod h1:5YJ2YovkxdjgXd7xMGbg4/cBf0i8Y2Qv80twxl1yf4s=
1+
darvaza.org/core v0.14.8 h1:sQ3+jWjvqtF3sSW2kAGCFT7zWKcLfyhy1mCV2QU7pzs=
2+
darvaza.org/core v0.14.8/go.mod h1:KCXKssntfqEfuzJa6KMa7F1ShU/lYh1TKt2f4cmEdO0=
33
darvaza.org/darvaza/shared v0.5.9 h1:/3BKeRToLXNK29O46zDCSX2bOho2bbTIzU7H52Ysfsw=
44
darvaza.org/darvaza/shared v0.5.9/go.mod h1:EP8IbgskJN6w7ueIihz/S8RqA1Y8Eq6OlTdK7R2H98Q=
5-
darvaza.org/darvaza/shared/web v0.3.10 h1:P1N+42axCpxVCm3Xmm3BSBAhmiRz77DP/dsf6X5EO5o=
6-
darvaza.org/darvaza/shared/web v0.3.10/go.mod h1:VrMIwn5l6O7+EMnNasa5skcuaZeiPKdLSYe3pKQkS1M=
75
darvaza.org/slog v0.5.4 h1:xzlWVzYh4tuZLnj4A9tOHXfn/SAEIkApXPvK3YDiW9g=
86
darvaza.org/slog v0.5.4/go.mod h1:QFtY3QoQ7xxww85umlEKPcMCNzqNrHYqnj53KehsmBU=
97
darvaza.org/slog/handlers/discard v0.4.6 h1:TatHJn34y6eKQzNRHSo6lGZnJg4SLOGaWstlvwwOyrE=
108
darvaza.org/slog/handlers/discard v0.4.6/go.mod h1:AG8WKr7m11NPPzvHW/b8nCT5RvYR9RZcIT/NWUOoMAo=
9+
darvaza.org/x/fs v0.3.1 h1:REQbS2vjpmwHtyfEWpUmtR598Q8s57vFcFu35Ccck+A=
10+
darvaza.org/x/fs v0.3.1/go.mod h1:nUenMGryeLgm7BuIu46xpPBTBnWTrzZOTukROBAoK/I=
11+
darvaza.org/x/web v0.8.6 h1:DWinQCRwWegRlJDkjkkqBP4/LRJmDGkxNDYMksw+lRY=
12+
darvaza.org/x/web v0.8.6/go.mod h1:zfjxIhgBomy0VzcF7sN/P4u5iSlg5nrTZIhKpMj7S3U=
1113
github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
1214
github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
13-
github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
14-
github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
15-
github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
15+
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
16+
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
17+
github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
18+
github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
1619
github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY=
1720
github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
18-
github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg=
19-
github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ=
21+
github.com/zeebo/blake3 v0.2.4 h1:KYQPkhpRtcqh0ssGYcKLG1JYvddkEA8QwCM/yBqhaZI=
22+
github.com/zeebo/blake3 v0.2.4/go.mod h1:7eeQ6d2iXWRGF6npfaxl2CU+xy2Fjo2gxeyZGCRUjcE=
2023
github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
2124
github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
22-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
23-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
24-
golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
25-
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
26-
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
27-
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
25+
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
26+
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
27+
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
28+
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
2829
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
29-
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
30-
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
31-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
32-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
30+
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
31+
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
32+
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
33+
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=

‎pkg/respond/go.mod

+9-5
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@ go 1.21
44

55
require (
66
darvaza.org/acmefy v0.4.4
7-
darvaza.org/core v0.9.9 // indirect
7+
darvaza.org/core v0.14.8 // indirect
88
darvaza.org/darvaza/shared v0.5.9
9-
darvaza.org/darvaza/shared/web v0.3.10
109
)
1110

12-
require github.com/go-jose/go-jose/v4 v4.0.4
11+
require (
12+
darvaza.org/x/web v0.8.6
13+
github.com/go-jose/go-jose/v4 v4.0.4
14+
)
1315

1416
require (
15-
golang.org/x/net v0.15.0 // indirect
16-
golang.org/x/text v0.13.0 // indirect
17+
darvaza.org/x/fs v0.3.1 // indirect
18+
github.com/gobwas/glob v0.2.3 // indirect
19+
golang.org/x/net v0.29.0 // indirect
20+
golang.org/x/text v0.18.0 // indirect
1721
)
1822

1923
replace darvaza.org/acmefy => ../../

‎pkg/respond/go.sum

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
darvaza.org/core v0.9.9 h1:nUNvkGJzWUEQcFSCMjZU8L+yQml8OPWGg7xh7MlSpM4=
2-
darvaza.org/core v0.9.9/go.mod h1:5YJ2YovkxdjgXd7xMGbg4/cBf0i8Y2Qv80twxl1yf4s=
1+
darvaza.org/core v0.14.8 h1:sQ3+jWjvqtF3sSW2kAGCFT7zWKcLfyhy1mCV2QU7pzs=
2+
darvaza.org/core v0.14.8/go.mod h1:KCXKssntfqEfuzJa6KMa7F1ShU/lYh1TKt2f4cmEdO0=
33
darvaza.org/darvaza/shared v0.5.9 h1:/3BKeRToLXNK29O46zDCSX2bOho2bbTIzU7H52Ysfsw=
44
darvaza.org/darvaza/shared v0.5.9/go.mod h1:EP8IbgskJN6w7ueIihz/S8RqA1Y8Eq6OlTdK7R2H98Q=
5-
darvaza.org/darvaza/shared/web v0.3.10 h1:P1N+42axCpxVCm3Xmm3BSBAhmiRz77DP/dsf6X5EO5o=
6-
darvaza.org/darvaza/shared/web v0.3.10/go.mod h1:VrMIwn5l6O7+EMnNasa5skcuaZeiPKdLSYe3pKQkS1M=
5+
darvaza.org/x/fs v0.3.1 h1:REQbS2vjpmwHtyfEWpUmtR598Q8s57vFcFu35Ccck+A=
6+
darvaza.org/x/fs v0.3.1/go.mod h1:nUenMGryeLgm7BuIu46xpPBTBnWTrzZOTukROBAoK/I=
7+
darvaza.org/x/web v0.8.6 h1:DWinQCRwWegRlJDkjkkqBP4/LRJmDGkxNDYMksw+lRY=
8+
darvaza.org/x/web v0.8.6/go.mod h1:zfjxIhgBomy0VzcF7sN/P4u5iSlg5nrTZIhKpMj7S3U=
79
github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
810
github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
9-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
10-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
11-
golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
12-
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
13-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
14-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
11+
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
12+
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
13+
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
14+
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
15+
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
16+
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=

‎pkg/respond/respond.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Package respond contains encoding/decoding helpers
22
package respond
33

4-
import "darvaza.org/darvaza/shared/web/respond"
4+
import "darvaza.org/x/web/respond"
55

66
var reg = respond.NewRegistry()
77

0 commit comments

Comments
 (0)
Please sign in to comment.