clients/autocert: depend on forked autocertclients/autocert/v2.2.0

3 files changed, 17 insertions, 18 deletions

diff --git a/clients/autocert/autocert_wrapper.go b/clients/autocert/autocert_wrapper.go
index c8dd180..b174a62 100644
--- a/clients/autocert/autocert_wrapper.go
+++ b/clients/autocert/autocert_wrapper.go
@@ -7,10 +7,9 @@ import (
 
         "code.crute.us/mcrute/golib/clients/dns"
         glautocert "code.crute.us/mcrute/golib/crypto/acme/autocert"
+        fautocert "code.crute.us/mcrute/golib/crypto/acme/autocert/fork"
         "code.crute.us/mcrute/golib/log"
         "code.crute.us/mcrute/golib/service"
-
-        "golang.org/x/crypto/acme/autocert"
 )
 
 type AutocertConfig struct {
@@ -21,7 +20,7 @@ type AutocertConfig struct {
 }
 
 type AutocertWrapper struct {
-        *autocert.Manager
+        *fautocert.Manager
         hostList      *glautocert.ACMEHostList
         primingNotify chan string
         primaryHost   string
@@ -41,9 +40,9 @@ func NewAutocertWrapper(ctx context.Context, c AutocertConfig) (*AutocertWrapper
                 hostList:      hostList,
                 primingNotify: make(chan string, 10),
                 primaryHost:   c.Hosts[0],
-                Manager: &autocert.Manager{
-                        Cache:      autocert.DirCache("ssl/"),
-                        Prompt:     autocert.AcceptTOS,
+                Manager: &fautocert.Manager{
+                        Cache:      fautocert.DirCache("ssl/"),
+                        Prompt:     fautocert.AcceptTOS,
                         HostPolicy: hostList.HostPolicy,
                         Email:      c.Email,
                         StapleOCSP: true,
diff --git a/clients/autocert/go.mod b/clients/autocert/go.mod
index 0783e75..d09f564 100644
--- a/clients/autocert/go.mod
+++ b/clients/autocert/go.mod
@@ -2,15 +2,13 @@ module code.crute.us/mcrute/golib/clients/autocert/v2
 
 go 1.18
 
-replace golang.org/x/crypto => ../../../third_party/golang/x/crypto
-
 require (
-        code.crute.us/mcrute/golib v0.4.2
+        code.crute.us/mcrute/golib v0.6.0
         code.crute.us/mcrute/golib/clients/dns v0.1.0
-        golang.org/x/crypto v0.3.0
 )
 
 require (
-        golang.org/x/net v0.2.0 // indirect
-        golang.org/x/text v0.4.0 // indirect
+        golang.org/x/crypto v0.11.0 // indirect
+        golang.org/x/net v0.10.0 // indirect
+        golang.org/x/text v0.11.0 // indirect
 )
diff --git a/clients/autocert/go.sum b/clients/autocert/go.sum
index b6bb4ff..8eeb498 100644
--- a/clients/autocert/go.sum
+++ b/clients/autocert/go.sum
@@ -1,8 +1,10 @@
-code.crute.us/mcrute/golib v0.4.2 h1:WeZyBMRFOiIkdNhsXx3kMgRGDUdUshzHS/J4OIPThlY=
-code.crute.us/mcrute/golib v0.4.2/go.mod h1:dukLPhs1H8dxtkhXtpJZYo/bMzefLRbdRj9Tj67wdaQ=
+code.crute.us/mcrute/golib v0.6.0 h1:36+rTs5Z7lKjXpsgKhyKsOl9S2pHRcxK+D9ytbbTqGw=
+code.crute.us/mcrute/golib v0.6.0/go.mod h1:nB/ZeOhlFWUwGj5jTPJxYVyqDLdO3U9ZvBiH+Kll87s=
 code.crute.us/mcrute/golib/clients/dns v0.1.0 h1:bgB+KVLcuSfr5ZoAEgLToawtP4iIrxWIf3s7mMgOo6U=
 code.crute.us/mcrute/golib/clients/dns v0.1.0/go.mod h1:uF2fDvCZAL35ZJgojUhCgVK0HBmIv1+go1NMNPSJaeU=
-golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
+golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
+golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=