diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 939ed2337b..233a968c44 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -27,7 +27,7 @@ jobs: uses: golangci/golangci-lint-action@5c56cd6c9dc07901af25baab6f2b0d9f3b7c3018 with: # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: v1.40.1 + version: v1.41.1 # Optional: golangci-lint command line arguments. args: --config=.golangci.yml --verbose diff --git a/Makefile b/Makefile index 27cc4b95ca..f88e110b8d 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ TEST_TIMEOUT ?= 5s RELEASE_UID ?= $(shell id -u) RELEASE_GID ?= $(shell id -g) -GOLANGCILINT_WANT_VERSION = 1.40.1 +GOLANGCILINT_WANT_VERSION = 1.41.1 GOLANGCILINT_VERSION = $(shell golangci-lint version 2>/dev/null) $(TARGET): diff --git a/go.mod b/go.mod index f174beb869..c09b9c368f 100644 --- a/go.mod +++ b/go.mod @@ -18,12 +18,12 @@ require ( github.com/cilium/cilium v1.10.2 github.com/cilium/hubble v0.8.0 github.com/cilium/workerpool v1.0.0 - github.com/cloudflare/cfssl v1.5.0 + github.com/cloudflare/cfssl v1.6.0 github.com/go-openapi/strfmt v0.20.0 github.com/mholt/archiver/v3 v3.5.0 - github.com/pkg/browser v0.0.0-20210606212950-a7b7a6107d32 + github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 github.com/spf13/cobra v1.2.1 - google.golang.org/grpc v1.38.1 + google.golang.org/grpc v1.39.0 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c k8s.io/api v0.21.1 k8s.io/apimachinery v0.21.1 diff --git a/go.sum b/go.sum index caec7c9048..303152cb18 100644 --- a/go.sum +++ b/go.sum @@ -185,14 +185,14 @@ github.com/cilium/workerpool v1.0.0/go.mod h1:GOYJhwlnIjR+jWSDNBb5kw47G1H/XA9X4W github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY= -github.com/cloudflare/cfssl v1.5.0 h1:vFJDAvQgFSRbCn9zg8KpSrrEZrBAQ4KO5oNK7SXEyb0= -github.com/cloudflare/cfssl v1.5.0/go.mod h1:sPPkBS5L8l8sRc/IOO1jG51Xb34u+TYhL6P//JdODMQ= -github.com/cloudflare/go-metrics v0.0.0-20151117154305-6a9aea36fb41/go.mod h1:eaZPlJWD+G9wseg1BuRXlHnjntPMrywMsyxf+LTOdP4= +github.com/cloudflare/cfssl v1.6.0 h1:If7CCGnSGsmZ3dZS2ib4sSiu3S39IQPIwrS2dJ6cFXQ= +github.com/cloudflare/cfssl v1.6.0/go.mod h1:9tj9734Opm88JuxpLJPoY6zRGc7XfXM8A+x6nh5/Cqg= github.com/cloudflare/redoctober v0.0.0-20171127175943-746a508df14c/go.mod h1:6Se34jNoqrd8bTxrmJB2Bg2aoZ2CdSXonils9NsiNgo= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201211205326-cc1b757b3edd/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= @@ -260,6 +260,7 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.4.2-0.20210105193028-872b28c45782/go.mod h1:xL5IroIBOR+aTp0IZk48epGwBV3+LcuaosPL0pr0hE0= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -791,8 +792,8 @@ github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.0.3 h1:vNQKSVZNYUEAvRY9FaUXAF1XPbSOHJtDTiP41kzDz2E= github.com/pierrec/lz4/v4 v4.0.3/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pkg/browser v0.0.0-20210606212950-a7b7a6107d32 h1:K3WnH8Ka32vWygzmjKEhz1zAVqckNoWDqX3azMxuiSA= -github.com/pkg/browser v0.0.0-20210606212950-a7b7a6107d32/go.mod h1:yvwcBfzEX4m+eTgxPBbNYytaWFv4PSQzBaeYjxp8Iik= +github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 h1:acNfDZXmm28D2Yg/c3ALnZStzNaZMSagpbr96vY6Zjc= +github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -947,7 +948,6 @@ github.com/vishvananda/netlink v1.1.1-0.20210510164352-d17758a128bf/go.mod h1:tw github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/vishvananda/netns v0.0.0-20201230012202-c4f3ca719c73/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= github.com/weppos/publicsuffix-go v0.13.0 h1:0Tu1uzLBd1jPn4k6OnMmOPZH/l/9bj9kUOMMkoRs6Gg= github.com/weppos/publicsuffix-go v0.13.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= @@ -967,11 +967,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is= -github.com/zmap/zcrypto v0.0.0-20200513165325-16679db567ff/go.mod h1:TxpejqcVKQjQaVVmMGfzx5HnmFMdIU+vLtaCyPBfGI4= -github.com/zmap/zcrypto v0.0.0-20200911161511-43ff0ea04f21 h1:PIpcdSOg3pMdFJUBg5yR9xxcj5rm/SGAyaWT/wK6Kco= -github.com/zmap/zcrypto v0.0.0-20200911161511-43ff0ea04f21/go.mod h1:TxpejqcVKQjQaVVmMGfzx5HnmFMdIU+vLtaCyPBfGI4= -github.com/zmap/zlint/v2 v2.2.1 h1:b2kI/ToXX16h2wjV2c6Da65eT6aTMtkLHKetXuM9EtI= -github.com/zmap/zlint/v2 v2.2.1/go.mod h1:ixPWsdq8qLxYRpNUTbcKig3R7WgmspsHGLhCCs6rFAM= +github.com/zmap/zcrypto v0.0.0-20201128221613-3719af1573cf h1:LEJcSlvjRUl6T7E0+mvKFxS61NsP1Z/+5jvHr4JQVVU= +github.com/zmap/zcrypto v0.0.0-20201128221613-3719af1573cf/go.mod h1:aPM7r+JOkfL+9qSB4KbYjtoEzJqUK50EXkkJabeNJDQ= +github.com/zmap/zlint/v3 v3.0.0 h1:mCCruybkWbiO8KlCXDqR48YOv+CTZyq9U8cOvXjfayU= +github.com/zmap/zlint/v3 v3.0.0/go.mod h1:paGwFySdHIBEMJ61YjoqT4h7Ge+fdYG4sUQhnTb1lJ8= gitlab.com/golang-commonmark/puny v0.0.0-20191124015043-9f83538fa04f/go.mod h1:Tiuhl+njh/JIg0uS/sOJVYi0x2HEa5rc1OAaVsb5tAs= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -999,6 +998,7 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -1029,12 +1029,11 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200124225646-8b5121be2f68/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e h1:8foAy0aoO5GkqCvAEJ4VC4P3zksTg4X4aJCDpZzmgQI= @@ -1231,6 +1230,7 @@ golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1247,14 +1247,14 @@ golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210309040221-94ec62e08169/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210314195730-07df6a141424/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71 h1:X/2sJAybVknnUnV7AD2HdT6rm2p5BP6eH2j+igduWgk= +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= @@ -1460,8 +1460,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.1 h1:WWfz2L6IIiT1YYTgy/lX1WGoM4gwTOhvrVMs2B8KOt4= -google.golang.org/grpc v1.38.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0 h1:Klz8I9kdtkIN6EpHHUOMLCYhTn/2WAe5a0s1hcBkdTI= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/vendor/github.com/cloudflare/cfssl/api/api.go b/vendor/github.com/cloudflare/cfssl/api/api.go index 98b0ec462e..1d7e23e138 100644 --- a/vendor/github.com/cloudflare/cfssl/api/api.go +++ b/vendor/github.com/cloudflare/cfssl/api/api.go @@ -176,7 +176,7 @@ type Response struct { Messages []ResponseMessage `json:"messages"` } -// NewSuccessResponse is a shortcut for creating new successul API +// NewSuccessResponse is a shortcut for creating new successful API // responses. func NewSuccessResponse(result interface{}) Response { return Response{ diff --git a/vendor/github.com/cloudflare/cfssl/api/client/client.go b/vendor/github.com/cloudflare/cfssl/api/client/client.go index 3f48bb1054..202146a136 100644 --- a/vendor/github.com/cloudflare/cfssl/api/client/client.go +++ b/vendor/github.com/cloudflare/cfssl/api/client/client.go @@ -157,6 +157,7 @@ func (srv *server) post(url string, jsonData []byte) (*api.Response, error) { return nil, errors.Wrap(errors.APIClientError, errors.ClientHTTPError, err) } defer req.Body.Close() + defer resp.Body.Close() body, err := ioutil.ReadAll(resp.Body) if err != nil { return nil, errors.Wrap(errors.APIClientError, errors.IOError, err) @@ -328,7 +329,7 @@ func (ar *AuthRemote) Sign(req []byte) ([]byte, error) { return ar.AuthSign(req, nil, ar.provider) } -// nomalizeURL checks for http/https protocol, appends "http" as default protocol if not defiend in url +// normalizeURL checks for http/https protocol, appends "http" as default protocol if not defined in url func normalizeURL(addr string) (*url.URL, error) { addr = strings.TrimSpace(addr) diff --git a/vendor/github.com/cloudflare/cfssl/cli/config.go b/vendor/github.com/cloudflare/cfssl/cli/config.go index 0f72b9ef89..d174f3a6de 100644 --- a/vendor/github.com/cloudflare/cfssl/cli/config.go +++ b/vendor/github.com/cloudflare/cfssl/cli/config.go @@ -124,7 +124,7 @@ func registerFlags(c *Config, f *flag.FlagSet) { f.StringVar(&c.Password, "password", "0", "Password for accessing PKCS #12 data passed to bundler") f.StringVar(&c.Usage, "usage", "", "usage of private key") f.StringVar(&c.PGPPrivate, "pgp-private", "", "file to load a PGP Private key decryption") - f.StringVar(&c.PGPName, "pgp-name", "", "PGP public key name, can be a comma-sepearted key name list") + f.StringVar(&c.PGPName, "pgp-name", "", "PGP public key name, can be a comma-separated key name list") f.StringVar(&c.Serial, "serial", "", "certificate serial number") f.StringVar(&c.CNOverride, "cn", "", "certificate common name (CN)") f.StringVar(&c.AKI, "aki", "", "certificate issuer (authority) key identifier") diff --git a/vendor/github.com/cloudflare/cfssl/config/config.go b/vendor/github.com/cloudflare/cfssl/config/config.go index 56eeb43679..303107f372 100644 --- a/vendor/github.com/cloudflare/cfssl/config/config.go +++ b/vendor/github.com/cloudflare/cfssl/config/config.go @@ -19,9 +19,9 @@ import ( "github.com/cloudflare/cfssl/helpers" "github.com/cloudflare/cfssl/log" ocspConfig "github.com/cloudflare/cfssl/ocsp/config" - // empty import of zlint/v2 required to have lints registered. - _ "github.com/zmap/zlint/v2" - "github.com/zmap/zlint/v2/lint" + // empty import of zlint/v3 required to have lints registered. + _ "github.com/zmap/zlint/v3" + "github.com/zmap/zlint/v3/lint" ) // A CSRWhitelist stores booleans for fields in the CSR. If a CSRWhitelist is @@ -85,7 +85,7 @@ type SigningProfile struct { BackdateString string `json:"backdate"` AuthKeyName string `json:"auth_key"` CopyExtensions bool `json:"copy_extensions"` - PrevAuthKeyName string `json:"prev_auth_key"` // to suppport key rotation + PrevAuthKeyName string `json:"prev_auth_key"` // to support key rotation RemoteName string `json:"remote"` NotBefore time.Time `json:"not_before"` NotAfter time.Time `json:"not_after"` diff --git a/vendor/github.com/cloudflare/cfssl/csr/csr.go b/vendor/github.com/cloudflare/cfssl/csr/csr.go index 844bc282d9..f26ca132af 100644 --- a/vendor/github.com/cloudflare/cfssl/csr/csr.go +++ b/vendor/github.com/cloudflare/cfssl/csr/csr.go @@ -12,9 +12,11 @@ import ( "encoding/asn1" "encoding/pem" "errors" + "fmt" "net" "net/mail" "net/url" + "strconv" "strings" cferr "github.com/cloudflare/cfssl/errors" @@ -30,12 +32,14 @@ const ( // A Name contains the SubjectInfo fields. type Name struct { - C string `json:"C,omitempty" yaml:"C,omitempty"` // Country - ST string `json:"ST,omitempty" yaml:"ST,omitempty"` // State - L string `json:"L,omitempty" yaml:"L,omitempty"` // Locality - O string `json:"O,omitempty" yaml:"O,omitempty"` // OrganisationName - OU string `json:"OU,omitempty" yaml:"OU,omitempty"` // OrganisationalUnitName - SerialNumber string `json:"SerialNumber,omitempty" yaml:"SerialNumber,omitempty"` + C string `json:"C,omitempty" yaml:"C,omitempty"` // Country + ST string `json:"ST,omitempty" yaml:"ST,omitempty"` // State + L string `json:"L,omitempty" yaml:"L,omitempty"` // Locality + O string `json:"O,omitempty" yaml:"O,omitempty"` // OrganisationName + OU string `json:"OU,omitempty" yaml:"OU,omitempty"` // OrganisationalUnitName + E string `json:"E,omitempty" yaml:"E,omitempty"` + SerialNumber string `json:"SerialNumber,omitempty" yaml:"SerialNumber,omitempty"` + OID map[string]string `json:"OID,omitempty", yaml:"OID,omitempty"` } // A KeyRequest contains the algorithm and key size for a new private key. @@ -157,8 +161,25 @@ func appendIf(s string, a *[]string) { } } +// OIDFromString creates an ASN1 ObjectIdentifier from its string representation +func OIDFromString(s string) (asn1.ObjectIdentifier, error) { + var oid []int + parts := strings.Split(s, ".") + if len(parts) < 1 { + return oid, fmt.Errorf("invalid OID string: %s", s) + } + for _, p := range parts { + i, err := strconv.Atoi(p) + if err != nil { + return nil, fmt.Errorf("invalid OID part %s", p) + } + oid = append(oid, i) + } + return oid, nil +} + // Name returns the PKIX name for the request. -func (cr *CertificateRequest) Name() pkix.Name { +func (cr *CertificateRequest) Name() (pkix.Name, error) { var name pkix.Name name.CommonName = cr.CN @@ -168,9 +189,19 @@ func (cr *CertificateRequest) Name() pkix.Name { appendIf(n.L, &name.Locality) appendIf(n.O, &name.Organization) appendIf(n.OU, &name.OrganizationalUnit) + for k, v := range n.OID { + oid, err := OIDFromString(k) + if err != nil { + return name, err + } + name.ExtraNames = append(name.ExtraNames, pkix.AttributeTypeAndValue{Type: oid, Value: v}) + } + if n.E != "" { + name.ExtraNames = append(name.ExtraNames, pkix.AttributeTypeAndValue{Type: asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 9, 1}, Value: n.E}) + } } name.SerialNumber = cr.SerialNumber - return name + return name, nil } // BasicConstraints CSR information RFC 5280, 4.2.1.9 @@ -367,8 +398,13 @@ func Generate(priv crypto.Signer, req *CertificateRequest) (csr []byte, err erro return nil, cferr.New(cferr.PrivateKeyError, cferr.Unavailable) } + subj, err := req.Name() + if err != nil { + return nil, err + } + var tpl = x509.CertificateRequest{ - Subject: req.Name(), + Subject: subj, SignatureAlgorithm: sigAlgo, } diff --git a/vendor/github.com/cloudflare/cfssl/helpers/derhelpers/ed25519.go b/vendor/github.com/cloudflare/cfssl/helpers/derhelpers/ed25519.go index 9220f3e5fa..eb669ce935 100644 --- a/vendor/github.com/cloudflare/cfssl/helpers/derhelpers/ed25519.go +++ b/vendor/github.com/cloudflare/cfssl/helpers/derhelpers/ed25519.go @@ -26,7 +26,7 @@ type subjectPublicKeyInfo struct { // MarshalEd25519PublicKey creates a DER-encoded SubjectPublicKeyInfo for an // ed25519 public key, as defined in -// https://tools.ietf.org/html/draft-ietf-curdle-pkix-04. This is analagous to +// https://tools.ietf.org/html/draft-ietf-curdle-pkix-04. This is analogous to // MarshalPKIXPublicKey in crypto/x509, which doesn't currently support Ed25519. func MarshalEd25519PublicKey(pk crypto.PublicKey) ([]byte, error) { pub, ok := pk.(ed25519.PublicKey) @@ -82,7 +82,7 @@ type oneAsymmetricKey struct { // oneAsymmetricKey. type curvePrivateKey []byte -// MarshalEd25519PrivateKey returns a DER encdoing of the input private key as +// MarshalEd25519PrivateKey returns a DER encoding of the input private key as // specified in https://tools.ietf.org/html/draft-ietf-curdle-pkix-04. func MarshalEd25519PrivateKey(sk crypto.PrivateKey) ([]byte, error) { priv, ok := sk.(ed25519.PrivateKey) diff --git a/vendor/github.com/cloudflare/cfssl/signer/local/local.go b/vendor/github.com/cloudflare/cfssl/signer/local/local.go index d0dbad18c6..848ff7c2e1 100644 --- a/vendor/github.com/cloudflare/cfssl/signer/local/local.go +++ b/vendor/github.com/cloudflare/cfssl/signer/local/local.go @@ -36,8 +36,8 @@ import ( "github.com/google/certificate-transparency-go/jsonclient" zx509 "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2" - "github.com/zmap/zlint/v2/lint" + "github.com/zmap/zlint/v3" + "github.com/zmap/zlint/v3/lint" "golang.org/x/net/context" ) diff --git a/vendor/github.com/cloudflare/cfssl/signer/signer.go b/vendor/github.com/cloudflare/cfssl/signer/signer.go index 7ce79d7571..6224cca975 100644 --- a/vendor/github.com/cloudflare/cfssl/signer/signer.go +++ b/vendor/github.com/cloudflare/cfssl/signer/signer.go @@ -172,6 +172,10 @@ func DefaultSigAlgo(priv crypto.Signer) x509.SignatureAlgorithm { } } +func isCommonAttr(t []int) bool { + return (len(t) == 4 && t[0] == 2 && t[1] == 5 && t[2] == 4 && (t[3] == 3 || (t[3] >= 5 && t[3] <= 11) || t[3] == 17)) +} + // ParseCertificateRequest takes an incoming certificate request and // builds a certificate template from it. func ParseCertificateRequest(s Signer, p *config.SigningProfile, csrBytes []byte) (template *x509.Certificate, err error) { @@ -181,6 +185,25 @@ func ParseCertificateRequest(s Signer, p *config.SigningProfile, csrBytes []byte return } + var r pkix.RDNSequence + _, err = asn1.Unmarshal(csrv.RawSubject, &r) + + if err != nil { + err = cferr.Wrap(cferr.CSRError, cferr.ParseFailed, err) + return + } + + var subject pkix.Name + subject.FillFromRDNSequence(&r) + + for _, v := range r { + for _, vv := range v { + if !isCommonAttr(vv.Type) { + subject.ExtraNames = append(subject.ExtraNames, vv) + } + } + } + err = csrv.CheckSignature() if err != nil { err = cferr.Wrap(cferr.CSRError, cferr.KeyMismatch, err) @@ -188,7 +211,7 @@ func ParseCertificateRequest(s Signer, p *config.SigningProfile, csrBytes []byte } template = &x509.Certificate{ - Subject: csrv.Subject, + Subject: subject, PublicKeyAlgorithm: csrv.PublicKeyAlgorithm, PublicKey: csrv.PublicKey, SignatureAlgorithm: s.SigAlgo(), diff --git a/vendor/github.com/pkg/browser/browser.go b/vendor/github.com/pkg/browser/browser.go index d92c4cd93c..d7969d74d8 100644 --- a/vendor/github.com/pkg/browser/browser.go +++ b/vendor/github.com/pkg/browser/browser.go @@ -30,7 +30,7 @@ func OpenFile(path string) error { // OpenReader consumes the contents of r and presents the // results in a new browser window. func OpenReader(r io.Reader) error { - f, err := ioutil.TempFile("", "browser") + f, err := ioutil.TempFile("", "browser.*.html") if err != nil { return fmt.Errorf("browser: could not create temporary file: %v", err) } @@ -41,12 +41,7 @@ func OpenReader(r io.Reader) error { if err := f.Close(); err != nil { return fmt.Errorf("browser: caching temporary file failed: %v", err) } - oldname := f.Name() - newname := oldname + ".html" - if err := os.Rename(oldname, newname); err != nil { - return fmt.Errorf("browser: renaming temporary file failed: %v", err) - } - return OpenFile(newname) + return OpenFile(f.Name()) } // OpenURL opens a new browser window pointing to url. diff --git a/vendor/github.com/pkg/browser/browser_windows.go b/vendor/github.com/pkg/browser/browser_windows.go index be2b8da399..63e192959a 100644 --- a/vendor/github.com/pkg/browser/browser_windows.go +++ b/vendor/github.com/pkg/browser/browser_windows.go @@ -1,9 +1,7 @@ -//go:generate mkwinsyscall -output zbrowser_windows.go browser_windows.go -//sys shellExecute(hwnd int, verb string, file string, args string, cwd string, showCmd int) (err error) = shell32.ShellExecuteW package browser -const sW_SHOWNORMAL = 1 +import "golang.org/x/sys/windows" func openBrowser(url string) error { - return shellExecute(0, "", url, "", "", sW_SHOWNORMAL) + return windows.ShellExecute(0, nil, windows.StringToUTF16Ptr(url), nil, nil, windows.SW_SHOWNORMAL) } diff --git a/vendor/github.com/pkg/browser/go.mod b/vendor/github.com/pkg/browser/go.mod index 39cdc0d962..f7698977c1 100644 --- a/vendor/github.com/pkg/browser/go.mod +++ b/vendor/github.com/pkg/browser/go.mod @@ -2,4 +2,4 @@ module github.com/pkg/browser go 1.14 -require golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d // indirect +require golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71 diff --git a/vendor/github.com/pkg/browser/go.sum b/vendor/github.com/pkg/browser/go.sum new file mode 100644 index 0000000000..b45931558a --- /dev/null +++ b/vendor/github.com/pkg/browser/go.sum @@ -0,0 +1,2 @@ +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71 h1:X/2sJAybVknnUnV7AD2HdT6rm2p5BP6eH2j+igduWgk= +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/vendor/github.com/pkg/browser/zbrowser_windows.go b/vendor/github.com/pkg/browser/zbrowser_windows.go deleted file mode 100644 index 4b2d9eb562..0000000000 --- a/vendor/github.com/pkg/browser/zbrowser_windows.go +++ /dev/null @@ -1,76 +0,0 @@ -// Code generated by 'go generate'; DO NOT EDIT. - -package browser - -import ( - "syscall" - "unsafe" - - "golang.org/x/sys/windows" -) - -var _ unsafe.Pointer - -// Do the interface allocations only once for common -// Errno values. -const ( - errnoERROR_IO_PENDING = 997 -) - -var ( - errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING) - errERROR_EINVAL error = syscall.EINVAL -) - -// errnoErr returns common boxed Errno values, to prevent -// allocations at runtime. -func errnoErr(e syscall.Errno) error { - switch e { - case 0: - return errERROR_EINVAL - case errnoERROR_IO_PENDING: - return errERROR_IO_PENDING - } - // TODO: add more here, after collecting data on the common - // error values see on Windows. (perhaps when running - // all.bat?) - return e -} - -var ( - modshell32 = windows.NewLazySystemDLL("shell32.dll") - - procShellExecuteW = modshell32.NewProc("ShellExecuteW") -) - -func shellExecute(hwnd int, verb string, file string, args string, cwd string, showCmd int) (err error) { - var _p0 *uint16 - _p0, err = syscall.UTF16PtrFromString(verb) - if err != nil { - return - } - var _p1 *uint16 - _p1, err = syscall.UTF16PtrFromString(file) - if err != nil { - return - } - var _p2 *uint16 - _p2, err = syscall.UTF16PtrFromString(args) - if err != nil { - return - } - var _p3 *uint16 - _p3, err = syscall.UTF16PtrFromString(cwd) - if err != nil { - return - } - return _shellExecute(hwnd, _p0, _p1, _p2, _p3, showCmd) -} - -func _shellExecute(hwnd int, verb *uint16, file *uint16, args *uint16, cwd *uint16, showCmd int) (err error) { - r1, _, e1 := syscall.Syscall6(procShellExecuteW.Addr(), 6, uintptr(hwnd), uintptr(unsafe.Pointer(verb)), uintptr(unsafe.Pointer(file)), uintptr(unsafe.Pointer(args)), uintptr(unsafe.Pointer(cwd)), uintptr(showCmd)) - if r1 == 0 { - err = errnoErr(e1) - } - return -} diff --git a/vendor/github.com/zmap/zlint/v2/go.mod b/vendor/github.com/zmap/zlint/v2/go.mod deleted file mode 100644 index e7c6be8903..0000000000 --- a/vendor/github.com/zmap/zlint/v2/go.mod +++ /dev/null @@ -1,12 +0,0 @@ -module github.com/zmap/zlint/v2 - -require ( - github.com/sirupsen/logrus v1.3.0 - github.com/weppos/publicsuffix-go v0.4.0 - github.com/zmap/zcrypto v0.0.0-20200513165325-16679db567ff - golang.org/x/crypto v0.0.0-20200124225646-8b5121be2f68 - golang.org/x/net v0.0.0-20190620200207-3b0461eec859 - golang.org/x/text v0.3.3 -) - -go 1.14 diff --git a/vendor/github.com/zmap/zlint/v2/.goreleaser.yml b/vendor/github.com/zmap/zlint/v3/.goreleaser.yml similarity index 100% rename from vendor/github.com/zmap/zlint/v2/.goreleaser.yml rename to vendor/github.com/zmap/zlint/v3/.goreleaser.yml diff --git a/vendor/github.com/zmap/zlint/v2/LICENSE b/vendor/github.com/zmap/zlint/v3/LICENSE similarity index 100% rename from vendor/github.com/zmap/zlint/v2/LICENSE rename to vendor/github.com/zmap/zlint/v3/LICENSE diff --git a/vendor/github.com/zmap/zlint/v3/go.mod b/vendor/github.com/zmap/zlint/v3/go.mod new file mode 100644 index 0000000000..ccc1c58c1e --- /dev/null +++ b/vendor/github.com/zmap/zlint/v3/go.mod @@ -0,0 +1,13 @@ +module github.com/zmap/zlint/v3 + +require ( + github.com/sirupsen/logrus v1.7.0 + github.com/weppos/publicsuffix-go v0.13.0 + github.com/zmap/zcrypto v0.0.0-20201128221613-3719af1573cf + golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 + golang.org/x/net v0.0.0-20201110031124-69a78807bb2b + golang.org/x/sys v0.0.0-20201126233918-771906719818 // indirect + golang.org/x/text v0.3.4 +) + +go 1.15 diff --git a/vendor/github.com/zmap/zlint/v2/go.sum b/vendor/github.com/zmap/zlint/v3/go.sum similarity index 62% rename from vendor/github.com/zmap/zlint/v2/go.sum rename to vendor/github.com/zmap/zlint/v3/go.sum index 222809c608..49043cd39e 100644 --- a/vendor/github.com/zmap/zlint/v2/go.sum +++ b/vendor/github.com/zmap/zlint/v3/go.sum @@ -8,48 +8,58 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474 h1:oKIteTqeSpenyTrOVj5zkiyCaflLa8B+CD0324otT+o= github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/weppos/publicsuffix-go v0.4.0 h1:YSnfg3V65LcCFKtIGKGoBhkyKolEd0hlipcXaOjdnQw= -github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= +github.com/weppos/publicsuffix-go v0.13.0 h1:0Tu1uzLBd1jPn4k6OnMmOPZH/l/9bj9kUOMMkoRs6Gg= +github.com/weppos/publicsuffix-go v0.13.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= +github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521 h1:kKCF7VX/wTmdg2ZjEaqlq99Bjsoiz7vH6sFniF/vI4M= github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= +github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4 h1:17HHAgFKlLcZsDOjBOUrd5hDihb1ggf+1a5dTbkgkIY= github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is= -github.com/zmap/zcrypto v0.0.0-20191112190257-7f2fe6faf8cf h1:Q9MiSA+G9DHe/TzG8pnycDn3HwpQuTygphu9M/7KYqU= -github.com/zmap/zcrypto v0.0.0-20191112190257-7f2fe6faf8cf/go.mod h1:w7kd3qXHh8FNaczNjslXqvFQiv5mMWRXlL9klTUAHc8= -github.com/zmap/zcrypto v0.0.0-20200513165325-16679db567ff h1:0DDYlvtXPb8EMtQPZ2TJDcM+adqtzy77QOndkCW79JQ= -github.com/zmap/zcrypto v0.0.0-20200513165325-16679db567ff/go.mod h1:TxpejqcVKQjQaVVmMGfzx5HnmFMdIU+vLtaCyPBfGI4= +github.com/zmap/zcrypto v0.0.0-20201128221613-3719af1573cf h1:LEJcSlvjRUl6T7E0+mvKFxS61NsP1Z/+5jvHr4JQVVU= +github.com/zmap/zcrypto v0.0.0-20201128221613-3719af1573cf/go.mod h1:aPM7r+JOkfL+9qSB4KbYjtoEzJqUK50EXkkJabeNJDQ= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200124225646-8b5121be2f68 h1:WPLCzSEbawp58wezcvLvLnvhiDJAai54ESbc41NdXS0= -golang.org/x/crypto v0.0.0-20200124225646-8b5121be2f68/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 h1:xYJJ3S178yv++9zXV/hnr29plCAGO9vAFG9dorqaFQc= +golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr3jl5bifgsfj90XAF9c= +golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/zmap/zlint/v2/lint/base.go b/vendor/github.com/zmap/zlint/v3/lint/base.go similarity index 99% rename from vendor/github.com/zmap/zlint/v2/lint/base.go rename to vendor/github.com/zmap/zlint/v3/lint/base.go index 7224eaf0fb..4842bdc309 100644 --- a/vendor/github.com/zmap/zlint/v2/lint/base.go +++ b/vendor/github.com/zmap/zlint/v3/lint/base.go @@ -18,7 +18,7 @@ import ( "time" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/util" ) // LintInterface is implemented by each Lint. diff --git a/vendor/github.com/zmap/zlint/v2/lint/registration.go b/vendor/github.com/zmap/zlint/v3/lint/registration.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/lint/registration.go rename to vendor/github.com/zmap/zlint/v3/lint/registration.go diff --git a/vendor/github.com/zmap/zlint/v2/lint/result.go b/vendor/github.com/zmap/zlint/v3/lint/result.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/lint/result.go rename to vendor/github.com/zmap/zlint/v3/lint/result.go diff --git a/vendor/github.com/zmap/zlint/v2/lint/source.go b/vendor/github.com/zmap/zlint/v3/lint/source.go similarity index 91% rename from vendor/github.com/zmap/zlint/v2/lint/source.go rename to vendor/github.com/zmap/zlint/v3/lint/source.go index 28834da9ec..425bcacbc6 100644 --- a/vendor/github.com/zmap/zlint/v2/lint/source.go +++ b/vendor/github.com/zmap/zlint/v3/lint/source.go @@ -32,9 +32,8 @@ const ( CABFBaselineRequirements LintSource = "CABF_BR" CABFEVGuidelines LintSource = "CABF_EV" MozillaRootStorePolicy LintSource = "Mozilla" - AppleCTPolicy LintSource = "Apple" - ZLint LintSource = "ZLint" - AWSLabs LintSource = "AWSLabs" + AppleRootStorePolicy LintSource = "Apple" + Community LintSource = "Community" EtsiEsi LintSource = "ETSI_ESI" ) @@ -47,7 +46,7 @@ func (s *LintSource) UnmarshalJSON(data []byte) error { } switch LintSource(throwAway) { - case RFC5280, RFC5480, RFC5891, CABFBaselineRequirements, CABFEVGuidelines, MozillaRootStorePolicy, AppleCTPolicy, ZLint, AWSLabs, EtsiEsi: + case RFC5280, RFC5480, RFC5891, CABFBaselineRequirements, CABFEVGuidelines, MozillaRootStorePolicy, AppleRootStorePolicy, Community, EtsiEsi: *s = LintSource(throwAway) return nil default: @@ -77,12 +76,10 @@ func (s *LintSource) FromString(src string) { *s = CABFEVGuidelines case MozillaRootStorePolicy: *s = MozillaRootStorePolicy - case AppleCTPolicy: - *s = AppleCTPolicy - case ZLint: - *s = ZLint - case AWSLabs: - *s = AWSLabs + case AppleRootStorePolicy: + *s = AppleRootStorePolicy + case Community: + *s = Community case EtsiEsi: *s = EtsiEsi } diff --git a/vendor/github.com/zmap/zlint/v2/lints/apple/lint_ct_sct_policy_count_unsatisfied.go b/vendor/github.com/zmap/zlint/v3/lints/apple/lint_ct_sct_policy_count_unsatisfied.go similarity index 98% rename from vendor/github.com/zmap/zlint/v2/lints/apple/lint_ct_sct_policy_count_unsatisfied.go rename to vendor/github.com/zmap/zlint/v3/lints/apple/lint_ct_sct_policy_count_unsatisfied.go index df9fbfd8b6..9cc4345117 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/apple/lint_ct_sct_policy_count_unsatisfied.go +++ b/vendor/github.com/zmap/zlint/v3/lints/apple/lint_ct_sct_policy_count_unsatisfied.go @@ -20,8 +20,8 @@ import ( "github.com/zmap/zcrypto/x509" "github.com/zmap/zcrypto/x509/ct" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type sctPolicyCount struct{} @@ -150,7 +150,7 @@ func init() { Name: "w_ct_sct_policy_count_unsatisfied", Description: "Check if certificate has enough embedded SCTs to meet Apple CT Policy", Citation: "https://support.apple.com/en-us/HT205280", - Source: lint.AppleCTPolicy, + Source: lint.AppleRootStorePolicy, EffectiveDate: util.AppleCTPolicyDate, Lint: &sctPolicyCount{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/apple/lint_e_server_cert_valid_time_longer_than_398_days.go b/vendor/github.com/zmap/zlint/v3/lints/apple/lint_e_server_cert_valid_time_longer_than_398_days.go similarity index 61% rename from vendor/github.com/zmap/zlint/v2/lints/apple/lint_e_server_cert_valid_time_longer_than_398_days.go rename to vendor/github.com/zmap/zlint/v3/lints/apple/lint_e_server_cert_valid_time_longer_than_398_days.go index 166321e36c..cf4e8eda4d 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/apple/lint_e_server_cert_valid_time_longer_than_398_days.go +++ b/vendor/github.com/zmap/zlint/v3/lints/apple/lint_e_server_cert_valid_time_longer_than_398_days.go @@ -18,8 +18,8 @@ import ( "time" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type serverCertValidityTooLong struct{} @@ -33,14 +33,9 @@ func (l *serverCertValidityTooLong) CheckApplies(c *x509.Certificate) bool { } func (l *serverCertValidityTooLong) Execute(c *x509.Certificate) *lint.LintResult { - // "398 days is measured with a day being equal to 86,400 seconds. Any time - // greater than this indicates an additional day of validity." - dayLength := 86400 * time.Second // "TLS server certificates issued on or after September 1, 2020 00:00 GMT/UTC // must not have a validity period greater than 398 days." - maxValidity := 398 * dayLength - // "We recommend that certificates be issued with a maximum validity of 397 days." - warnValidity := 397 * dayLength + maxValidity := 398 * appleDayLength // RFC 5280, section 4.1.2.5: "The validity period for a certificate is the period // of time from notBefore through notAfter, inclusive." @@ -48,15 +43,6 @@ func (l *serverCertValidityTooLong) Execute(c *x509.Certificate) *lint.LintResul if certValidity > maxValidity { return &lint.LintResult{Status: lint.Error} - } else if certValidity > warnValidity { - return &lint.LintResult{ - // RFC 2119 has SHOULD and RECOMMENDED as equal. Since Apple recommends - // 397 days we treat this as a lint.Warn result as a violation of - // a SHOULD. - Status: lint.Warn, - Details: "Apple recommends that certificates be issued with a maximum " + - "validity of 397 days.", - } } return &lint.LintResult{Status: lint.Pass} @@ -67,12 +53,8 @@ func init() { Name: "e_tls_server_cert_valid_time_longer_than_398_days", Description: "TLS server certificates issued on or after September 1, 2020 " + "00:00 GMT/UTC must not have a validity period greater than 398 days", - Citation: "https://support.apple.com/en-us/HT211025", - // TODO(@cpu): The Source should be `lint.ApplePolicy` or something similar. - // The "CT" bit is too specific. Unfortunately since the constant is - // exported by the `util` package we can't change it without bumping the - // major version. See https://github.com/zmap/zlint/issues/418 - Source: lint.AppleCTPolicy, + Citation: "https://support.apple.com/en-us/HT211025", + Source: lint.AppleRootStorePolicy, EffectiveDate: util.AppleReducedLifetimeDate, Lint: &serverCertValidityTooLong{}, }) diff --git a/vendor/github.com/zmap/zlint/v3/lints/apple/lint_w_server_cert_valid_time_longer_than_397_days.go b/vendor/github.com/zmap/zlint/v3/lints/apple/lint_w_server_cert_valid_time_longer_than_397_days.go new file mode 100644 index 0000000000..b091649172 --- /dev/null +++ b/vendor/github.com/zmap/zlint/v3/lints/apple/lint_w_server_cert_valid_time_longer_than_397_days.go @@ -0,0 +1,67 @@ +/* + * ZLint Copyright 2020 Regents of the University of Michigan + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy + * of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package apple + +import ( + "time" + + "github.com/zmap/zcrypto/x509" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" +) + +type serverCertValidityAlmostTooLong struct{} + +func (l *serverCertValidityAlmostTooLong) Initialize() error { + return nil +} + +func (l *serverCertValidityAlmostTooLong) CheckApplies(c *x509.Certificate) bool { + return util.IsServerAuthCert(c) && !c.IsCA +} + +func (l *serverCertValidityAlmostTooLong) Execute(c *x509.Certificate) *lint.LintResult { + // "We recommend that certificates be issued with a maximum validity of 397 days." + warnValidity := 397 * appleDayLength + + // RFC 5280, section 4.1.2.5: "The validity period for a certificate is the period + // of time from notBefore through notAfter, inclusive." + certValidity := c.NotAfter.Add(1 * time.Second).Sub(c.NotBefore) + + if certValidity > warnValidity { + return &lint.LintResult{ + // RFC 2119 has SHOULD and RECOMMENDED as equal. Since Apple recommends + // 397 days we treat this as a lint.Warn result as a violation of + // a SHOULD. + Status: lint.Warn, + Details: "Apple recommends that certificates be issued with a maximum " + + "validity of 397 days.", + } + } + + return &lint.LintResult{Status: lint.Pass} +} + +func init() { + lint.RegisterLint(&lint.Lint{ + Name: "w_tls_server_cert_valid_time_longer_than_397_days", + Description: "TLS server certificates issued on or after September 1, 2020 " + + "00:00 GMT/UTC should not have a validity period greater than 397 days", + Citation: "https://support.apple.com/en-us/HT211025", + Source: lint.AppleRootStorePolicy, + EffectiveDate: util.AppleReducedLifetimeDate, + Lint: &serverCertValidityAlmostTooLong{}, + }) +} diff --git a/vendor/github.com/zmap/zlint/v3/lints/apple/time.go b/vendor/github.com/zmap/zlint/v3/lints/apple/time.go new file mode 100644 index 0000000000..cd56e87903 --- /dev/null +++ b/vendor/github.com/zmap/zlint/v3/lints/apple/time.go @@ -0,0 +1,13 @@ +package apple + +import "time" + +// In the context of a root policy update on trusted certificate lifetimes[0] +// Apple provided an unambiguous definition for the length of a day: +// "398 days is measured with a day being equal to 86,400 seconds. Any time +// greater than this indicates an additional day of validity." +// +// We provide that value as a constant here for lints to use. +// +// [0]: https://support.apple.com/en-us/HT211025 +var appleDayLength = 86400 * time.Second diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_common_name_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_common_name_missing.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_common_name_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_common_name_missing.go index b60352c8e4..51a319c6eb 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_common_name_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_common_name_missing.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type caCommonNameMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_country_name_invalid.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_country_name_invalid.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_country_name_invalid.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_country_name_invalid.go index d3d9bc81e8..a88e6a0b75 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_country_name_invalid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_country_name_invalid.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) /************************************************ diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_country_name_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_country_name_missing.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_country_name_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_country_name_missing.go index 533de82a9f..d883c8f152 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_country_name_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_country_name_missing.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) /************************************************ diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_crl_sign_not_set.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_crl_sign_not_set.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_crl_sign_not_set.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_crl_sign_not_set.go index 1627f938d5..62688592d7 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_crl_sign_not_set.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_crl_sign_not_set.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) /************************************************ diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_digital_signature_not_set.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_digital_signature_not_set.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_digital_signature_not_set.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_digital_signature_not_set.go index 62b43ed0af..4e4a5ef977 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_digital_signature_not_set.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_digital_signature_not_set.go @@ -26,8 +26,8 @@ If the Root CA Private Key is used for signing OCSP responses, then the digitalS import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type caDigSignNotSet struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_is_ca.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_is_ca.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_is_ca.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_is_ca.go index 3bc6b0929e..2eeeb6b9da 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_is_ca.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_is_ca.go @@ -18,8 +18,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type caIsCA struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_key_cert_sign_not_set.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_key_cert_sign_not_set.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_key_cert_sign_not_set.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_key_cert_sign_not_set.go index 1fa55a77e7..048fae27ff 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_key_cert_sign_not_set.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_key_cert_sign_not_set.go @@ -22,8 +22,8 @@ If the Root CA Private Key is used for signing OCSP responses, then the digitalS import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type caKeyCertSignNotSet struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_key_usage_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_key_usage_missing.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_key_usage_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_key_usage_missing.go index a06ee9b51a..e4ad62552e 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_key_usage_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_key_usage_missing.go @@ -24,8 +24,8 @@ Conforming CAs MUST include this extension in certificates that import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type caKeyUsageMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_key_usage_not_critical.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_key_usage_not_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_key_usage_not_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_key_usage_not_critical.go index 51cddfe993..cd714beeee 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_key_usage_not_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_key_usage_not_critical.go @@ -22,8 +22,8 @@ If the Root CA Private Key is used for signing OCSP responses, then the digitalS import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type caKeyUsageNotCrit struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_organization_name_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_organization_name_missing.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_organization_name_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_organization_name_missing.go index 7fe8fd9518..8728ff65ad 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ca_organization_name_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ca_organization_name_missing.go @@ -21,8 +21,8 @@ The Certificate Subject MUST contain the following: organizationName (OID 2.5.4. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type caOrganizationNameMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_locality.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_locality.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_locality.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_locality.go index 01070614df..421c585d2d 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_locality.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_locality.go @@ -19,8 +19,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type certPolicyConflictsWithLocality struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_org.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_org.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_org.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_org.go index 96a0cde11b..141280aefc 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_org.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_org.go @@ -19,8 +19,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type certPolicyConflictsWithOrg struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_postal.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_postal.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_postal.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_postal.go index 5bef5ca198..554e702376 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_postal.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_postal.go @@ -19,8 +19,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type certPolicyConflictsWithPostal struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_province.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_province.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_province.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_province.go index b32d3a82f9..e611297002 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_province.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_province.go @@ -19,8 +19,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type certPolicyConflictsWithProvince struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_street.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_street.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_street.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_street.go index 15dcc0f5e6..59de7b1782 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_dv_conflicts_with_street.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_dv_conflicts_with_street.go @@ -19,8 +19,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type certPolicyConflictsWithStreet struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_iv_requires_personal_name.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_iv_requires_personal_name.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_iv_requires_personal_name.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_iv_requires_personal_name.go index 826864d515..f45c7c0286 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_iv_requires_personal_name.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_iv_requires_personal_name.go @@ -18,8 +18,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type CertPolicyRequiresPersonalName struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_ov_requires_org.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_ov_requires_org.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_ov_requires_org.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_ov_requires_org.go index a573a1751f..0d6f25fbf3 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cab_ov_requires_org.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cab_ov_requires_org.go @@ -18,8 +18,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type CertPolicyRequiresOrg struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_iv_requires_country.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_iv_requires_country.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_iv_requires_country.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_iv_requires_country.go index 07d742b293..82c245666a 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_iv_requires_country.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_iv_requires_country.go @@ -18,8 +18,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type CertPolicyIVRequiresCountry struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_iv_requires_province_or_locality.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_iv_requires_province_or_locality.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_iv_requires_province_or_locality.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_iv_requires_province_or_locality.go index b669a30c0d..42716bafdb 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_iv_requires_province_or_locality.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_iv_requires_province_or_locality.go @@ -19,8 +19,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type CertPolicyIVRequiresProvinceOrLocal struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_ov_requires_country.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_ov_requires_country.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_ov_requires_country.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_ov_requires_country.go index e9296f5ffe..7ef3a947ca 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_ov_requires_country.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_ov_requires_country.go @@ -18,8 +18,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type CertPolicyOVRequiresCountry struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_ov_requires_province_or_locality.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_ov_requires_province_or_locality.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_ov_requires_province_or_locality.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_ov_requires_province_or_locality.go index f61aeb652e..9de30eccf9 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_cert_policy_ov_requires_province_or_locality.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_cert_policy_ov_requires_province_or_locality.go @@ -19,8 +19,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type CertPolicyOVRequiresProvinceOrLocal struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dh_params_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dh_params_missing.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dh_params_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dh_params_missing.go index 16072eb446..865bd1b764 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dh_params_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dh_params_missing.go @@ -18,8 +18,8 @@ import ( "crypto/dsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type dsaParamsMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_bad_character_in_label.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_bad_character_in_label.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_bad_character_in_label.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_bad_character_in_label.go index 053255d8f6..d5e4409245 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_bad_character_in_label.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_bad_character_in_label.go @@ -18,8 +18,8 @@ import ( "regexp" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type DNSNameProperCharacters struct { diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_check_left_label_wildcard.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_check_left_label_wildcard.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_check_left_label_wildcard.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_check_left_label_wildcard.go index 41c014a38c..4b4de395b3 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_check_left_label_wildcard.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_check_left_label_wildcard.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type DNSNameLeftLabelWildcardCheck struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_contains_bare_iana_suffix.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_contains_bare_iana_suffix.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_contains_bare_iana_suffix.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_contains_bare_iana_suffix.go index 1d320e6bec..2322b254ff 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_contains_bare_iana_suffix.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_contains_bare_iana_suffix.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type dnsNameContainsBareIANASuffix struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_contains_empty_label.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_contains_empty_label.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_contains_empty_label.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_contains_empty_label.go index 7a4db420b0..9232b78a3b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_contains_empty_label.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_contains_empty_label.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type DNSNameEmptyLabel struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_hyphen_in_sld.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_hyphen_in_sld.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_hyphen_in_sld.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_hyphen_in_sld.go index aecb9a0ada..4897341ee0 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_hyphen_in_sld.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_hyphen_in_sld.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type DNSNameHyphenInSLD struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_label_too_long.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_label_too_long.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_label_too_long.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_label_too_long.go index 78fafbf689..5688a75521 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_label_too_long.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_label_too_long.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type DNSNameLabelLengthTooLong struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_right_label_valid_tld.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_right_label_valid_tld.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_right_label_valid_tld.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_right_label_valid_tld.go index b2e211364b..f939d44604 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_right_label_valid_tld.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_right_label_valid_tld.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type DNSNameValidTLD struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_underscore_in_sld.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_underscore_in_sld.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_underscore_in_sld.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_underscore_in_sld.go index 92337b6a3e..5f0d7c0f77 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_underscore_in_sld.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_underscore_in_sld.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type DNSNameUnderscoreInSLD struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_underscore_in_trd.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_underscore_in_trd.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_underscore_in_trd.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_underscore_in_trd.go index 0b7ecd602b..703d267dfa 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_underscore_in_trd.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_underscore_in_trd.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type DNSNameUnderscoreInTRD struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_wildcard_left_of_public_suffix.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_wildcard_left_of_public_suffix.go similarity index 90% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_wildcard_left_of_public_suffix.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_wildcard_left_of_public_suffix.go index f3a3151cd0..728963e980 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_wildcard_left_of_public_suffix.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_wildcard_left_of_public_suffix.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type DNSNameWildcardLeftofPublicSuffix struct{} @@ -38,7 +38,7 @@ func (l *DNSNameWildcardLeftofPublicSuffix) Execute(c *x509.Certificate) *lint.L } if domainInfo.ParsedDomain.SLD == "*" { - return &lint.LintResult{Status: lint.Warn} + return &lint.LintResult{Status: lint.Notice} } } @@ -49,7 +49,7 @@ func (l *DNSNameWildcardLeftofPublicSuffix) Execute(c *x509.Certificate) *lint.L } if parsedSANDNSNames[i].ParsedDomain.SLD == "*" { - return &lint.LintResult{Status: lint.Warn} + return &lint.LintResult{Status: lint.Notice} } } return &lint.LintResult{Status: lint.Pass} @@ -57,7 +57,7 @@ func (l *DNSNameWildcardLeftofPublicSuffix) Execute(c *x509.Certificate) *lint.L func init() { lint.RegisterLint(&lint.Lint{ - Name: "w_dnsname_wildcard_left_of_public_suffix", + Name: "n_dnsname_wildcard_left_of_public_suffix", Description: "the CA MUST establish and follow a documented procedure[^pubsuffix] that determines if the wildcard character occurs in the first label position to the left of a “registry‐controlled” label or “public suffix”", Citation: "BRs: 3.2.2.6", Source: lint.CABFBaselineRequirements, diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_wildcard_only_in_left_label.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_wildcard_only_in_left_label.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_wildcard_only_in_left_label.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_wildcard_only_in_left_label.go index 8a72b0ef02..bec327de60 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dnsname_wildcard_only_in_left_label.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dnsname_wildcard_only_in_left_label.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type DNSNameWildcardOnlyInLeftlabel struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_correct_order_in_subgroup.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_correct_order_in_subgroup.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_correct_order_in_subgroup.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_correct_order_in_subgroup.go index 20690250d0..88caee28cf 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_correct_order_in_subgroup.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_correct_order_in_subgroup.go @@ -19,8 +19,8 @@ import ( "math/big" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type dsaSubgroup struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_improper_modulus_or_divisor_size.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_improper_modulus_or_divisor_size.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_improper_modulus_or_divisor_size.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_improper_modulus_or_divisor_size.go index e964bf28d1..d47ca30ce1 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_improper_modulus_or_divisor_size.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_improper_modulus_or_divisor_size.go @@ -18,8 +18,8 @@ import ( "crypto/dsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type dsaImproperSize struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_shorter_than_2048_bits.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_shorter_than_2048_bits.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_shorter_than_2048_bits.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_shorter_than_2048_bits.go index 8284b45eab..de47d8f299 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_shorter_than_2048_bits.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_shorter_than_2048_bits.go @@ -18,8 +18,8 @@ import ( "crypto/dsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type dsaTooShort struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_unique_correct_representation.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_unique_correct_representation.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_unique_correct_representation.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_unique_correct_representation.go index 7ea60092ee..543cb39fa5 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_dsa_unique_correct_representation.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_dsa_unique_correct_representation.go @@ -19,8 +19,8 @@ import ( "math/big" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type dsaUniqueCorrectRepresentation struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ec_improper_curves.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ec_improper_curves.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ec_improper_curves.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ec_improper_curves.go index 985db91c9b..dc6910aba5 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ec_improper_curves.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ec_improper_curves.go @@ -24,8 +24,8 @@ import ( "crypto/ecdsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ecImproperCurves struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_nc_intersects_reserved_ip.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_nc_intersects_reserved_ip.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_nc_intersects_reserved_ip.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_nc_intersects_reserved_ip.go index c13b95db1c..39bed9288e 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_nc_intersects_reserved_ip.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_nc_intersects_reserved_ip.go @@ -27,8 +27,8 @@ Subject commonName field containing a Reserved IP Address or Internal Name. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type NCReservedIPNet struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_contains_reserved_ip.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_contains_reserved_ip.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_contains_reserved_ip.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_contains_reserved_ip.go index 46b8f148b5..71e98f80fc 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_contains_reserved_ip.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_contains_reserved_ip.go @@ -25,8 +25,8 @@ Address or Internal Name. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANReservedIP struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_critical_with_subject_dn.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_critical_with_subject_dn.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_critical_with_subject_dn.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_critical_with_subject_dn.go index 5f0522fabb..47ec95eb70 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_critical_with_subject_dn.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_critical_with_subject_dn.go @@ -27,8 +27,8 @@ Further, if the only subject identity included in the certificate is an import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ExtSANCriticalWithSubjectDN struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_directory_name_present.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_directory_name_present.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_directory_name_present.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_directory_name_present.go index 8662a3af93..dece470a3a 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_directory_name_present.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_directory_name_present.go @@ -27,8 +27,8 @@ Wildcard FQDNs are permitted. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANDirName struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_edi_party_name_present.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_edi_party_name_present.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_edi_party_name_present.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_edi_party_name_present.go index 1cce293ed0..a9e2236e4b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_edi_party_name_present.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_edi_party_name_present.go @@ -27,8 +27,8 @@ Wildcard FQDNs are permitted. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANEDI struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_missing.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_missing.go index af8fbb8497..5df0018d78 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_missing.go @@ -23,8 +23,8 @@ Required/Optional: Required import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_other_name_present.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_other_name_present.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_other_name_present.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_other_name_present.go index 255cc9886e..e91f4ce6d5 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_other_name_present.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_other_name_present.go @@ -27,8 +27,8 @@ Wildcard FQDNs are permitted. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANOtherName struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_registered_id_present.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_registered_id_present.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_registered_id_present.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_registered_id_present.go index fd2467cd7a..969306d519 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_registered_id_present.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_registered_id_present.go @@ -27,8 +27,8 @@ Wildcard FQDNs are permitted. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANRegId struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_rfc822_name_present.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_rfc822_name_present.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_rfc822_name_present.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_rfc822_name_present.go index c2f76ef691..64588b5365 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_rfc822_name_present.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_rfc822_name_present.go @@ -27,8 +27,8 @@ Wildcard FQDNs are permitted. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANRfc822 struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_uniform_resource_identifier_present.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_uniform_resource_identifier_present.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_uniform_resource_identifier_present.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_uniform_resource_identifier_present.go index 50e6a54bc6..53a63ea1f2 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_san_uniform_resource_identifier_present.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_san_uniform_resource_identifier_present.go @@ -27,8 +27,8 @@ Wildcard FQDNs are permitted. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANURI struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_tor_service_descriptor_hash_invalid.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_tor_service_descriptor_hash_invalid.go similarity index 99% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_tor_service_descriptor_hash_invalid.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_tor_service_descriptor_hash_invalid.go index ae11908cca..8bc76b006d 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_ext_tor_service_descriptor_hash_invalid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_ext_tor_service_descriptor_hash_invalid.go @@ -20,8 +20,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type torServiceDescHashInvalid struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_extra_subject_common_names.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_extra_subject_common_names.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_extra_subject_common_names.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_extra_subject_common_names.go index a827e21729..5e57070043 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_extra_subject_common_names.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_extra_subject_common_names.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type extraSubjectCommonNames struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_invalid_certificate_version.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_invalid_certificate_version.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_invalid_certificate_version.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_invalid_certificate_version.go index c190e56787..cad09d62f6 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_invalid_certificate_version.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_invalid_certificate_version.go @@ -20,8 +20,8 @@ Certificates MUST be of type X.509 v3. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type InvalidCertificateVersion struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_old_root_ca_rsa_mod_less_than_2048_bits.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_old_root_ca_rsa_mod_less_than_2048_bits.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_old_root_ca_rsa_mod_less_than_2048_bits.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_old_root_ca_rsa_mod_less_than_2048_bits.go index 222c973505..9ee87343d4 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_old_root_ca_rsa_mod_less_than_2048_bits.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_old_root_ca_rsa_mod_less_than_2048_bits.go @@ -18,8 +18,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rootCaModSize struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_old_sub_ca_rsa_mod_less_than_1024_bits.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_old_sub_ca_rsa_mod_less_than_1024_bits.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_old_sub_ca_rsa_mod_less_than_1024_bits.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_old_sub_ca_rsa_mod_less_than_1024_bits.go index 882299916c..d315dd18ee 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_old_sub_ca_rsa_mod_less_than_1024_bits.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_old_sub_ca_rsa_mod_less_than_1024_bits.go @@ -20,8 +20,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCaModSize struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_old_sub_cert_rsa_mod_less_than_1024_bits.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_old_sub_cert_rsa_mod_less_than_1024_bits.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_old_sub_cert_rsa_mod_less_than_1024_bits.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_old_sub_cert_rsa_mod_less_than_1024_bits.go index f3cf306e9a..89fd36bf68 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_old_sub_cert_rsa_mod_less_than_1024_bits.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_old_sub_cert_rsa_mod_less_than_1024_bits.go @@ -18,8 +18,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subModSize struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_public_key_type_not_allowed.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_public_key_type_not_allowed.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_public_key_type_not_allowed.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_public_key_type_not_allowed.go index ebc29a5618..ef263bfc17 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_public_key_type_not_allowed.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_public_key_type_not_allowed.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type publicKeyAllowed struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_basic_constraints_path_len_constraint_field_present.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_basic_constraints_path_len_constraint_field_present.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_basic_constraints_path_len_constraint_field_present.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_basic_constraints_path_len_constraint_field_present.go index 6c46d36e29..b8e98e4719 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_basic_constraints_path_len_constraint_field_present.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_basic_constraints_path_len_constraint_field_present.go @@ -24,8 +24,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rootCaPathLenPresent struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_contains_cert_policy.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_contains_cert_policy.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_contains_cert_policy.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_contains_cert_policy.go index 91994f9ebd..92602c1291 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_contains_cert_policy.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_contains_cert_policy.go @@ -21,8 +21,8 @@ This extension SHOULD NOT be present. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rootCAContainsCertPolicy struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_extended_key_usage_present.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_extended_key_usage_present.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_extended_key_usage_present.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_extended_key_usage_present.go index d9c1925a63..693d2c4417 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_extended_key_usage_present.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_extended_key_usage_present.go @@ -21,8 +21,8 @@ This extension MUST NOT be present. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rootCAContainsEKU struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_key_usage_must_be_critical.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_key_usage_must_be_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_key_usage_must_be_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_key_usage_must_be_critical.go index 91329ce5b5..3756855cde 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_key_usage_must_be_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_key_usage_must_be_critical.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rootCAKeyUsageMustBeCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_key_usage_present.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_key_usage_present.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_key_usage_present.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_key_usage_present.go index cbd7aba4e3..3f43b3a538 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_root_ca_key_usage_present.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_root_ca_key_usage_present.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rootCAKeyUsagePresent struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_mod_factors_smaller_than_752_bits.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_mod_factors_smaller_than_752_bits.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_mod_factors_smaller_than_752_bits.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_mod_factors_smaller_than_752_bits.go index e851d59f94..84c7f65986 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_mod_factors_smaller_than_752_bits.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_mod_factors_smaller_than_752_bits.go @@ -23,8 +23,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rsaModSmallFactor struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_mod_less_than_2048_bits.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_mod_less_than_2048_bits.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_mod_less_than_2048_bits.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_mod_less_than_2048_bits.go index d7eaef41db..8716cc49fe 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_mod_less_than_2048_bits.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_mod_less_than_2048_bits.go @@ -18,8 +18,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rsaParsedTestsKeySize struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_mod_not_odd.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_mod_not_odd.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_mod_not_odd.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_mod_not_odd.go index 0c2b54b62a..a55d1514d9 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_mod_not_odd.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_mod_not_odd.go @@ -24,8 +24,8 @@ import ( "math/big" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rsaParsedTestsKeyModOdd struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_public_exponent_not_in_range.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_public_exponent_not_in_range.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_public_exponent_not_in_range.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_public_exponent_not_in_range.go index 07733454f8..969e75c943 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_public_exponent_not_in_range.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_public_exponent_not_in_range.go @@ -24,8 +24,8 @@ import ( "math/big" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rsaParsedTestsExpInRange struct { diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_public_exponent_not_odd.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_public_exponent_not_odd.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_public_exponent_not_odd.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_public_exponent_not_odd.go index a1be9438f6..c0c552c5ad 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_public_exponent_not_odd.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_public_exponent_not_odd.go @@ -23,8 +23,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rsaParsedTestsKeyExpOdd struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_public_exponent_too_small.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_public_exponent_too_small.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_public_exponent_too_small.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_public_exponent_too_small.go index f4179175b3..ca4ca38b61 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_rsa_public_exponent_too_small.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_rsa_public_exponent_too_small.go @@ -23,8 +23,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rsaParsedTestsExpBounds struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_san_dns_name_onion_invalid.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_san_dns_name_onion_invalid.go similarity index 98% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_san_dns_name_onion_invalid.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_san_dns_name_onion_invalid.go index 4dcfe09738..cdd7f64507 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_san_dns_name_onion_invalid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_san_dns_name_onion_invalid.go @@ -49,8 +49,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) var ( diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_san_dns_name_onion_not_ev_cert.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_san_dns_name_onion_not_ev_cert.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_san_dns_name_onion_not_ev_cert.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_san_dns_name_onion_not_ev_cert.go index 8693ff09f0..f7fff96e64 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_san_dns_name_onion_not_ev_cert.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_san_dns_name_onion_not_ev_cert.go @@ -18,8 +18,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type onionNotEV struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_signature_algorithm_not_supported.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_signature_algorithm_not_supported.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_signature_algorithm_not_supported.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_signature_algorithm_not_supported.go index 7183087b05..c74dd73b99 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_signature_algorithm_not_supported.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_signature_algorithm_not_supported.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) var ( diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_aia_does_not_contain_issuing_ca_url.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_aia_does_not_contain_issuing_ca_url.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_aia_does_not_contain_issuing_ca_url.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_aia_does_not_contain_issuing_ca_url.go index 628a41c5d2..157865e721 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_aia_does_not_contain_issuing_ca_url.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_aia_does_not_contain_issuing_ca_url.go @@ -26,8 +26,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCaIssuerUrl struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_aia_marked_critical.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_aia_marked_critical.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_aia_marked_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_aia_marked_critical.go index e2c776cd32..a3c42f148d 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_aia_marked_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_aia_marked_critical.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCaAIAMarkedCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_aia_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_aia_missing.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_aia_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_aia_missing.go index 37517d99c6..750f7dfad2 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_aia_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_aia_missing.go @@ -24,8 +24,8 @@ marked critical, and it MUST contain the HTTP URL of the Issuing CA’s OCSP res import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type caAiaMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_certificate_policies_marked_critical.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_certificate_policies_marked_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_certificate_policies_marked_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_certificate_policies_marked_critical.go index 282f162c5f..f4c68d678b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_certificate_policies_marked_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_certificate_policies_marked_critical.go @@ -21,8 +21,8 @@ This extension MUST be present and SHOULD NOT be marked critical. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCACertPolicyCrit struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_certificate_policies_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_certificate_policies_missing.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_certificate_policies_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_certificate_policies_missing.go index 2d19901ae3..cbee861ea0 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_certificate_policies_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_certificate_policies_missing.go @@ -21,8 +21,8 @@ This extension MUST be present and SHOULD NOT be marked critical. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCACertPolicyMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_crl_distribution_points_does_not_contain_url.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_crl_distribution_points_does_not_contain_url.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_crl_distribution_points_does_not_contain_url.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_crl_distribution_points_does_not_contain_url.go index 5156b0b0fb..435dc98664 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_crl_distribution_points_does_not_contain_url.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_crl_distribution_points_does_not_contain_url.go @@ -24,8 +24,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCACRLDistNoUrl struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_crl_distribution_points_marked_critical.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_crl_distribution_points_marked_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_crl_distribution_points_marked_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_crl_distribution_points_marked_critical.go index 3d87ffb63e..576fd0d998 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_crl_distribution_points_marked_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_crl_distribution_points_marked_critical.go @@ -22,8 +22,8 @@ It MUST contain the HTTP URL of the CA’s CRL service. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCACRLDistCrit struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_crl_distribution_points_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_crl_distribution_points_missing.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_crl_distribution_points_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_crl_distribution_points_missing.go index a476e4b10b..a5dd41124f 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_crl_distribution_points_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_crl_distribution_points_missing.go @@ -22,8 +22,8 @@ It MUST contain the HTTP URL of the CA’s CRL service. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCACRLDistMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_eku_critical.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_eku_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_eku_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_eku_critical.go index d94c509f22..a8c956a1a2 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_eku_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_eku_critical.go @@ -24,8 +24,8 @@ If present, this extension SHOULD be marked non‐critical. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCAEKUCrit struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_eku_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_eku_missing.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_eku_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_eku_missing.go index 8b015d0fb0..2902d4a635 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_eku_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_eku_missing.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCAEKUMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_eku_valid_fields.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_eku_valid_fields.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_eku_valid_fields.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_eku_valid_fields.go index ed47ac3d35..fb4c1f6165 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_eku_valid_fields.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_eku_valid_fields.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCAEKUValidFields struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_name_constraints_not_critical.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_name_constraints_not_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_name_constraints_not_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_name_constraints_not_critical.go index 4dc382efe0..91bfca104c 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_ca_name_constraints_not_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_ca_name_constraints_not_critical.go @@ -27,8 +27,8 @@ substantial portion of Relying Parties worldwide import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SubCANameConstraintsNotCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_does_not_contain_issuing_ca_url.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_does_not_contain_issuing_ca_url.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_does_not_contain_issuing_ca_url.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_does_not_contain_issuing_ca_url.go index 11a58cdaaf..c2315d9b3b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_does_not_contain_issuing_ca_url.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_does_not_contain_issuing_ca_url.go @@ -25,8 +25,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertIssuerUrl struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_does_not_contain_ocsp_url.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_does_not_contain_ocsp_url.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_does_not_contain_ocsp_url.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_does_not_contain_ocsp_url.go index 0e9dae824a..2fdcb8e84a 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_does_not_contain_ocsp_url.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_does_not_contain_ocsp_url.go @@ -27,8 +27,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertOcspUrl struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_marked_critical.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_marked_critical.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_marked_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_marked_critical.go index 043ff1ddc1..adfc7d1fc9 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_marked_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_marked_critical.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertAiaMarkedCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_missing.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_missing.go index 0869a6873c..6eaea958e3 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_aia_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_aia_missing.go @@ -25,8 +25,8 @@ marked critical, and it MUST contain the HTTP URL of the Issuing CA’s OCSP res import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertAiaMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_cert_policy_empty.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_cert_policy_empty.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_cert_policy_empty.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_cert_policy_empty.go index e2da7c99ae..39f11e1fe6 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_cert_policy_empty.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_cert_policy_empty.go @@ -24,8 +24,8 @@ CAs complying with these Requirements MAY also assert one of the reserved policy import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertPolicyEmpty struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_certificate_policies_marked_critical.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_certificate_policies_marked_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_certificate_policies_marked_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_certificate_policies_marked_critical.go index 7123db1d29..f31c867cf3 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_certificate_policies_marked_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_certificate_policies_marked_critical.go @@ -22,8 +22,8 @@ This extension MUST be present and SHOULD NOT be marked critical. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertPolicyCrit struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_certificate_policies_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_certificate_policies_missing.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_certificate_policies_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_certificate_policies_missing.go index 6abe6d0fb3..cb8a857eae 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_certificate_policies_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_certificate_policies_missing.go @@ -22,8 +22,8 @@ This extension MUST be present and SHOULD NOT be marked critical. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertPolicy struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_country_name_must_appear.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_country_name_must_appear.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_country_name_must_appear.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_country_name_must_appear.go index 48a8ae59ac..291d212287 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_country_name_must_appear.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_country_name_must_appear.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertCountryNameMustAppear struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_crl_distribution_points_does_not_contain_url.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_crl_distribution_points_does_not_contain_url.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_crl_distribution_points_does_not_contain_url.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_crl_distribution_points_does_not_contain_url.go index fa541e7a09..b8f4cdbc5c 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_crl_distribution_points_does_not_contain_url.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_crl_distribution_points_does_not_contain_url.go @@ -25,8 +25,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCRLDistNoURL struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_crl_distribution_points_marked_critical.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_crl_distribution_points_marked_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_crl_distribution_points_marked_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_crl_distribution_points_marked_critical.go index f313e2f52d..7b9ac9d93f 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_crl_distribution_points_marked_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_crl_distribution_points_marked_critical.go @@ -23,8 +23,8 @@ URL of the CA’s CRL service. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCrlDistCrit struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_eku_extra_values.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_eku_extra_values.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_eku_extra_values.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_eku_extra_values.go index 1a40895ef7..3059f04d15 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_eku_extra_values.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_eku_extra_values.go @@ -22,8 +22,8 @@ Either the value id-kp-serverAuth [RFC5280] or id-kp-clientAuth [RFC5280] or bot import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subExtKeyUsageLegalUsage struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_eku_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_eku_missing.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_eku_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_eku_missing.go index 0e76dff786..76beefde56 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_eku_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_eku_missing.go @@ -22,8 +22,8 @@ Either the value id-kp-serverAuth [RFC5280] or id-kp-clientAuth [RFC5280] or bot import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subExtKeyUsage struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_eku_server_auth_client_auth_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_eku_server_auth_client_auth_missing.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_eku_server_auth_client_auth_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_eku_server_auth_client_auth_missing.go index 5f6b2b7b75..5d044d57b0 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_eku_server_auth_client_auth_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_eku_server_auth_client_auth_missing.go @@ -22,8 +22,8 @@ Either the value id-kp-serverAuth [RFC5280] or id-kp-clientAuth [RFC5280] or bot import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subExtKeyUsageClientOrServer struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_gn_sn_contains_policy.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_gn_sn_contains_policy.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_gn_sn_contains_policy.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_gn_sn_contains_policy.go index c75abac5f5..ccaaab4be4 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_gn_sn_contains_policy.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_gn_sn_contains_policy.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertSubjectGnOrSnContainsPolicy struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_is_ca.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_is_ca.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_is_ca.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_is_ca.go index 535a8cb864..48788b901b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_is_ca.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_is_ca.go @@ -18,8 +18,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertNotCA struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_key_usage_cert_sign_bit_set.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_key_usage_cert_sign_bit_set.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_key_usage_cert_sign_bit_set.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_key_usage_cert_sign_bit_set.go index 8740b1f9e4..85e3dacf18 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_key_usage_cert_sign_bit_set.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_key_usage_cert_sign_bit_set.go @@ -22,8 +22,8 @@ If present, bit positions for keyCertSign and cRLSign MUST NOT be set. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertKeyUsageBitSet struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_key_usage_crl_sign_bit_set.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_key_usage_crl_sign_bit_set.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_key_usage_crl_sign_bit_set.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_key_usage_crl_sign_bit_set.go index a434ba4b44..7d9c15c687 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_key_usage_crl_sign_bit_set.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_key_usage_crl_sign_bit_set.go @@ -22,8 +22,8 @@ If present, bit positions for keyCertSign and cRLSign MUST NOT be set. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCrlSignAllowed struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_locality_name_must_appear.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_locality_name_must_appear.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_locality_name_must_appear.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_locality_name_must_appear.go index b2b96e0e75..a1ab364789 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_locality_name_must_appear.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_locality_name_must_appear.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertLocalityNameMustAppear struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_locality_name_must_not_appear.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_locality_name_must_not_appear.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_locality_name_must_not_appear.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_locality_name_must_not_appear.go index ebe4d65049..51286c4a11 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_locality_name_must_not_appear.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_locality_name_must_not_appear.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertLocalityNameMustNotAppear struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_or_sub_ca_using_sha1.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_or_sub_ca_using_sha1.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_or_sub_ca_using_sha1.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_or_sub_ca_using_sha1.go index dcd961ef5c..23951ed49f 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_or_sub_ca_using_sha1.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_or_sub_ca_using_sha1.go @@ -21,8 +21,8 @@ SHA‐1 MAY be used with RSA keys in accordance with the criteria defined in Sec import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type sigAlgTestsSHA1 struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_postal_code_prohibited.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_postal_code_prohibited.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_postal_code_prohibited.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_postal_code_prohibited.go index ed43e1a06b..2a367dc469 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_postal_code_prohibited.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_postal_code_prohibited.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertPostalCodeMustNotAppear struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_province_must_appear.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_province_must_appear.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_province_must_appear.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_province_must_appear.go index 21493e805e..f1c8261e01 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_province_must_appear.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_province_must_appear.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertProvinceMustAppear struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_province_must_not_appear.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_province_must_not_appear.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_province_must_not_appear.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_province_must_not_appear.go index 4dddc7c115..c73ccb3ec0 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_province_must_not_appear.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_province_must_not_appear.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertProvinceMustNotAppear struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_sha1_expiration_too_long.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_sha1_expiration_too_long.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_sha1_expiration_too_long.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_sha1_expiration_too_long.go index 123607fc16..bc48e4de67 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_sha1_expiration_too_long.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_sha1_expiration_too_long.go @@ -25,8 +25,8 @@ import ( "time" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type sha1ExpireLong struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_street_address_should_not_exist.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_street_address_should_not_exist.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_street_address_should_not_exist.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_street_address_should_not_exist.go index a2ea09d11e..4e849c16b5 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_street_address_should_not_exist.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_street_address_should_not_exist.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertStreetAddressShouldNotExist struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_valid_time_longer_than_39_months.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_valid_time_longer_than_39_months.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_valid_time_longer_than_39_months.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_valid_time_longer_than_39_months.go index 3c2a1d4cec..03dbe3cf32 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_valid_time_longer_than_39_months.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_valid_time_longer_than_39_months.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertValidTimeLongerThan39Months struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_valid_time_longer_than_825_days.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_valid_time_longer_than_825_days.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_valid_time_longer_than_825_days.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_valid_time_longer_than_825_days.go index 6cdd5618ed..dcc2383b42 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_sub_cert_valid_time_longer_than_825_days.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_sub_cert_valid_time_longer_than_825_days.go @@ -16,8 +16,8 @@ package cabf_br import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subCertValidTimeLongerThan825Days struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_common_name_included.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_common_name_included.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_common_name_included.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_common_name_included.go index cd05e5d2d9..a34f14d463 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_common_name_included.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_common_name_included.go @@ -21,8 +21,8 @@ Required/Optional: Deprecated (Discouraged, but not prohibited) import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type commonNames struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_common_name_not_from_san.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_common_name_not_from_san.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_common_name_not_from_san.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_common_name_not_from_san.go index bb66370828..57a60a7c0b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_common_name_not_from_san.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_common_name_not_from_san.go @@ -25,8 +25,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectCommonNameNotFromSAN struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_malformed_arpa_ip.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_malformed_arpa_ip.go similarity index 98% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_malformed_arpa_ip.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_malformed_arpa_ip.go index 496e69f657..c851dfd53f 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_malformed_arpa_ip.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_malformed_arpa_ip.go @@ -20,8 +20,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) // arpaMalformedIP is a linter that warns for malformed names under the diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_noninformational_value.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_noninformational_value.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_noninformational_value.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_noninformational_value.go index 52ec2c5dc2..fa33a2aea4 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_noninformational_value.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_noninformational_value.go @@ -27,8 +27,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type illegalChar struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_reserved_arpa_ip.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_reserved_arpa_ip.go similarity index 99% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_reserved_arpa_ip.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_reserved_arpa_ip.go index 34b2292bfb..dd65c3d796 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_reserved_arpa_ip.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_reserved_arpa_ip.go @@ -20,8 +20,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) const ( diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_reserved_ip.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_reserved_ip.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_reserved_ip.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_reserved_ip.go index 71f48c5e69..622582b573 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_contains_reserved_ip.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_contains_reserved_ip.go @@ -27,8 +27,8 @@ import ( "net" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectReservedIP struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_country_not_iso.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_country_not_iso.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_country_not_iso.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_country_not_iso.go index fa6468c87a..d82d24cc7e 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_br/lint_subject_country_not_iso.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_br/lint_subject_country_not_iso.go @@ -26,8 +26,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type countryNotIso struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_business_category_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_business_category_missing.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_business_category_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_business_category_missing.go index e35d2e70c4..54927bd8fc 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_business_category_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_business_category_missing.go @@ -16,8 +16,8 @@ package cabf_ev import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type evNoBiz struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_country_name_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_country_name_missing.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_country_name_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_country_name_missing.go index 2d8998bb76..f7ebba91b9 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_country_name_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_country_name_missing.go @@ -16,8 +16,8 @@ package cabf_ev import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type evCountryMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_organization_name_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_organization_name_missing.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_organization_name_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_organization_name_missing.go index 88ca41ff94..ad4efe3b20 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_organization_name_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_organization_name_missing.go @@ -16,8 +16,8 @@ package cabf_ev import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type evOrgMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_serial_number_missing.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_serial_number_missing.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_serial_number_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_serial_number_missing.go index ff95e2927c..4ad7d92e56 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_serial_number_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_serial_number_missing.go @@ -16,8 +16,8 @@ package cabf_ev import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type evSNMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_valid_time_too_long.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_valid_time_too_long.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_valid_time_too_long.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_valid_time_too_long.go index a0ec4d76c3..3352997a45 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_ev_valid_time_too_long.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_ev_valid_time_too_long.go @@ -16,8 +16,8 @@ package cabf_ev import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type evValidTooLong struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_onion_subject_validity_time_too_large.go b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_onion_subject_validity_time_too_large.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_onion_subject_validity_time_too_large.go rename to vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_onion_subject_validity_time_too_large.go index cfe792aa91..0f3ac19c5b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/cabf_ev/lint_onion_subject_validity_time_too_large.go +++ b/vendor/github.com/zmap/zlint/v3/lints/cabf_ev/lint_onion_subject_validity_time_too_large.go @@ -18,8 +18,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) const ( diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_bare_wildcard.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_bare_wildcard.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_bare_wildcard.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_bare_wildcard.go index a7750c7b95..e4b9b1e052 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_bare_wildcard.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_bare_wildcard.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type brIANBareWildcard struct{} @@ -46,7 +46,7 @@ func init() { Name: "e_ian_bare_wildcard", Description: "A wildcard MUST be accompanied by other data to its right (Only checks IANDNSNames)", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &brIANBareWildcard{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_dns_name_includes_null_char.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_dns_name_includes_null_char.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_dns_name_includes_null_char.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_dns_name_includes_null_char.go index 8e49a5877d..aeeff76eaf 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_dns_name_includes_null_char.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_dns_name_includes_null_char.go @@ -16,8 +16,8 @@ package community import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IANDNSNull struct{} @@ -46,7 +46,7 @@ func init() { Name: "e_ian_dns_name_includes_null_char", Description: "DNSName MUST NOT include a null character", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &IANDNSNull{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_dns_name_starts_with_period.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_dns_name_starts_with_period.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_dns_name_starts_with_period.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_dns_name_starts_with_period.go index ecfb398101..2a748904c4 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_dns_name_starts_with_period.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_dns_name_starts_with_period.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IANDNSPeriod struct{} @@ -46,7 +46,7 @@ func init() { Name: "e_ian_dns_name_starts_with_period", Description: "DNSName MUST NOT start with a period", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &IANDNSPeriod{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_iana_pub_suffix_empty.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_iana_pub_suffix_empty.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_iana_pub_suffix_empty.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_iana_pub_suffix_empty.go index 692eeea85b..1226c9b501 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_iana_pub_suffix_empty.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_iana_pub_suffix_empty.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IANPubSuffix struct{} @@ -46,7 +46,7 @@ func init() { Name: "w_ian_iana_pub_suffix_empty", Description: "Domain SHOULD NOT have a bare public suffix", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &IANPubSuffix{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_wildcard_not_first.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_wildcard_not_first.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_wildcard_not_first.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_wildcard_not_first.go index 1ca41b05b5..aecc54d2b4 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_ian_wildcard_not_first.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_ian_wildcard_not_first.go @@ -16,8 +16,8 @@ package community import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type brIANWildcardFirst struct{} @@ -46,7 +46,7 @@ func init() { Name: "e_ian_wildcard_not_first", Description: "A wildcard MUST be in the first label of FQDN (ie not: www.*.com) (Only checks IANDNSNames)", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &brIANWildcardFirst{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_is_redacted_cert.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_is_redacted_cert.go similarity index 94% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_is_redacted_cert.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_is_redacted_cert.go index db5ce60676..fa45520559 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_is_redacted_cert.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_is_redacted_cert.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type DNSNameRedacted struct{} @@ -55,7 +55,7 @@ func init() { lint.RegisterLint(&lint.Lint{ Name: "n_contains_redacted_dnsname", Description: "Some precerts are redacted and of the form ?.?.a.com or *.?.a.com", - Source: lint.ZLint, + Source: lint.Community, Citation: "IETF Draft: https://tools.ietf.org/id/draft-strad-trans-redaction-00.html", EffectiveDate: util.ZeroDate, Lint: &DNSNameRedacted{}, diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_issuer_dn_leading_whitespace.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_issuer_dn_leading_whitespace.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_issuer_dn_leading_whitespace.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_issuer_dn_leading_whitespace.go index f8b9b59880..5209543877 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_issuer_dn_leading_whitespace.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_issuer_dn_leading_whitespace.go @@ -16,8 +16,8 @@ package community import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IssuerDNLeadingSpace struct{} @@ -46,7 +46,7 @@ func init() { Name: "w_issuer_dn_leading_whitespace", Description: "AttributeValue in issuer RelativeDistinguishedName sequence SHOULD NOT have leading whitespace", Citation: "lint.AWSLabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &IssuerDNLeadingSpace{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_issuer_dn_trailing_whitespace.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_issuer_dn_trailing_whitespace.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_issuer_dn_trailing_whitespace.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_issuer_dn_trailing_whitespace.go index 106f873f90..c57b2accca 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_issuer_dn_trailing_whitespace.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_issuer_dn_trailing_whitespace.go @@ -16,8 +16,8 @@ package community import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IssuerDNTrailingSpace struct{} @@ -46,7 +46,7 @@ func init() { Name: "w_issuer_dn_trailing_whitespace", Description: "AttributeValue in issuer RelativeDistinguishedName sequence SHOULD NOT have trailing whitespace", Citation: "lint.AWSLabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &IssuerDNTrailingSpace{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_issuer_multiple_rdn.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_issuer_multiple_rdn.go similarity index 94% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_issuer_multiple_rdn.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_issuer_multiple_rdn.go index 9e3d225f67..ada4ca65b7 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_issuer_multiple_rdn.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_issuer_multiple_rdn.go @@ -19,8 +19,8 @@ import ( "github.com/zmap/zcrypto/x509" "github.com/zmap/zcrypto/x509/pkix" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IssuerRDNHasMultipleAttribute struct{} @@ -52,7 +52,7 @@ func init() { Name: "w_multiple_issuer_rdn", Description: "Certificates should not have multiple attributes in a single RDN (issuer)", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &IssuerRDNHasMultipleAttribute{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_rsa_exp_negative.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_rsa_exp_negative.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_rsa_exp_negative.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_rsa_exp_negative.go index 874f5b3e4e..0b7ec33e2b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_rsa_exp_negative.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_rsa_exp_negative.go @@ -18,8 +18,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rsaExpNegative struct{} @@ -46,7 +46,7 @@ func init() { Name: "e_rsa_exp_negative", Description: "RSA public key exponent MUST be positive", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &rsaExpNegative{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_rsa_no_public_key.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_rsa_no_public_key.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_rsa_no_public_key.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_rsa_no_public_key.go index 847e1b97d7..9d2901abf6 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_rsa_no_public_key.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_rsa_no_public_key.go @@ -18,8 +18,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rsaParsedPubKeyExist struct{} @@ -46,7 +46,7 @@ func init() { Name: "e_rsa_no_public_key", Description: "The RSA public key should be present", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &rsaParsedPubKeyExist{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_bare_wildcard.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_bare_wildcard.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_san_bare_wildcard.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_san_bare_wildcard.go index d6dfa592fd..e88f750c37 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_bare_wildcard.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_bare_wildcard.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type brSANBareWildcard struct{} @@ -46,7 +46,7 @@ func init() { Name: "e_san_bare_wildcard", Description: "A wildcard MUST be accompanied by other data to its right (Only checks DNSName)", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &brSANBareWildcard{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_dns_name_duplicate.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_dns_name_duplicate.go similarity index 94% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_san_dns_name_duplicate.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_san_dns_name_duplicate.go index c03b7b10e6..bee1c27a14 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_dns_name_duplicate.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_dns_name_duplicate.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANDNSDuplicate struct{} @@ -51,7 +51,7 @@ func init() { Name: "n_san_dns_name_duplicate", Description: "SAN DNSName contains duplicate values", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &SANDNSDuplicate{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_dns_name_includes_null_char.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_dns_name_includes_null_char.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_san_dns_name_includes_null_char.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_san_dns_name_includes_null_char.go index 7a7ae4451f..95ada5101e 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_dns_name_includes_null_char.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_dns_name_includes_null_char.go @@ -16,8 +16,8 @@ package community import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANDNSNull struct{} @@ -46,7 +46,7 @@ func init() { Name: "e_san_dns_name_includes_null_char", Description: "DNSName MUST NOT include a null character", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &SANDNSNull{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_dns_name_starts_with_period.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_dns_name_starts_with_period.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_san_dns_name_starts_with_period.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_san_dns_name_starts_with_period.go index 92520c28ba..1016cb2ca0 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_dns_name_starts_with_period.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_dns_name_starts_with_period.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANDNSPeriod struct{} @@ -46,7 +46,7 @@ func init() { Name: "e_san_dns_name_starts_with_period", Description: "DNSName MUST NOT start with a period", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &SANDNSPeriod{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_iana_pub_suffix_empty.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_iana_pub_suffix_empty.go similarity index 64% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_san_iana_pub_suffix_empty.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_san_iana_pub_suffix_empty.go index 07d8c3cbca..2d16d02c76 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_iana_pub_suffix_empty.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_iana_pub_suffix_empty.go @@ -15,11 +15,12 @@ package community */ import ( + "fmt" "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type pubSuffix struct{} @@ -33,25 +34,33 @@ func (l *pubSuffix) CheckApplies(c *x509.Certificate) bool { } func (l *pubSuffix) Execute(c *x509.Certificate) *lint.LintResult { - parsedSANDNSNames := c.GetParsedDNSNames(false) - for i := range c.GetParsedDNSNames(false) { - if parsedSANDNSNames[i].ParseError != nil { - if strings.HasSuffix(parsedSANDNSNames[i].ParseError.Error(), "is a suffix") { - return &lint.LintResult{Status: lint.Warn} - } else { - return &lint.LintResult{Status: lint.NA} - } + var badNames []string + for _, parsedName := range c.GetParsedDNSNames(false) { + if parseErr := parsedName.ParseError; parseErr == nil { + continue + } else if strings.HasSuffix(parseErr.Error(), "is a suffix") { + badNames = append(badNames, parsedName.DomainString) } } + + if badNamesCount := len(badNames); badNamesCount > 0 { + return &lint.LintResult{ + Status: lint.Notice, + Details: fmt.Sprintf( + "%d DNS name(s) are bare public suffixes: %s", + badNamesCount, strings.Join(badNames, ", ")), + } + } + return &lint.LintResult{Status: lint.Pass} } func init() { lint.RegisterLint(&lint.Lint{ - Name: "w_san_iana_pub_suffix_empty", + Name: "n_san_iana_pub_suffix_empty", Description: "The domain SHOULD NOT have a bare public suffix", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &pubSuffix{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_wildcard_not_first.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_wildcard_not_first.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_san_wildcard_not_first.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_san_wildcard_not_first.go index 085a85f12c..ce03f562b7 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_san_wildcard_not_first.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_san_wildcard_not_first.go @@ -16,8 +16,8 @@ package community import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANWildCardFirst struct{} @@ -46,7 +46,7 @@ func init() { Name: "e_san_wildcard_not_first", Description: "A wildcard MUST be in the first label of FQDN (ie not: www.*.com) (Only checks DNSName)", Citation: "awslabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &SANWildCardFirst{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_subject_dn_leading_whitespace.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_subject_dn_leading_whitespace.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_subject_dn_leading_whitespace.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_subject_dn_leading_whitespace.go index 7f3b35ef89..8cb964695b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_subject_dn_leading_whitespace.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_subject_dn_leading_whitespace.go @@ -16,8 +16,8 @@ package community import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SubjectDNLeadingSpace struct{} @@ -46,7 +46,7 @@ func init() { Name: "w_subject_dn_leading_whitespace", Description: "AttributeValue in subject RelativeDistinguishedName sequence SHOULD NOT have leading whitespace", Citation: "lint.AWSLabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &SubjectDNLeadingSpace{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_subject_dn_trailing_whitespace.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_subject_dn_trailing_whitespace.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_subject_dn_trailing_whitespace.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_subject_dn_trailing_whitespace.go index 35bc791d8c..2b541fa4db 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_subject_dn_trailing_whitespace.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_subject_dn_trailing_whitespace.go @@ -16,8 +16,8 @@ package community import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SubjectDNTrailingSpace struct{} @@ -46,7 +46,7 @@ func init() { Name: "w_subject_dn_trailing_whitespace", Description: "AttributeValue in subject RelativeDistinguishedName sequence SHOULD NOT have trailing whitespace", Citation: "lint.AWSLabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &SubjectDNTrailingSpace{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_subject_multiple_rdn.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_subject_multiple_rdn.go similarity index 94% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_subject_multiple_rdn.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_subject_multiple_rdn.go index 0cdf1f7943..be772bf977 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_subject_multiple_rdn.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_subject_multiple_rdn.go @@ -19,8 +19,8 @@ import ( "github.com/zmap/zcrypto/x509" "github.com/zmap/zcrypto/x509/pkix" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SubjectRDNHasMultipleAttribute struct{} @@ -51,7 +51,7 @@ func init() { Name: "n_multiple_subject_rdn", Description: "Certificates typically do not have have multiple attributes in a single RDN (subject). This may be an error.", Citation: "lint.AWSLabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &SubjectRDNHasMultipleAttribute{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/community/lint_validity_time_not_positive.go b/vendor/github.com/zmap/zlint/v3/lints/community/lint_validity_time_not_positive.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/community/lint_validity_time_not_positive.go rename to vendor/github.com/zmap/zlint/v3/lints/community/lint_validity_time_not_positive.go index 63a4901e52..439c470957 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/community/lint_validity_time_not_positive.go +++ b/vendor/github.com/zmap/zlint/v3/lints/community/lint_validity_time_not_positive.go @@ -16,8 +16,8 @@ package community import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type validityNegative struct{} @@ -42,7 +42,7 @@ func init() { Name: "e_validity_time_not_positive", Description: "Certificates MUST have a positive time for which they are valid", Citation: "lint.AWSLabs certlint", - Source: lint.AWSLabs, + Source: lint.Community, EffectiveDate: util.ZeroDate, Lint: &validityNegative{}, }) diff --git a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_etsi_present_qcs_critical.go b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_etsi_present_qcs_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_etsi_present_qcs_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_etsi_present_qcs_critical.go index 2560300bbb..12cd00045b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_etsi_present_qcs_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_etsi_present_qcs_critical.go @@ -16,8 +16,8 @@ package etsi import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type qcStatemQcEtsiPresentQcsCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_etsi_type_as_statem.go b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_etsi_type_as_statem.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_etsi_type_as_statem.go rename to vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_etsi_type_as_statem.go index 3f769e8d39..a18a56bf2d 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_etsi_type_as_statem.go +++ b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_etsi_type_as_statem.go @@ -19,8 +19,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type qcStatemEtsiTypeAsStatem struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_mandatory_etsi_statems.go b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_mandatory_etsi_statems.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_mandatory_etsi_statems.go rename to vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_mandatory_etsi_statems.go index 6737cf368c..f680f05f3d 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_mandatory_etsi_statems.go +++ b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_mandatory_etsi_statems.go @@ -18,8 +18,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type qcStatemQcmandatoryEtsiStatems struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qccompliance_valid.go b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qccompliance_valid.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qccompliance_valid.go rename to vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qccompliance_valid.go index 14f648a39d..9c047c9d26 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qccompliance_valid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qccompliance_valid.go @@ -18,8 +18,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type qcStatemQcComplianceValid struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qclimitvalue_valid.go b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qclimitvalue_valid.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qclimitvalue_valid.go rename to vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qclimitvalue_valid.go index 9d519701a5..e34922d4b9 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qclimitvalue_valid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qclimitvalue_valid.go @@ -19,8 +19,8 @@ import ( "unicode" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type qcStatemQcLimitValueValid struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcpds_lang_case.go b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcpds_lang_case.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcpds_lang_case.go rename to vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcpds_lang_case.go index 130da2c9cb..d3ba575df8 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcpds_lang_case.go +++ b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcpds_lang_case.go @@ -20,8 +20,8 @@ import ( "unicode" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type qcStatemQcPdsLangCase struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcpds_valid.go b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcpds_valid.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcpds_valid.go rename to vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcpds_valid.go index d066e3dfed..79c5bce7a6 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcpds_valid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcpds_valid.go @@ -20,8 +20,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type qcStatemQcPdsValid struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcretentionperiod_valid.go b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcretentionperiod_valid.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcretentionperiod_valid.go rename to vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcretentionperiod_valid.go index dbf5c06e5f..d2c59b108a 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcretentionperiod_valid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcretentionperiod_valid.go @@ -18,8 +18,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type qcStatemQcRetentionPeriodValid struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcsscd_valid.go b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcsscd_valid.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcsscd_valid.go rename to vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcsscd_valid.go index b52e444636..ce6f09d481 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qcsscd_valid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qcsscd_valid.go @@ -18,8 +18,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type qcStatemQcSscdValid struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qctype_valid.go b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qctype_valid.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qctype_valid.go rename to vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qctype_valid.go index da575c528c..17973d111a 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qctype_valid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qctype_valid.go @@ -19,8 +19,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type qcStatemQctypeValid struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qctype_web.go b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qctype_web.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qctype_web.go rename to vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qctype_web.go index 8f2b7abe7b..ba061c390f 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/etsi/lint_qcstatem_qctype_web.go +++ b/vendor/github.com/zmap/zlint/v3/lints/etsi/lint_qcstatem_qctype_web.go @@ -19,8 +19,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type qcStatemQctypeWeb struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_allowed_eku.go b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_allowed_eku.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_allowed_eku.go rename to vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_allowed_eku.go index b276ca041f..90d6b74a9c 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_allowed_eku.go +++ b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_allowed_eku.go @@ -30,8 +30,8 @@ import ( "time" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type allowedEKU struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_authority_key_identifier_correct.go b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_authority_key_identifier_correct.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_authority_key_identifier_correct.go rename to vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_authority_key_identifier_correct.go index 301f736724..65a75bec88 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_authority_key_identifier_correct.go +++ b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_authority_key_identifier_correct.go @@ -26,8 +26,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type keyIdentifier struct { diff --git a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_ecdsa_pub_key_encoding_correct.go b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_ecdsa_pub_key_encoding_correct.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_ecdsa_pub_key_encoding_correct.go rename to vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_ecdsa_pub_key_encoding_correct.go index 077a76cfb1..fe4a0ff5db 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_ecdsa_pub_key_encoding_correct.go +++ b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_ecdsa_pub_key_encoding_correct.go @@ -37,8 +37,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ecdsaPubKeyAidEncoding struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_ecdsa_signature_encoding_correct.go b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_ecdsa_signature_encoding_correct.go similarity index 98% rename from vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_ecdsa_signature_encoding_correct.go rename to vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_ecdsa_signature_encoding_correct.go index 3ffcc7ba8c..8fb93dc698 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_ecdsa_signature_encoding_correct.go +++ b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_ecdsa_signature_encoding_correct.go @@ -38,8 +38,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ecdsaSignatureAidEncoding struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_exponent_cannot_be_one.go b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_exponent_cannot_be_one.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_exponent_cannot_be_one.go rename to vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_exponent_cannot_be_one.go index fe53fa9d28..fedb44265a 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_exponent_cannot_be_one.go +++ b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_exponent_cannot_be_one.go @@ -24,8 +24,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type exponentCannotBeOne struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_modulus_must_be_2048_bits_or_more.go b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_modulus_must_be_2048_bits_or_more.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_modulus_must_be_2048_bits_or_more.go rename to vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_modulus_must_be_2048_bits_or_more.go index d4e59f8564..a55f00a1db 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_modulus_must_be_2048_bits_or_more.go +++ b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_modulus_must_be_2048_bits_or_more.go @@ -23,8 +23,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type modulus2048OrMore struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_modulus_must_be_divisible_by_8.go b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_modulus_must_be_divisible_by_8.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_modulus_must_be_divisible_by_8.go rename to vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_modulus_must_be_divisible_by_8.go index 2e454ef085..1d8898e29e 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_modulus_must_be_divisible_by_8.go +++ b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_modulus_must_be_divisible_by_8.go @@ -23,8 +23,8 @@ import ( "crypto/rsa" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type modulusDivisibleBy8 struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_pss_parameters_encoding_correct.go b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_pss_parameters_encoding_correct.go similarity index 98% rename from vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_pss_parameters_encoding_correct.go rename to vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_pss_parameters_encoding_correct.go index b7b7998004..08d829d43c 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_pss_parameters_encoding_correct.go +++ b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_pss_parameters_encoding_correct.go @@ -51,8 +51,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rsaPssAidEncoding struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_rsassa-pss_in_spki.go b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_rsassa-pss_in_spki.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_rsassa-pss_in_spki.go rename to vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_rsassa-pss_in_spki.go index 0752fe99d8..c1a077cc26 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/mozilla/lint_mp_rsassa-pss_in_spki.go +++ b/vendor/github.com/zmap/zlint/v3/lints/mozilla/lint_mp_rsassa-pss_in_spki.go @@ -26,8 +26,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rsaPssInSPKI struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_basic_constraints_not_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_basic_constraints_not_critical.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_basic_constraints_not_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_basic_constraints_not_critical.go index 6a112c7b1b..32f3d7d100 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_basic_constraints_not_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_basic_constraints_not_critical.go @@ -16,8 +16,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) /************************************************ diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ca_subject_field_empty.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ca_subject_field_empty.go similarity index 93% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ca_subject_field_empty.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ca_subject_field_empty.go index d7c2152cf2..98bd33d46e 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ca_subject_field_empty.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ca_subject_field_empty.go @@ -28,8 +28,8 @@ The subject field identifies the entity associated with the public import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type caSubjectEmpty struct{} @@ -43,7 +43,7 @@ func (l *caSubjectEmpty) CheckApplies(c *x509.Certificate) bool { } func (l *caSubjectEmpty) Execute(c *x509.Certificate) *lint.LintResult { - if &c.Subject != nil && util.NotAllNameFieldsAreEmpty(&c.Subject) { + if util.NotAllNameFieldsAreEmpty(&c.Subject) { return &lint.LintResult{Status: lint.Pass} } else { return &lint.LintResult{Status: lint.Error} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_cert_contains_unique_identifier.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_cert_contains_unique_identifier.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_cert_contains_unique_identifier.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_cert_contains_unique_identifier.go index a790e36541..3e3fdd10b1 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_cert_contains_unique_identifier.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_cert_contains_unique_identifier.go @@ -29,8 +29,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type CertContainsUniqueIdentifier struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_cert_extensions_version_not_3.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_cert_extensions_version_not_3.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_cert_extensions_version_not_3.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_cert_extensions_version_not_3.go index 479816e6ef..8ceaa78630 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_cert_extensions_version_not_3.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_cert_extensions_version_not_3.go @@ -35,8 +35,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type CertExtensionsVersonNot3 struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_cert_unique_identifier_version_not_2_or_3.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_cert_unique_identifier_version_not_2_or_3.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_cert_unique_identifier_version_not_2_or_3.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_cert_unique_identifier_version_not_2_or_3.go index 3d6a251706..86adee416d 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_cert_unique_identifier_version_not_2_or_3.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_cert_unique_identifier_version_not_2_or_3.go @@ -30,8 +30,8 @@ RFC 5280: 4.1.2.8 import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type certUniqueIdVersion struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_distribution_point_incomplete.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_distribution_point_incomplete.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_distribution_point_incomplete.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_distribution_point_incomplete.go index 5dd6af3695..436da6e9c9 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_distribution_point_incomplete.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_distribution_point_incomplete.go @@ -32,8 +32,8 @@ import ( "github.com/zmap/zcrypto/x509" "github.com/zmap/zcrypto/x509/pkix" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type distributionPoint struct { diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_distribution_point_missing_ldap_or_uri.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_distribution_point_missing_ldap_or_uri.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_distribution_point_missing_ldap_or_uri.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_distribution_point_missing_ldap_or_uri.go index 7fabe9560c..dafd577ac2 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_distribution_point_missing_ldap_or_uri.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_distribution_point_missing_ldap_or_uri.go @@ -23,8 +23,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type distribNoLDAPorURI struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ecdsa_ee_invalid_ku.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ecdsa_ee_invalid_ku.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ecdsa_ee_invalid_ku.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ecdsa_ee_invalid_ku.go index a059ce10d6..e3db0cdb7a 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ecdsa_ee_invalid_ku.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ecdsa_ee_invalid_ku.go @@ -20,8 +20,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ecdsaInvalidKU struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_eku_critical_improperly.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_eku_critical_improperly.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_eku_critical_improperly.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_eku_critical_improperly.go index a7f9f6f898..b984f37e5b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_eku_critical_improperly.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_eku_critical_improperly.go @@ -29,8 +29,8 @@ If a CA includes extended key usages to satisfy such applications, import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ekuBadCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_aia_access_location_missing.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_aia_access_location_missing.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_aia_access_location_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_aia_access_location_missing.go index ca61f0cfdf..879b735ea6 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_aia_access_location_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_aia_access_location_missing.go @@ -29,8 +29,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type aiaNoHTTPorLDAP struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_aia_marked_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_aia_marked_critical.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_aia_marked_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_aia_marked_critical.go index f05843185d..c2ddb05b87 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_aia_marked_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_aia_marked_critical.go @@ -22,8 +22,8 @@ Authority Information Access import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ExtAiaMarkedCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_authority_key_identifier_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_authority_key_identifier_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_authority_key_identifier_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_authority_key_identifier_critical.go index ad034f08e1..513847a970 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_authority_key_identifier_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_authority_key_identifier_critical.go @@ -21,8 +21,8 @@ Conforming CAs MUST mark this extension as non-critical. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type authorityKeyIdCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_authority_key_identifier_missing.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_authority_key_identifier_missing.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_authority_key_identifier_missing.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_authority_key_identifier_missing.go index 8fd4f64bd7..b9bc50d616 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_authority_key_identifier_missing.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_authority_key_identifier_missing.go @@ -31,8 +31,8 @@ The keyIdentifier field of the authorityKeyIdentifier extension MUST import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type authorityKeyIdMissing struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_authority_key_identifier_no_key_identifier.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_authority_key_identifier_no_key_identifier.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_authority_key_identifier_no_key_identifier.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_authority_key_identifier_no_key_identifier.go index 9afb572b50..b23b911be7 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_authority_key_identifier_no_key_identifier.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_authority_key_identifier_no_key_identifier.go @@ -31,8 +31,8 @@ The keyIdentifier field of the authorityKeyIdentifier extension MUST import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type authorityKeyIdNoKeyIdField struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_contains_noticeref.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_contains_noticeref.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_contains_noticeref.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_contains_noticeref.go index 09fbd508d2..8ea5689013 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_contains_noticeref.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_contains_noticeref.go @@ -22,8 +22,8 @@ option. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type noticeRefPres struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_disallowed_any_policy_qualifier.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_disallowed_any_policy_qualifier.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_disallowed_any_policy_qualifier.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_disallowed_any_policy_qualifier.go index 1ec2a69a98..0262b8b588 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_disallowed_any_policy_qualifier.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_disallowed_any_policy_qualifier.go @@ -27,8 +27,8 @@ qualifiers returned as a result of path validation are considered. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type unrecommendedQualifier struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_duplicate.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_duplicate.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_duplicate.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_duplicate.go index 1e43fc6bea..bd58f83cbe 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_duplicate.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_duplicate.go @@ -24,8 +24,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ExtCertPolicyDuplicate struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_ia5_string.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_ia5_string.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_ia5_string.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_ia5_string.go index fec5421c6b..f76cc7ac48 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_ia5_string.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_ia5_string.go @@ -30,8 +30,8 @@ to Unicode normalization form C (NFC) [NFC]. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type explicitTextIA5String struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_includes_control.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_includes_control.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_includes_control.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_includes_control.go index 1f3f3fee99..5b1e3e8982 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_includes_control.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_includes_control.go @@ -28,8 +28,8 @@ normalized according to Unicode normalization form C (NFC) [NFC]. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type controlChar struct{} @@ -47,6 +47,7 @@ func (l *controlChar) CheckApplies(c *x509.Certificate) bool { return false } +//nolint:nestif func (l *controlChar) Execute(c *x509.Certificate) *lint.LintResult { for _, firstLvl := range c.ExplicitTexts { for _, text := range firstLvl { diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_not_nfc.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_not_nfc.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_not_nfc.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_not_nfc.go index 6cf26b2850..064d7b6a25 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_not_nfc.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_not_nfc.go @@ -21,8 +21,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" "golang.org/x/text/unicode/norm" ) diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_not_utf8.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_not_utf8.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_not_utf8.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_not_utf8.go index 37154281b9..c1e381bafa 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_not_utf8.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_not_utf8.go @@ -31,8 +31,8 @@ to Unicode normalization form C (NFC) [NFC]. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type explicitTextUtf8 struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_too_long.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_too_long.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_too_long.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_too_long.go index 54febf328a..e8641d23b4 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_cert_policy_explicit_text_too_long.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_cert_policy_explicit_text_too_long.go @@ -29,8 +29,8 @@ to Unicode normalization form C (NFC) [NFC]. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type explicitTextTooLong struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_crl_distribution_marked_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_crl_distribution_marked_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_crl_distribution_marked_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_crl_distribution_marked_critical.go index cf4a22cdf0..72890a99b7 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_crl_distribution_marked_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_crl_distribution_marked_critical.go @@ -20,8 +20,8 @@ The CRL distribution points extension identifies how CRL information is obtained import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ExtCrlDistributionMarkedCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_duplicate_extension.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_duplicate_extension.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_duplicate_extension.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_duplicate_extension.go index 029d2440b5..8b8e22584a 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_duplicate_extension.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_duplicate_extension.go @@ -20,8 +20,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ExtDuplicateExtension struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_freshest_crl_marked_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_freshest_crl_marked_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_freshest_crl_marked_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_freshest_crl_marked_critical.go index 2e1d6b945a..e0951557f2 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_freshest_crl_marked_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_freshest_crl_marked_critical.go @@ -21,8 +21,8 @@ The freshest CRL extension identifies how delta CRL information is obtained. The import ( "github.com/zmap/zcrypto/x509" "github.com/zmap/zcrypto/x509/pkix" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ExtFreshestCrlMarkedCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_critical.go index 9c3fd96850..c518ce6671 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_critical.go @@ -22,8 +22,8 @@ Issuer Alternative Name import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type ExtIANCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_dns_not_ia5_string.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_dns_not_ia5_string.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_dns_not_ia5_string.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_dns_not_ia5_string.go index 5bbfc9fb5a..44b955a1af 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_dns_not_ia5_string.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_dns_not_ia5_string.go @@ -32,8 +32,8 @@ encoding internationalized domain names are specified in Section 7.2. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IANDNSNotIA5String struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_empty_name.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_empty_name.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_empty_name.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_empty_name.go index 67c637080d..ed6f15f9c3 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_empty_name.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_empty_name.go @@ -30,8 +30,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IANEmptyName struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_no_entries.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_no_entries.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_no_entries.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_no_entries.go index da3710157f..6977d4bcf8 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_no_entries.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_no_entries.go @@ -28,8 +28,8 @@ If the issuerAltName extension is present, the sequence MUST contain import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IANNoEntry struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_rfc822_format_invalid.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_rfc822_format_invalid.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_rfc822_format_invalid.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_rfc822_format_invalid.go index 096b183178..b711b0c9a9 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_rfc822_format_invalid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_rfc822_format_invalid.go @@ -30,8 +30,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IANEmail struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_space_dns_name.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_space_dns_name.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_space_dns_name.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_space_dns_name.go index 1c2b24598f..d7de629e62 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_space_dns_name.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_space_dns_name.go @@ -32,8 +32,8 @@ encoding internationalized domain names are specified in Section 7.2. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IANSpace struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_format_invalid.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_format_invalid.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_format_invalid.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_format_invalid.go index f686188d0f..01afa14c32 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_format_invalid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_format_invalid.go @@ -23,8 +23,8 @@ import ( "net/url" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IANURIFormat struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_host_not_fqdn_or_ip.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_host_not_fqdn_or_ip.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_host_not_fqdn_or_ip.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_host_not_fqdn_or_ip.go index 9bc007d526..93de1707a1 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_host_not_fqdn_or_ip.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_host_not_fqdn_or_ip.go @@ -30,8 +30,8 @@ import ( "net/url" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IANURIFQDNOrIP struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_not_ia5.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_not_ia5.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_not_ia5.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_not_ia5.go index 7dc0ce5b62..b1e97042df 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_not_ia5.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_not_ia5.go @@ -23,8 +23,8 @@ import ( "unicode" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IANURIIA5String struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_relative.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_relative.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_relative.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_relative.go index d43cfe8734..8190359681 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_ian_uri_relative.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_ian_uri_relative.go @@ -30,8 +30,8 @@ import ( "net/url" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type uriRelative struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_key_usage_cert_sign_without_ca.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_key_usage_cert_sign_without_ca.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_key_usage_cert_sign_without_ca.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_key_usage_cert_sign_without_ca.go index c3a8ab0c04..de5e8f7063 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_key_usage_cert_sign_without_ca.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_key_usage_cert_sign_without_ca.go @@ -27,8 +27,8 @@ The cA boolean indicates whether the certified public key may be used import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type keyUsageCertSignNoCa struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_key_usage_not_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_key_usage_not_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_key_usage_not_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_key_usage_not_critical.go index 60492bf6c8..7e77b19735 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_key_usage_not_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_key_usage_not_critical.go @@ -18,8 +18,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type checkKeyUsageCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_key_usage_without_bits.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_key_usage_without_bits.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_key_usage_without_bits.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_key_usage_without_bits.go index e9cd8017a5..317e598bc2 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_key_usage_without_bits.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_key_usage_without_bits.go @@ -25,8 +25,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type keyUsageBitsSet struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_name_constraints_not_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_name_constraints_not_critical.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_name_constraints_not_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_name_constraints_not_critical.go index a4833764d5..a1569a2993 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_name_constraints_not_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_name_constraints_not_critical.go @@ -28,8 +28,8 @@ Restrictions are defined in terms of permitted or excluded name import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type nameConstraintCrit struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_name_constraints_not_in_ca.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_name_constraints_not_in_ca.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_name_constraints_not_in_ca.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_name_constraints_not_in_ca.go index 6e4f35d06e..15265ab9a6 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_name_constraints_not_in_ca.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_name_constraints_not_in_ca.go @@ -27,8 +27,8 @@ The name constraints extension, which MUST be used only in a CA import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type nameConstraintNotCa struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_constraints_empty.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_constraints_empty.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_constraints_empty.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_constraints_empty.go index 7629f31b9d..16e4ded63e 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_constraints_empty.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_constraints_empty.go @@ -27,8 +27,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type policyConstraintsContents struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_constraints_not_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_constraints_not_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_constraints_not_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_constraints_not_critical.go index b8364600fd..d28925b7eb 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_constraints_not_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_constraints_not_critical.go @@ -21,8 +21,8 @@ Conforming CAs MUST mark this extension as critical. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type policyConstraintsCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_map_any_policy.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_map_any_policy.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_map_any_policy.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_map_any_policy.go index 8cb9b2b1c5..dc29377f8b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_map_any_policy.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_map_any_policy.go @@ -24,8 +24,8 @@ Each issuerDomainPolicy named in the policy mappings extension SHOULD import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type policyMapAnyPolicy struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_map_not_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_map_not_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_map_not_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_map_not_critical.go index 09e502c660..25702ebede 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_map_not_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_map_not_critical.go @@ -22,8 +22,8 @@ This extension MAY be supported by CAs and/or applications. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type policyMapCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_map_not_in_cert_policy.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_map_not_in_cert_policy.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_map_not_in_cert_policy.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_map_not_in_cert_policy.go index 9382b13a87..d3ffaab83e 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_policy_map_not_in_cert_policy.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_policy_map_not_in_cert_policy.go @@ -24,8 +24,8 @@ Each issuerDomainPolicy named in the policy mapping extension SHOULD import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type policyMapMatchesCertPolicy struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_dns_name_too_long.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_dns_name_too_long.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_dns_name_too_long.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_dns_name_too_long.go index 4942d71eb3..e3902084bf 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_dns_name_too_long.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_dns_name_too_long.go @@ -16,8 +16,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANDNSTooLong struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_dns_not_ia5_string.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_dns_not_ia5_string.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_dns_not_ia5_string.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_dns_not_ia5_string.go index 98a0f24753..56c7f808ef 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_dns_not_ia5_string.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_dns_not_ia5_string.go @@ -32,8 +32,8 @@ encoding internationalized domain names are specified in Section 7.2. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANDNSNotIA5String struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_empty_name.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_empty_name.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_empty_name.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_empty_name.go index db9a8b39f8..8adcd01cd3 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_empty_name.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_empty_name.go @@ -30,8 +30,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANEmptyName struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_no_entries.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_no_entries.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_no_entries.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_no_entries.go index fd9e21bd6e..cc12a3f290 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_no_entries.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_no_entries.go @@ -28,8 +28,8 @@ If the subjectAltName extension is present, the sequence MUST contain import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANNoEntry struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_not_critical_without_subject.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_not_critical_without_subject.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_not_critical_without_subject.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_not_critical_without_subject.go index 317f18286f..ce3cb686ed 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_not_critical_without_subject.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_not_critical_without_subject.go @@ -29,8 +29,8 @@ Further, if the only subject identity included in the certificate is import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type extSANNotCritNoSubject struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_rfc822_format_invalid.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_rfc822_format_invalid.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_rfc822_format_invalid.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_rfc822_format_invalid.go index 4df76c5ac8..a967f811e0 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_rfc822_format_invalid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_rfc822_format_invalid.go @@ -30,8 +30,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type invalidEmail struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_space_dns_name.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_space_dns_name.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_space_dns_name.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_space_dns_name.go index fbc0b3c19d..9e173409aa 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_space_dns_name.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_space_dns_name.go @@ -32,8 +32,8 @@ When the subjectAltName extension contains a domain name system import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANIsSpaceDNS struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_format_invalid.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_format_invalid.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_format_invalid.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_format_invalid.go index 9433317742..0158e08954 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_format_invalid.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_format_invalid.go @@ -23,8 +23,8 @@ import ( "net/url" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type extSANURIFormatInvalid struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_host_not_fqdn_or_ip.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_host_not_fqdn_or_ip.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_host_not_fqdn_or_ip.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_host_not_fqdn_or_ip.go index 42fac1f37e..d6f2226a31 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_host_not_fqdn_or_ip.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_host_not_fqdn_or_ip.go @@ -30,8 +30,8 @@ import ( "net/url" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SANURIHost struct{} @@ -44,6 +44,7 @@ func (l *SANURIHost) CheckApplies(c *x509.Certificate) bool { return util.IsExtInCert(c, util.SubjectAlternateNameOID) } +//nolint:nestif func (l *SANURIHost) Execute(c *x509.Certificate) *lint.LintResult { for _, uri := range c.URIs { if uri != "" { diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_not_ia5.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_not_ia5.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_not_ia5.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_not_ia5.go index 872c7309ab..fb049bd3e4 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_not_ia5.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_not_ia5.go @@ -23,8 +23,8 @@ import ( "unicode" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type extSANURINotIA5 struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_relative.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_relative.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_relative.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_relative.go index 2066f255b5..97ab8c35ea 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_san_uri_relative.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_san_uri_relative.go @@ -30,8 +30,8 @@ import ( "net/url" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type extSANURIRelative struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_directory_attr_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_directory_attr_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_directory_attr_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_directory_attr_critical.go index acf50e93e2..b32d62f7f1 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_directory_attr_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_directory_attr_critical.go @@ -24,8 +24,8 @@ The subject directory attributes extension is used to convey import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subDirAttrCrit struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_key_identifier_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_key_identifier_critical.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_key_identifier_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_key_identifier_critical.go index 749e22e2fb..e4a8666e61 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_key_identifier_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_key_identifier_critical.go @@ -21,8 +21,8 @@ RFC 5280: 4.2.1.2 import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectKeyIdCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_key_identifier_missing_ca.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_key_identifier_missing_ca.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_key_identifier_missing_ca.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_key_identifier_missing_ca.go index 2f1f280292..56adfe440f 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_key_identifier_missing_ca.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_key_identifier_missing_ca.go @@ -36,8 +36,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectKeyIdMissingCA struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_key_identifier_missing_sub_cert.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_key_identifier_missing_sub_cert.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_key_identifier_missing_sub_cert.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_key_identifier_missing_sub_cert.go index 9d71d05345..f0e50dab97 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_ext_subject_key_identifier_missing_sub_cert.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_ext_subject_key_identifier_missing_sub_cert.go @@ -36,8 +36,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectKeyIdMissingSubscriber struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_generalized_time_does_not_include_seconds.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_generalized_time_does_not_include_seconds.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_generalized_time_does_not_include_seconds.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_generalized_time_does_not_include_seconds.go index e049a62aae..ceb1e3f1e9 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_generalized_time_does_not_include_seconds.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_generalized_time_does_not_include_seconds.go @@ -31,8 +31,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type generalizedNoSeconds struct { @@ -69,6 +69,7 @@ func (l *generalizedNoSeconds) Execute(c *x509.Certificate) *lint.LintResult { return &lint.LintResult{Status: r} } +//nolint:nestif func checkSeconds(r *lint.LintStatus, t asn1.RawValue) { if t.Bytes[len(t.Bytes)-1] == 'Z' { if len(t.Bytes) < 15 { diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_generalized_time_includes_fraction_seconds.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_generalized_time_includes_fraction_seconds.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_generalized_time_includes_fraction_seconds.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_generalized_time_includes_fraction_seconds.go index 1022df4669..36b64f7121 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_generalized_time_includes_fraction_seconds.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_generalized_time_includes_fraction_seconds.go @@ -31,8 +31,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type generalizedTimeFraction struct { @@ -69,6 +69,7 @@ func (l *generalizedTimeFraction) Execute(c *x509.Certificate) *lint.LintResult return &lint.LintResult{Status: r} } +//nolint:nestif func checkFraction(r *lint.LintStatus, t asn1.RawValue) { if t.Bytes[len(t.Bytes)-1] == 'Z' { if len(t.Bytes) > 15 { diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_generalized_time_not_in_zulu.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_generalized_time_not_in_zulu.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_generalized_time_not_in_zulu.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_generalized_time_not_in_zulu.go index 6d3e392c98..2a3c93c75d 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_generalized_time_not_in_zulu.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_generalized_time_not_in_zulu.go @@ -29,8 +29,8 @@ is zero. GeneralizedTime values MUST NOT include fractional seconds. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type generalizedNotZulu struct { diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_idn_dnsname_malformed_unicode.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_idn_dnsname_malformed_unicode.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_idn_dnsname_malformed_unicode.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_idn_dnsname_malformed_unicode.go index 29e2ee215e..50f35424cd 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_idn_dnsname_malformed_unicode.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_idn_dnsname_malformed_unicode.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" "golang.org/x/net/idna" ) diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_idn_dnsname_must_be_nfc.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_idn_dnsname_must_be_nfc.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_idn_dnsname_must_be_nfc.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_idn_dnsname_must_be_nfc.go index 6f6b399a62..926738bdfc 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_idn_dnsname_must_be_nfc.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_idn_dnsname_must_be_nfc.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" "golang.org/x/net/idna" "golang.org/x/text/unicode/norm" ) diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_inhibit_any_policy_not_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_inhibit_any_policy_not_critical.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_inhibit_any_policy_not_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_inhibit_any_policy_not_critical.go index 0e60f3f9bd..0c0a32f159 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_inhibit_any_policy_not_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_inhibit_any_policy_not_critical.go @@ -31,8 +31,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type InhibitAnyPolicyNotCritical struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_issuer_dn_country_not_printable_string.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_issuer_dn_country_not_printable_string.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_issuer_dn_country_not_printable_string.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_issuer_dn_country_not_printable_string.go index 7b5c720a9b..0a8c92e6fe 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_issuer_dn_country_not_printable_string.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_issuer_dn_country_not_printable_string.go @@ -18,8 +18,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type IssuerDNCountryNotPrintableString struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_issuer_field_empty.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_issuer_field_empty.go similarity index 92% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_issuer_field_empty.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_issuer_field_empty.go index c35346a27c..f3fec360ff 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_issuer_field_empty.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_issuer_field_empty.go @@ -24,8 +24,8 @@ The issuer field identifies the entity that has signed and issued the import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type issuerFieldEmpty struct{} @@ -39,7 +39,7 @@ func (l *issuerFieldEmpty) CheckApplies(c *x509.Certificate) bool { } func (l *issuerFieldEmpty) Execute(c *x509.Certificate) *lint.LintResult { - if &c.Issuer != nil && util.NotAllNameFieldsAreEmpty(&c.Issuer) { + if util.NotAllNameFieldsAreEmpty(&c.Issuer) { return &lint.LintResult{Status: lint.Pass} } else { return &lint.LintResult{Status: lint.Error} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_empty.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_empty.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_empty.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_empty.go index 670c529ac5..da949f46dd 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_empty.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_empty.go @@ -30,8 +30,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type nameConstraintEmpty struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_maximum_not_absent.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_maximum_not_absent.go similarity index 98% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_maximum_not_absent.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_maximum_not_absent.go index f67aecd5dd..d85e06bfee 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_maximum_not_absent.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_maximum_not_absent.go @@ -27,8 +27,8 @@ certificate. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type nameConstraintMax struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_minimum_non_zero.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_minimum_non_zero.go similarity index 98% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_minimum_non_zero.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_minimum_non_zero.go index c3e64af52a..e0ab26e3fa 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_minimum_non_zero.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_minimum_non_zero.go @@ -27,8 +27,8 @@ certificate. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type nameConstMin struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_on_edi_party_name.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_on_edi_party_name.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_on_edi_party_name.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_on_edi_party_name.go index c5bbff2a27..d5cedea537 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_on_edi_party_name.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_on_edi_party_name.go @@ -29,8 +29,8 @@ be present. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type nameConstraintOnEDI struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_on_registered_id.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_on_registered_id.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_on_registered_id.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_on_registered_id.go index 889cdaadbf..bfb87245c8 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_on_registered_id.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_on_registered_id.go @@ -29,8 +29,8 @@ be present. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type nameConstraintOnRegisteredId struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_on_x400.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_on_x400.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_on_x400.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_on_x400.go index 15d68671b6..2b76dba788 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_name_constraint_on_x400.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_name_constraint_on_x400.go @@ -29,8 +29,8 @@ be present. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type nameConstraintOnX400 struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_path_len_constraint_improperly_included.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_path_len_constraint_improperly_included.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_path_len_constraint_improperly_included.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_path_len_constraint_improperly_included.go index 24d7bdeea5..9572ef0653 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_path_len_constraint_improperly_included.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_path_len_constraint_improperly_included.go @@ -25,8 +25,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type pathLenIncluded struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_path_len_constraint_zero_or_less.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_path_len_constraint_zero_or_less.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_path_len_constraint_zero_or_less.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_path_len_constraint_zero_or_less.go index ae84cca2b9..64c07c8440 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_path_len_constraint_zero_or_less.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_path_len_constraint_zero_or_less.go @@ -34,8 +34,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type basicConst struct { diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_serial_number_longer_than_20_octets.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_serial_number_longer_than_20_octets.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_serial_number_longer_than_20_octets.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_serial_number_longer_than_20_octets.go index 29affc48ad..009b86e393 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_serial_number_longer_than_20_octets.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_serial_number_longer_than_20_octets.go @@ -33,8 +33,8 @@ RFC 5280: 4.1.2.2. Serial Number import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type serialNumberTooLong struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_serial_number_not_positive.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_serial_number_not_positive.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_serial_number_not_positive.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_serial_number_not_positive.go index de4ca1b5af..210c830153 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_serial_number_not_positive.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_serial_number_not_positive.go @@ -33,8 +33,8 @@ package rfc import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SerialNumberNotPositive struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_spki_rsa_encryption_parameter_not_null.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_spki_rsa_encryption_parameter_not_null.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_spki_rsa_encryption_parameter_not_null.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_spki_rsa_encryption_parameter_not_null.go index 2688ef0af5..91a6e4a1f9 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_spki_rsa_encryption_parameter_not_null.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_spki_rsa_encryption_parameter_not_null.go @@ -23,8 +23,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type rsaSPKIEncryptionParamNotNULL struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_common_name_max_length.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_common_name_max_length.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_common_name_max_length.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_common_name_max_length.go index 7e652b52f5..f9920b0fe5 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_common_name_max_length.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_common_name_max_length.go @@ -25,8 +25,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectCommonNameMaxLength struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_country_not_printable_string.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_country_not_printable_string.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_country_not_printable_string.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_country_not_printable_string.go index be6ef2ec37..d4f03c3868 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_country_not_printable_string.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_country_not_printable_string.go @@ -18,8 +18,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SubjectDNCountryNotPrintableString struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_not_printable_characters.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_not_printable_characters.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_not_printable_characters.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_not_printable_characters.go index 5cda59b484..c6347f8dea 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_not_printable_characters.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_not_printable_characters.go @@ -19,8 +19,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectDNNotPrintableCharacters struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_serial_number_max_length.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_serial_number_max_length.go similarity index 95% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_serial_number_max_length.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_serial_number_max_length.go index e58e9149c1..5bece9db84 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_serial_number_max_length.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_serial_number_max_length.go @@ -18,8 +18,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SubjectDNSerialNumberMaxLength struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_serial_number_not_printable_string.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_serial_number_not_printable_string.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_serial_number_not_printable_string.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_serial_number_not_printable_string.go index 9a2279c1ca..e399f29eb5 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_dn_serial_number_not_printable_string.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_dn_serial_number_not_printable_string.go @@ -18,8 +18,8 @@ import ( "encoding/asn1" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type SubjectDNSerialNumberNotPrintableString struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_email_max_length.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_email_max_length.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_email_max_length.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_email_max_length.go index 7eb69589ec..db202988eb 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_email_max_length.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_email_max_length.go @@ -32,8 +32,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectEmailMaxLength struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_empty_without_san.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_empty_without_san.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_empty_without_san.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_empty_without_san.go index 7cb963707b..b979939d34 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_empty_without_san.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_empty_without_san.go @@ -29,8 +29,8 @@ subjectAltName extension as non-critical. import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type emptyWithoutSAN struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_given_name_max_length.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_given_name_max_length.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_given_name_max_length.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_given_name_max_length.go index 48d5bc2c9f..f8ba75da23 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_given_name_max_length.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_given_name_max_length.go @@ -26,8 +26,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectGivenNameMaxLength struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_info_access_marked_critical.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_info_access_marked_critical.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_info_access_marked_critical.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_info_access_marked_critical.go index 66ddc33e51..902ba03579 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_info_access_marked_critical.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_info_access_marked_critical.go @@ -20,8 +20,8 @@ The subject information access extension indicates how to access information and import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type siaCrit struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_locality_name_max_length.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_locality_name_max_length.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_locality_name_max_length.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_locality_name_max_length.go index 897e254a3a..aecddddf4c 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_locality_name_max_length.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_locality_name_max_length.go @@ -25,8 +25,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectLocalityNameMaxLength struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_not_dn.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_not_dn.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_not_dn.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_not_dn.go index 670d01e4d2..8ddff771fe 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_not_dn.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_not_dn.go @@ -28,8 +28,8 @@ import ( "github.com/zmap/zcrypto/x509" "github.com/zmap/zcrypto/x509/pkix" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectDN struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_organization_name_max_length.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_organization_name_max_length.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_organization_name_max_length.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_organization_name_max_length.go index 618587e5bb..5190d2dadd 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_organization_name_max_length.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_organization_name_max_length.go @@ -25,8 +25,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectOrganizationNameMaxLength struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_organizational_unit_name_max_length.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_organizational_unit_name_max_length.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_organizational_unit_name_max_length.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_organizational_unit_name_max_length.go index e2bf5009d7..d6fc8bc1b3 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_organizational_unit_name_max_length.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_organizational_unit_name_max_length.go @@ -25,8 +25,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectOrganizationalUnitNameMaxLength struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_postal_code_max_length.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_postal_code_max_length.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_postal_code_max_length.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_postal_code_max_length.go index c75f19e630..2b82c8eabe 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_postal_code_max_length.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_postal_code_max_length.go @@ -26,8 +26,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectPostalCodeMaxLength struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_printable_string_badalpha.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_printable_string_badalpha.go similarity index 98% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_printable_string_badalpha.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_printable_string_badalpha.go index 63810a712a..66a50dcef1 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_printable_string_badalpha.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_printable_string_badalpha.go @@ -21,8 +21,8 @@ import ( "regexp" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) var ( diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_state_name_max_length.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_state_name_max_length.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_state_name_max_length.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_state_name_max_length.go index ce7dacf413..6c3cac5da5 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_state_name_max_length.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_state_name_max_length.go @@ -25,8 +25,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectStateNameMaxLength struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_street_address_max_length.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_street_address_max_length.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_street_address_max_length.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_street_address_max_length.go index 8ca92605d6..c794d2860f 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_street_address_max_length.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_street_address_max_length.go @@ -24,8 +24,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectStreetAddressMaxLength struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_surname_max_length.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_surname_max_length.go similarity index 96% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_surname_max_length.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_surname_max_length.go index 58f1c0f75c..0eeb94b899 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_subject_surname_max_length.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_subject_surname_max_length.go @@ -26,8 +26,8 @@ import ( "unicode/utf8" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type subjectSurnameMaxLength struct{} diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_tbs_signature_alg_matches_cert_signature_alg.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_tbs_signature_alg_matches_cert_signature_alg.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_tbs_signature_alg_matches_cert_signature_alg.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_tbs_signature_alg_matches_cert_signature_alg.go index a8fd8c6660..2219913027 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_tbs_signature_alg_matches_cert_signature_alg.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_tbs_signature_alg_matches_cert_signature_alg.go @@ -25,8 +25,8 @@ import ( "bytes" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" "golang.org/x/crypto/cryptobyte" cryptobyte_asn1 "golang.org/x/crypto/cryptobyte/asn1" ) diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_tbs_signature_rsa_encryption_parameter_not_null.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_tbs_signature_rsa_encryption_parameter_not_null.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_tbs_signature_rsa_encryption_parameter_not_null.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_tbs_signature_rsa_encryption_parameter_not_null.go index 4b62b5619d..dba57a4e82 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_tbs_signature_rsa_encryption_parameter_not_null.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_tbs_signature_rsa_encryption_parameter_not_null.go @@ -23,8 +23,8 @@ import ( "fmt" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" "golang.org/x/crypto/cryptobyte" cryptobyte_asn1 "golang.org/x/crypto/cryptobyte/asn1" ) diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_utc_time_does_not_include_seconds.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_utc_time_does_not_include_seconds.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_utc_time_does_not_include_seconds.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_utc_time_does_not_include_seconds.go index 83aa0ee92b..45ba28a42b 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_utc_time_does_not_include_seconds.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_utc_time_does_not_include_seconds.go @@ -34,8 +34,8 @@ systems MUST interpret the year field (YY) as follows: import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type utcNoSecond struct { diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_utc_time_not_in_zulu.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_utc_time_not_in_zulu.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_utc_time_not_in_zulu.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_utc_time_not_in_zulu.go index 6a7e735729..2b320579fe 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_utc_time_not_in_zulu.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_utc_time_not_in_zulu.go @@ -37,8 +37,8 @@ import ( "time" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type utcTimeGMT struct { diff --git a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_wrong_time_format_pre2050.go b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_wrong_time_format_pre2050.go similarity index 97% rename from vendor/github.com/zmap/zlint/v2/lints/rfc/lint_wrong_time_format_pre2050.go rename to vendor/github.com/zmap/zlint/v3/lints/rfc/lint_wrong_time_format_pre2050.go index f543c3a387..d5d04c2c84 100644 --- a/vendor/github.com/zmap/zlint/v2/lints/rfc/lint_wrong_time_format_pre2050.go +++ b/vendor/github.com/zmap/zlint/v3/lints/rfc/lint_wrong_time_format_pre2050.go @@ -27,8 +27,8 @@ import ( "time" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - "github.com/zmap/zlint/v2/util" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" ) type generalizedPre2050 struct{} diff --git a/vendor/github.com/zmap/zlint/v2/makefile b/vendor/github.com/zmap/zlint/v3/makefile similarity index 100% rename from vendor/github.com/zmap/zlint/v2/makefile rename to vendor/github.com/zmap/zlint/v3/makefile diff --git a/vendor/github.com/zmap/zlint/v2/newLint.sh b/vendor/github.com/zmap/zlint/v3/newLint.sh similarity index 100% rename from vendor/github.com/zmap/zlint/v2/newLint.sh rename to vendor/github.com/zmap/zlint/v3/newLint.sh diff --git a/vendor/github.com/zmap/zlint/v2/resultset.go b/vendor/github.com/zmap/zlint/v3/resultset.go similarity index 98% rename from vendor/github.com/zmap/zlint/v2/resultset.go rename to vendor/github.com/zmap/zlint/v3/resultset.go index bb3a7533f1..6d89571d22 100644 --- a/vendor/github.com/zmap/zlint/v2/resultset.go +++ b/vendor/github.com/zmap/zlint/v3/resultset.go @@ -16,7 +16,7 @@ package zlint import ( "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" + "github.com/zmap/zlint/v3/lint" ) // ResultSet contains the output of running all lints in a registry against diff --git a/vendor/github.com/zmap/zlint/v2/template b/vendor/github.com/zmap/zlint/v3/template similarity index 100% rename from vendor/github.com/zmap/zlint/v2/template rename to vendor/github.com/zmap/zlint/v3/template diff --git a/vendor/github.com/zmap/zlint/v2/util/algorithm_identifier.go b/vendor/github.com/zmap/zlint/v3/util/algorithm_identifier.go similarity index 99% rename from vendor/github.com/zmap/zlint/v2/util/algorithm_identifier.go rename to vendor/github.com/zmap/zlint/v3/util/algorithm_identifier.go index 1a3586fb10..07df3a4e9d 100644 --- a/vendor/github.com/zmap/zlint/v2/util/algorithm_identifier.go +++ b/vendor/github.com/zmap/zlint/v3/util/algorithm_identifier.go @@ -11,13 +11,13 @@ import ( cryptobyte_asn1 "golang.org/x/crypto/cryptobyte/asn1" ) -// additional OIDs not provided by the x509 package +// additional OIDs not provided by the x509 package. var ( // 1.2.840.10045.4.3.1 is SHA224withECDSA OidSignatureSHA224withECDSA = asn1.ObjectIdentifier{1, 2, 840, 10045, 4, 3, 1} ) -// RSAAlgorithmIDToDER contains DER representations of pkix.AlgorithmIdentifier for different RSA OIDs with Parameters as asn1.NULL +// RSAAlgorithmIDToDER contains DER representations of pkix.AlgorithmIdentifier for different RSA OIDs with Parameters as asn1.NULL. var RSAAlgorithmIDToDER = map[string][]byte{ // rsaEncryption "1.2.840.113549.1.1.1": {0x30, 0x0d, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x1, 0x1, 0x5, 0x0}, @@ -38,7 +38,7 @@ var RSAAlgorithmIDToDER = map[string][]byte{ } // CheckAlgorithmIDParamNotNULL parses an AlgorithmIdentifier with algorithm OID rsaEncryption to check the Param field is asn1.NULL -// Expects DER-encoded AlgorithmIdentifier including tag and length +// Expects DER-encoded AlgorithmIdentifier including tag and length. func CheckAlgorithmIDParamNotNULL(algorithmIdentifier []byte, requiredAlgoID asn1.ObjectIdentifier) error { expectedAlgoIDBytes, ok := RSAAlgorithmIDToDER[requiredAlgoID.String()] if !ok { diff --git a/vendor/github.com/zmap/zlint/v2/util/ca.go b/vendor/github.com/zmap/zlint/v3/util/ca.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/ca.go rename to vendor/github.com/zmap/zlint/v3/util/ca.go diff --git a/vendor/github.com/zmap/zlint/v2/util/countries.go b/vendor/github.com/zmap/zlint/v3/util/countries.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/countries.go rename to vendor/github.com/zmap/zlint/v3/util/countries.go diff --git a/vendor/github.com/zmap/zlint/v2/util/eku.go b/vendor/github.com/zmap/zlint/v3/util/eku.go similarity index 73% rename from vendor/github.com/zmap/zlint/v2/util/eku.go rename to vendor/github.com/zmap/zlint/v3/util/eku.go index 0f690808dc..9b2b53695f 100644 --- a/vendor/github.com/zmap/zlint/v2/util/eku.go +++ b/vendor/github.com/zmap/zlint/v3/util/eku.go @@ -2,7 +2,7 @@ package util import "github.com/zmap/zcrypto/x509" -// HasEKU tests whether an EKU is present in a certificate. +// HasEKU tests whether an Extended Key Usage (EKU) is present in a certificate. func HasEKU(cert *x509.Certificate, eku x509.ExtKeyUsage) bool { for _, currentEku := range cert.ExtKeyUsage { if currentEku == eku { diff --git a/vendor/github.com/zmap/zlint/v2/util/encodings.go b/vendor/github.com/zmap/zlint/v3/util/encodings.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/encodings.go rename to vendor/github.com/zmap/zlint/v3/util/encodings.go diff --git a/vendor/github.com/zmap/zlint/v2/util/ev.go b/vendor/github.com/zmap/zlint/v3/util/ev.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/ev.go rename to vendor/github.com/zmap/zlint/v3/util/ev.go diff --git a/vendor/github.com/zmap/zlint/v2/util/fqdn.go b/vendor/github.com/zmap/zlint/v3/util/fqdn.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/fqdn.go rename to vendor/github.com/zmap/zlint/v3/util/fqdn.go diff --git a/vendor/github.com/zmap/zlint/v2/util/gtld.go b/vendor/github.com/zmap/zlint/v3/util/gtld.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/gtld.go rename to vendor/github.com/zmap/zlint/v3/util/gtld.go diff --git a/vendor/github.com/zmap/zlint/v2/util/gtld_map.go b/vendor/github.com/zmap/zlint/v3/util/gtld_map.go similarity index 99% rename from vendor/github.com/zmap/zlint/v2/util/gtld_map.go rename to vendor/github.com/zmap/zlint/v3/util/gtld_map.go index d653325c37..86369c670c 100644 --- a/vendor/github.com/zmap/zlint/v2/util/gtld_map.go +++ b/vendor/github.com/zmap/zlint/v3/util/gtld_map.go @@ -3301,7 +3301,7 @@ var tldMap = map[string]GTLDPeriod{ "jcp": { GTLD: "jcp", DelegationDate: "2016-03-30", - RemovalDate: "", + RemovalDate: "2020-11-20", }, "je": { GTLD: "je", @@ -5888,6 +5888,11 @@ var tldMap = map[string]GTLDPeriod{ DelegationDate: "2014-04-19", RemovalDate: "", }, + "spa": { + GTLD: "spa", + DelegationDate: "2020-10-17", + RemovalDate: "", + }, "space": { GTLD: "space", DelegationDate: "2014-05-30", diff --git a/vendor/github.com/zmap/zlint/v2/util/ip.go b/vendor/github.com/zmap/zlint/v3/util/ip.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/ip.go rename to vendor/github.com/zmap/zlint/v3/util/ip.go diff --git a/vendor/github.com/zmap/zlint/v2/util/ku.go b/vendor/github.com/zmap/zlint/v3/util/ku.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/ku.go rename to vendor/github.com/zmap/zlint/v3/util/ku.go diff --git a/vendor/github.com/zmap/zlint/v2/util/names.go b/vendor/github.com/zmap/zlint/v3/util/names.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/names.go rename to vendor/github.com/zmap/zlint/v3/util/names.go diff --git a/vendor/github.com/zmap/zlint/v2/util/oid.go b/vendor/github.com/zmap/zlint/v3/util/oid.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/oid.go rename to vendor/github.com/zmap/zlint/v3/util/oid.go diff --git a/vendor/github.com/zmap/zlint/v2/util/primes.go b/vendor/github.com/zmap/zlint/v3/util/primes.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/primes.go rename to vendor/github.com/zmap/zlint/v3/util/primes.go diff --git a/vendor/github.com/zmap/zlint/v2/util/qc_stmt.go b/vendor/github.com/zmap/zlint/v3/util/qc_stmt.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/qc_stmt.go rename to vendor/github.com/zmap/zlint/v3/util/qc_stmt.go diff --git a/vendor/github.com/zmap/zlint/v2/util/rdn.go b/vendor/github.com/zmap/zlint/v3/util/rdn.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/rdn.go rename to vendor/github.com/zmap/zlint/v3/util/rdn.go diff --git a/vendor/github.com/zmap/zlint/v2/util/time.go b/vendor/github.com/zmap/zlint/v3/util/time.go similarity index 100% rename from vendor/github.com/zmap/zlint/v2/util/time.go rename to vendor/github.com/zmap/zlint/v3/util/time.go diff --git a/vendor/github.com/zmap/zlint/v2/zlint.go b/vendor/github.com/zmap/zlint/v3/zlint.go similarity index 85% rename from vendor/github.com/zmap/zlint/v2/zlint.go rename to vendor/github.com/zmap/zlint/v3/zlint.go index 142c10c01e..7cfc1f41d5 100644 --- a/vendor/github.com/zmap/zlint/v2/zlint.go +++ b/vendor/github.com/zmap/zlint/v3/zlint.go @@ -20,14 +20,14 @@ import ( "time" "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/v2/lint" - _ "github.com/zmap/zlint/v2/lints/apple" - _ "github.com/zmap/zlint/v2/lints/cabf_br" - _ "github.com/zmap/zlint/v2/lints/cabf_ev" - _ "github.com/zmap/zlint/v2/lints/community" - _ "github.com/zmap/zlint/v2/lints/etsi" - _ "github.com/zmap/zlint/v2/lints/mozilla" - _ "github.com/zmap/zlint/v2/lints/rfc" + "github.com/zmap/zlint/v3/lint" + _ "github.com/zmap/zlint/v3/lints/apple" + _ "github.com/zmap/zlint/v3/lints/cabf_br" + _ "github.com/zmap/zlint/v3/lints/cabf_ev" + _ "github.com/zmap/zlint/v3/lints/community" + _ "github.com/zmap/zlint/v3/lints/etsi" + _ "github.com/zmap/zlint/v3/lints/mozilla" + _ "github.com/zmap/zlint/v3/lints/rfc" ) const Version int64 = 3 diff --git a/vendor/golang.org/x/sys/unix/README.md b/vendor/golang.org/x/sys/unix/README.md index 579d2d7355..474efad0e0 100644 --- a/vendor/golang.org/x/sys/unix/README.md +++ b/vendor/golang.org/x/sys/unix/README.md @@ -76,7 +76,7 @@ arguments can be passed to the kernel. The third is for low-level use by the ForkExec wrapper. Unlike the first two, it does not call into the scheduler to let it know that a system call is running. -When porting Go to an new architecture/OS, this file must be implemented for +When porting Go to a new architecture/OS, this file must be implemented for each GOOS/GOARCH pair. ### mksysnum @@ -107,7 +107,7 @@ prototype can be exported (capitalized) or not. Adding a new syscall often just requires adding a new `//sys` function prototype with the desired arguments and a capitalized name so it is exported. However, if you want the interface to the syscall to be different, often one will make an -unexported `//sys` prototype, an then write a custom wrapper in +unexported `//sys` prototype, and then write a custom wrapper in `syscall_${GOOS}.go`. ### types files @@ -137,7 +137,7 @@ some `#if/#elif` macros in your include statements. This script is used to generate the system's various constants. This doesn't just include the error numbers and error strings, but also the signal numbers -an a wide variety of miscellaneous constants. The constants come from the list +and a wide variety of miscellaneous constants. The constants come from the list of include files in the `includes_${uname}` variable. A regex then picks out the desired `#define` statements, and generates the corresponding Go constants. The error numbers and strings are generated from `#include `, and the diff --git a/vendor/golang.org/x/sys/unix/asm_bsd_386.s b/vendor/golang.org/x/sys/unix/asm_bsd_386.s index 7f29275fa0..e0fcd9b3de 100644 --- a/vendor/golang.org/x/sys/unix/asm_bsd_386.s +++ b/vendor/golang.org/x/sys/unix/asm_bsd_386.s @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build (darwin || freebsd || netbsd || openbsd) && gc -// +build darwin freebsd netbsd openbsd +//go:build (freebsd || netbsd || openbsd) && gc +// +build freebsd netbsd openbsd // +build gc #include "textflag.h" diff --git a/vendor/golang.org/x/sys/unix/asm_bsd_arm.s b/vendor/golang.org/x/sys/unix/asm_bsd_arm.s index 98ebfad9d5..d702d4adc7 100644 --- a/vendor/golang.org/x/sys/unix/asm_bsd_arm.s +++ b/vendor/golang.org/x/sys/unix/asm_bsd_arm.s @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build (darwin || freebsd || netbsd || openbsd) && gc -// +build darwin freebsd netbsd openbsd +//go:build (freebsd || netbsd || openbsd) && gc +// +build freebsd netbsd openbsd // +build gc #include "textflag.h" diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh index 007358af8f..6e6afcaa1d 100644 --- a/vendor/golang.org/x/sys/unix/mkerrors.sh +++ b/vendor/golang.org/x/sys/unix/mkerrors.sh @@ -239,6 +239,7 @@ struct ltchars { #include #include #include +#include #include #include #include @@ -258,6 +259,7 @@ struct ltchars { #include #include +#include #include #if defined(__sparc__) @@ -501,6 +503,9 @@ ccflags="$@" $2 ~ /^LO_(KEY|NAME)_SIZE$/ || $2 ~ /^LOOP_(CLR|CTL|GET|SET)_/ || $2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|TCP|MCAST|EVFILT|NOTE|SHUT|PROT|MAP|MFD|T?PACKET|MSG|SCM|MCL|DT|MADV|PR|LOCAL)_/ || + $2 ~ /^NFC_(GENL|PROTO|COMM|RF|SE|DIRECTION|LLCP|SOCKPROTO)_/ || + $2 ~ /^NFC_.*_(MAX)?SIZE$/ || + $2 ~ /^RAW_PAYLOAD_/ || $2 ~ /^TP_STATUS_/ || $2 ~ /^FALLOC_/ || $2 ~ /^ICMPV?6?_(FILTER|SEC)/ || @@ -558,6 +563,7 @@ ccflags="$@" $2 ~ /^KEYCTL_/ || $2 ~ /^PERF_/ || $2 ~ /^SECCOMP_MODE_/ || + $2 ~ /^SEEK_/ || $2 ~ /^SPLICE_/ || $2 ~ /^SYNC_FILE_RANGE_/ || $2 !~ /^AUDIT_RECORD_MAGIC/ && @@ -593,6 +599,9 @@ ccflags="$@" $2 == "HID_MAX_DESCRIPTOR_SIZE" || $2 ~ /^_?HIDIOC/ || $2 ~ /^BUS_(USB|HIL|BLUETOOTH|VIRTUAL)$/ || + $2 ~ /^MTD/ || + $2 ~ /^OTP/ || + $2 ~ /^MEM/ || $2 ~ /^BLK[A-Z]*(GET$|SET$|BUF$|PART$|SIZE)/ {printf("\t%s = C.%s\n", $2, $2)} $2 ~ /^__WCOREFLAG$/ {next} $2 ~ /^__W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", substr($2,3), $2)} diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go index 2dd7c8e34a..41b91fdfba 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux.go @@ -904,6 +904,46 @@ func (sa *SockaddrIUCV) sockaddr() (unsafe.Pointer, _Socklen, error) { return unsafe.Pointer(&sa.raw), SizeofSockaddrIUCV, nil } +type SockaddrNFC struct { + DeviceIdx uint32 + TargetIdx uint32 + NFCProtocol uint32 + raw RawSockaddrNFC +} + +func (sa *SockaddrNFC) sockaddr() (unsafe.Pointer, _Socklen, error) { + sa.raw.Sa_family = AF_NFC + sa.raw.Dev_idx = sa.DeviceIdx + sa.raw.Target_idx = sa.TargetIdx + sa.raw.Nfc_protocol = sa.NFCProtocol + return unsafe.Pointer(&sa.raw), SizeofSockaddrNFC, nil +} + +type SockaddrNFCLLCP struct { + DeviceIdx uint32 + TargetIdx uint32 + NFCProtocol uint32 + DestinationSAP uint8 + SourceSAP uint8 + ServiceName string + raw RawSockaddrNFCLLCP +} + +func (sa *SockaddrNFCLLCP) sockaddr() (unsafe.Pointer, _Socklen, error) { + sa.raw.Sa_family = AF_NFC + sa.raw.Dev_idx = sa.DeviceIdx + sa.raw.Target_idx = sa.TargetIdx + sa.raw.Nfc_protocol = sa.NFCProtocol + sa.raw.Dsap = sa.DestinationSAP + sa.raw.Ssap = sa.SourceSAP + if len(sa.ServiceName) > len(sa.raw.Service_name) { + return nil, 0, EINVAL + } + copy(sa.raw.Service_name[:], sa.ServiceName) + sa.raw.SetServiceNameLen(len(sa.ServiceName)) + return unsafe.Pointer(&sa.raw), SizeofSockaddrNFCLLCP, nil +} + var socketProtocol = func(fd int) (int, error) { return GetsockoptInt(fd, SOL_SOCKET, SO_PROTOCOL) } @@ -1144,6 +1184,37 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) { } return sa, nil } + case AF_NFC: + proto, err := socketProtocol(fd) + if err != nil { + return nil, err + } + switch proto { + case NFC_SOCKPROTO_RAW: + pp := (*RawSockaddrNFC)(unsafe.Pointer(rsa)) + sa := &SockaddrNFC{ + DeviceIdx: pp.Dev_idx, + TargetIdx: pp.Target_idx, + NFCProtocol: pp.Nfc_protocol, + } + return sa, nil + case NFC_SOCKPROTO_LLCP: + pp := (*RawSockaddrNFCLLCP)(unsafe.Pointer(rsa)) + if uint64(pp.Service_name_len) > uint64(len(pp.Service_name)) { + return nil, EINVAL + } + sa := &SockaddrNFCLLCP{ + DeviceIdx: pp.Dev_idx, + TargetIdx: pp.Target_idx, + NFCProtocol: pp.Nfc_protocol, + DestinationSAP: pp.Dsap, + SourceSAP: pp.Ssap, + ServiceName: string(pp.Service_name[:pp.Service_name_len]), + } + return sa, nil + default: + return nil, EINVAL + } } return nil, EAFNOSUPPORT } diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_386.go index 7b52e5d8a4..b430536c8a 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_386.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_386.go @@ -378,6 +378,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint32(length) } +func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) { + rsa.Service_name_len = uint32(length) +} + //sys poll(fds *PollFd, nfds int, timeout int) (n int, err error) func Poll(fds []PollFd, timeout int) (n int, err error) { diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go index 28b7641152..85cd97da09 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go @@ -172,6 +172,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint64(length) } +func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) { + rsa.Service_name_len = uint64(length) +} + //sys poll(fds *PollFd, nfds int, timeout int) (n int, err error) func Poll(fds []PollFd, timeout int) (n int, err error) { diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go index 68877728ec..39a864d4e9 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go @@ -256,6 +256,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint32(length) } +func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) { + rsa.Service_name_len = uint32(length) +} + //sys poll(fds *PollFd, nfds int, timeout int) (n int, err error) func Poll(fds []PollFd, timeout int) (n int, err error) { diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go index 7ed7034761..7f27ebf2fc 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go @@ -207,6 +207,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint64(length) } +func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) { + rsa.Service_name_len = uint64(length) +} + func InotifyInit() (fd int, err error) { return InotifyInit1(0) } diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go index 06dec06fa1..27aee81d97 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go @@ -217,6 +217,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint64(length) } +func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) { + rsa.Service_name_len = uint64(length) +} + func InotifyInit() (fd int, err error) { return InotifyInit1(0) } diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go index 8f0d0a5b59..3a5621e37f 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go @@ -229,6 +229,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint32(length) } +func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) { + rsa.Service_name_len = uint32(length) +} + //sys poll(fds *PollFd, nfds int, timeout int) (n int, err error) func Poll(fds []PollFd, timeout int) (n int, err error) { diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go index 7e65e088d2..cf0d36f76e 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go @@ -215,6 +215,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint32(length) } +func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) { + rsa.Service_name_len = uint32(length) +} + //sysnb pipe(p *[2]_C_int) (err error) func Pipe(p []int) (err error) { diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go index 0b1f0d6da5..5259a5feaf 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go @@ -100,6 +100,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint64(length) } +func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) { + rsa.Service_name_len = uint64(length) +} + //sysnb pipe(p *[2]_C_int) (err error) func Pipe(p []int) (err error) { diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go index ce9bcd3171..8ef821e5da 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go @@ -188,6 +188,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint64(length) } +func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) { + rsa.Service_name_len = uint64(length) +} + func InotifyInit() (fd int, err error) { return InotifyInit1(0) } diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go index a1e45694b4..a1c0574b58 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go @@ -129,6 +129,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint64(length) } +func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) { + rsa.Service_name_len = uint64(length) +} + // Linux on s390x uses the old mmap interface, which requires arguments to be passed in a struct. // mmap2 also requires arguments to be passed in a struct; it is currently not exposed in . func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) { diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go index 49055a3cf5..de14b88983 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go @@ -116,6 +116,10 @@ func (cmsg *Cmsghdr) SetLen(length int) { cmsg.Len = uint64(length) } +func (rsa *RawSockaddrNFCLLCP) SetServiceNameLen(length int) { + rsa.Service_name_len = uint64(length) +} + //sysnb pipe(p *[2]_C_int) (err error) func Pipe(p []int) (err error) { diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go index 991996b609..5bb48ef54e 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go @@ -1262,6 +1262,11 @@ const ( SCM_RIGHTS = 0x1 SCM_TIMESTAMP = 0x2 SCM_TIMESTAMP_MONOTONIC = 0x4 + SEEK_CUR = 0x1 + SEEK_DATA = 0x4 + SEEK_END = 0x2 + SEEK_HOLE = 0x3 + SEEK_SET = 0x0 SHUT_RD = 0x0 SHUT_RDWR = 0x2 SHUT_WR = 0x1 diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go index e644eaf5e7..11e5709797 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go @@ -1262,6 +1262,11 @@ const ( SCM_RIGHTS = 0x1 SCM_TIMESTAMP = 0x2 SCM_TIMESTAMP_MONOTONIC = 0x4 + SEEK_CUR = 0x1 + SEEK_DATA = 0x4 + SEEK_END = 0x2 + SEEK_HOLE = 0x3 + SEEK_SET = 0x0 SHUT_RD = 0x0 SHUT_RDWR = 0x2 SHUT_WR = 0x1 diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go index 9c7c5e1654..440900112c 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go +++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go @@ -1297,6 +1297,11 @@ const ( SCM_RIGHTS = 0x1 SCM_TIMESTAMP = 0x2 SCM_TIME_INFO = 0x7 + SEEK_CUR = 0x1 + SEEK_DATA = 0x3 + SEEK_END = 0x2 + SEEK_HOLE = 0x4 + SEEK_SET = 0x0 SHUT_RD = 0x0 SHUT_RDWR = 0x2 SHUT_WR = 0x1 diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go index b265abb25f..64520d3122 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go @@ -1298,6 +1298,11 @@ const ( SCM_RIGHTS = 0x1 SCM_TIMESTAMP = 0x2 SCM_TIME_INFO = 0x7 + SEEK_CUR = 0x1 + SEEK_DATA = 0x3 + SEEK_END = 0x2 + SEEK_HOLE = 0x4 + SEEK_SET = 0x0 SHUT_RD = 0x0 SHUT_RDWR = 0x2 SHUT_WR = 0x1 diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go index 3df99f285f..99e9a0e06e 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go +++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go @@ -1276,6 +1276,11 @@ const ( SCM_CREDS = 0x3 SCM_RIGHTS = 0x1 SCM_TIMESTAMP = 0x2 + SEEK_CUR = 0x1 + SEEK_DATA = 0x3 + SEEK_END = 0x2 + SEEK_HOLE = 0x4 + SEEK_SET = 0x0 SHUT_RD = 0x0 SHUT_RDWR = 0x2 SHUT_WR = 0x1 diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go index 218d39906d..4c83771149 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go @@ -1298,6 +1298,11 @@ const ( SCM_RIGHTS = 0x1 SCM_TIMESTAMP = 0x2 SCM_TIME_INFO = 0x7 + SEEK_CUR = 0x1 + SEEK_DATA = 0x3 + SEEK_END = 0x2 + SEEK_HOLE = 0x4 + SEEK_SET = 0x0 SHUT_RD = 0x0 SHUT_RDWR = 0x2 SHUT_WR = 0x1 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go index 47572aaa69..52f5bbc14c 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go @@ -1406,6 +1406,10 @@ const ( MCAST_LEAVE_SOURCE_GROUP = 0x2f MCAST_MSFILTER = 0x30 MCAST_UNBLOCK_SOURCE = 0x2c + MEMGETREGIONINFO = 0xc0104d08 + MEMREADOOB64 = 0xc0184d16 + MEMWRITE = 0xc0304d18 + MEMWRITEOOB64 = 0xc0184d15 MFD_ALLOW_SEALING = 0x2 MFD_CLOEXEC = 0x1 MFD_HUGETLB = 0x4 @@ -1494,7 +1498,35 @@ const ( MS_SYNCHRONOUS = 0x10 MS_UNBINDABLE = 0x20000 MS_VERBOSE = 0x8000 + MTD_ABSENT = 0x0 + MTD_BIT_WRITEABLE = 0x800 + MTD_CAP_NANDFLASH = 0x400 + MTD_CAP_NORFLASH = 0xc00 + MTD_CAP_NVRAM = 0x1c00 + MTD_CAP_RAM = 0x1c00 + MTD_CAP_ROM = 0x0 + MTD_DATAFLASH = 0x6 MTD_INODE_FS_MAGIC = 0x11307854 + MTD_MAX_ECCPOS_ENTRIES = 0x40 + MTD_MAX_OOBFREE_ENTRIES = 0x8 + MTD_MLCNANDFLASH = 0x8 + MTD_NANDECC_AUTOPLACE = 0x2 + MTD_NANDECC_AUTOPL_USR = 0x4 + MTD_NANDECC_OFF = 0x0 + MTD_NANDECC_PLACE = 0x1 + MTD_NANDECC_PLACEONLY = 0x3 + MTD_NANDFLASH = 0x4 + MTD_NORFLASH = 0x3 + MTD_NO_ERASE = 0x1000 + MTD_OTP_FACTORY = 0x1 + MTD_OTP_OFF = 0x0 + MTD_OTP_USER = 0x2 + MTD_POWERUP_LOCK = 0x2000 + MTD_RAM = 0x1 + MTD_ROM = 0x2 + MTD_SLC_ON_MLC_EMULATION = 0x4000 + MTD_UBIVOLUME = 0x7 + MTD_WRITEABLE = 0x400 NAME_MAX = 0xff NCP_SUPER_MAGIC = 0x564c NETLINK_ADD_MEMBERSHIP = 0x1 @@ -1534,6 +1566,59 @@ const ( NETLINK_XFRM = 0x6 NETNSA_MAX = 0x5 NETNSA_NSID_NOT_ASSIGNED = -0x1 + NFC_ATR_REQ_GB_MAXSIZE = 0x30 + NFC_ATR_REQ_MAXSIZE = 0x40 + NFC_ATR_RES_GB_MAXSIZE = 0x2f + NFC_ATR_RES_MAXSIZE = 0x40 + NFC_COMM_ACTIVE = 0x0 + NFC_COMM_PASSIVE = 0x1 + NFC_DEVICE_NAME_MAXSIZE = 0x8 + NFC_DIRECTION_RX = 0x0 + NFC_DIRECTION_TX = 0x1 + NFC_FIRMWARE_NAME_MAXSIZE = 0x20 + NFC_GB_MAXSIZE = 0x30 + NFC_GENL_MCAST_EVENT_NAME = "events" + NFC_GENL_NAME = "nfc" + NFC_GENL_VERSION = 0x1 + NFC_HEADER_SIZE = 0x1 + NFC_ISO15693_UID_MAXSIZE = 0x8 + NFC_LLCP_MAX_SERVICE_NAME = 0x3f + NFC_LLCP_MIUX = 0x1 + NFC_LLCP_REMOTE_LTO = 0x3 + NFC_LLCP_REMOTE_MIU = 0x2 + NFC_LLCP_REMOTE_RW = 0x4 + NFC_LLCP_RW = 0x0 + NFC_NFCID1_MAXSIZE = 0xa + NFC_NFCID2_MAXSIZE = 0x8 + NFC_NFCID3_MAXSIZE = 0xa + NFC_PROTO_FELICA = 0x3 + NFC_PROTO_FELICA_MASK = 0x8 + NFC_PROTO_ISO14443 = 0x4 + NFC_PROTO_ISO14443_B = 0x6 + NFC_PROTO_ISO14443_B_MASK = 0x40 + NFC_PROTO_ISO14443_MASK = 0x10 + NFC_PROTO_ISO15693 = 0x7 + NFC_PROTO_ISO15693_MASK = 0x80 + NFC_PROTO_JEWEL = 0x1 + NFC_PROTO_JEWEL_MASK = 0x2 + NFC_PROTO_MAX = 0x8 + NFC_PROTO_MIFARE = 0x2 + NFC_PROTO_MIFARE_MASK = 0x4 + NFC_PROTO_NFC_DEP = 0x5 + NFC_PROTO_NFC_DEP_MASK = 0x20 + NFC_RAW_HEADER_SIZE = 0x2 + NFC_RF_INITIATOR = 0x0 + NFC_RF_NONE = 0x2 + NFC_RF_TARGET = 0x1 + NFC_SENSB_RES_MAXSIZE = 0xc + NFC_SENSF_RES_MAXSIZE = 0x12 + NFC_SE_DISABLED = 0x0 + NFC_SE_EMBEDDED = 0x2 + NFC_SE_ENABLED = 0x1 + NFC_SE_UICC = 0x1 + NFC_SOCKPROTO_LLCP = 0x1 + NFC_SOCKPROTO_MAX = 0x2 + NFC_SOCKPROTO_RAW = 0x0 NFNETLINK_V0 = 0x0 NFNLGRP_ACCT_QUOTA = 0x8 NFNLGRP_CONNTRACK_DESTROY = 0x3 @@ -1959,6 +2044,11 @@ const ( QNX4_SUPER_MAGIC = 0x2f QNX6_SUPER_MAGIC = 0x68191122 RAMFS_MAGIC = 0x858458f6 + RAW_PAYLOAD_DIGITAL = 0x3 + RAW_PAYLOAD_HCI = 0x2 + RAW_PAYLOAD_LLCP = 0x0 + RAW_PAYLOAD_NCI = 0x1 + RAW_PAYLOAD_PROPRIETARY = 0x4 RDTGROUP_SUPER_MAGIC = 0x7655821 REISERFS_SUPER_MAGIC = 0x52654973 RENAME_EXCHANGE = 0x2 @@ -2194,6 +2284,12 @@ const ( SECCOMP_MODE_FILTER = 0x2 SECCOMP_MODE_STRICT = 0x1 SECURITYFS_MAGIC = 0x73636673 + SEEK_CUR = 0x1 + SEEK_DATA = 0x3 + SEEK_END = 0x2 + SEEK_HOLE = 0x4 + SEEK_MAX = 0x4 + SEEK_SET = 0x0 SELINUX_MAGIC = 0xf97cff8c SHUT_RD = 0x0 SHUT_RDWR = 0x2 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go index e91a1a9579..09fc559ed2 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go @@ -60,6 +60,8 @@ const ( CS8 = 0x30 CSIZE = 0x30 CSTOPB = 0x40 + ECCGETLAYOUT = 0x81484d11 + ECCGETSTATS = 0x80104d12 ECHOCTL = 0x200 ECHOE = 0x10 ECHOK = 0x20 @@ -123,6 +125,19 @@ const ( MCL_CURRENT = 0x1 MCL_FUTURE = 0x2 MCL_ONFAULT = 0x4 + MEMERASE = 0x40084d02 + MEMERASE64 = 0x40104d14 + MEMGETBADBLOCK = 0x40084d0b + MEMGETINFO = 0x80204d01 + MEMGETOOBSEL = 0x80c84d0a + MEMGETREGIONCOUNT = 0x80044d07 + MEMISLOCKED = 0x80084d17 + MEMLOCK = 0x40084d05 + MEMREADOOB = 0xc00c4d04 + MEMSETBADBLOCK = 0x40084d0c + MEMUNLOCK = 0x40084d06 + MEMWRITEOOB = 0xc00c4d03 + MTDFILEMODE = 0x4d13 NFDBITS = 0x20 NLDLY = 0x100 NOFLSH = 0x80 @@ -132,6 +147,10 @@ const ( NS_GET_USERNS = 0xb701 OLCUC = 0x2 ONLCR = 0x4 + OTPGETREGIONCOUNT = 0x40044d0e + OTPGETREGIONINFO = 0x400c4d0f + OTPLOCK = 0x800c4d10 + OTPSELECT = 0x80044d0d O_APPEND = 0x400 O_ASYNC = 0x2000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go index a9cbac6443..75730cc22b 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go @@ -60,6 +60,8 @@ const ( CS8 = 0x30 CSIZE = 0x30 CSTOPB = 0x40 + ECCGETLAYOUT = 0x81484d11 + ECCGETSTATS = 0x80104d12 ECHOCTL = 0x200 ECHOE = 0x10 ECHOK = 0x20 @@ -123,6 +125,19 @@ const ( MCL_CURRENT = 0x1 MCL_FUTURE = 0x2 MCL_ONFAULT = 0x4 + MEMERASE = 0x40084d02 + MEMERASE64 = 0x40104d14 + MEMGETBADBLOCK = 0x40084d0b + MEMGETINFO = 0x80204d01 + MEMGETOOBSEL = 0x80c84d0a + MEMGETREGIONCOUNT = 0x80044d07 + MEMISLOCKED = 0x80084d17 + MEMLOCK = 0x40084d05 + MEMREADOOB = 0xc0104d04 + MEMSETBADBLOCK = 0x40084d0c + MEMUNLOCK = 0x40084d06 + MEMWRITEOOB = 0xc0104d03 + MTDFILEMODE = 0x4d13 NFDBITS = 0x40 NLDLY = 0x100 NOFLSH = 0x80 @@ -132,6 +147,10 @@ const ( NS_GET_USERNS = 0xb701 OLCUC = 0x2 ONLCR = 0x4 + OTPGETREGIONCOUNT = 0x40044d0e + OTPGETREGIONINFO = 0x400c4d0f + OTPLOCK = 0x800c4d10 + OTPSELECT = 0x80044d0d O_APPEND = 0x400 O_ASYNC = 0x2000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go index d74f3c15a1..127cf17add 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go @@ -60,6 +60,8 @@ const ( CS8 = 0x30 CSIZE = 0x30 CSTOPB = 0x40 + ECCGETLAYOUT = 0x81484d11 + ECCGETSTATS = 0x80104d12 ECHOCTL = 0x200 ECHOE = 0x10 ECHOK = 0x20 @@ -121,6 +123,19 @@ const ( MCL_CURRENT = 0x1 MCL_FUTURE = 0x2 MCL_ONFAULT = 0x4 + MEMERASE = 0x40084d02 + MEMERASE64 = 0x40104d14 + MEMGETBADBLOCK = 0x40084d0b + MEMGETINFO = 0x80204d01 + MEMGETOOBSEL = 0x80c84d0a + MEMGETREGIONCOUNT = 0x80044d07 + MEMISLOCKED = 0x80084d17 + MEMLOCK = 0x40084d05 + MEMREADOOB = 0xc00c4d04 + MEMSETBADBLOCK = 0x40084d0c + MEMUNLOCK = 0x40084d06 + MEMWRITEOOB = 0xc00c4d03 + MTDFILEMODE = 0x4d13 NFDBITS = 0x20 NLDLY = 0x100 NOFLSH = 0x80 @@ -130,6 +145,10 @@ const ( NS_GET_USERNS = 0xb701 OLCUC = 0x2 ONLCR = 0x4 + OTPGETREGIONCOUNT = 0x40044d0e + OTPGETREGIONINFO = 0x400c4d0f + OTPLOCK = 0x800c4d10 + OTPSELECT = 0x80044d0d O_APPEND = 0x400 O_ASYNC = 0x2000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go index e1538995b4..957ca1ff13 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go @@ -60,6 +60,8 @@ const ( CS8 = 0x30 CSIZE = 0x30 CSTOPB = 0x40 + ECCGETLAYOUT = 0x81484d11 + ECCGETSTATS = 0x80104d12 ECHOCTL = 0x200 ECHOE = 0x10 ECHOK = 0x20 @@ -124,6 +126,19 @@ const ( MCL_CURRENT = 0x1 MCL_FUTURE = 0x2 MCL_ONFAULT = 0x4 + MEMERASE = 0x40084d02 + MEMERASE64 = 0x40104d14 + MEMGETBADBLOCK = 0x40084d0b + MEMGETINFO = 0x80204d01 + MEMGETOOBSEL = 0x80c84d0a + MEMGETREGIONCOUNT = 0x80044d07 + MEMISLOCKED = 0x80084d17 + MEMLOCK = 0x40084d05 + MEMREADOOB = 0xc0104d04 + MEMSETBADBLOCK = 0x40084d0c + MEMUNLOCK = 0x40084d06 + MEMWRITEOOB = 0xc0104d03 + MTDFILEMODE = 0x4d13 NFDBITS = 0x40 NLDLY = 0x100 NOFLSH = 0x80 @@ -133,6 +148,10 @@ const ( NS_GET_USERNS = 0xb701 OLCUC = 0x2 ONLCR = 0x4 + OTPGETREGIONCOUNT = 0x40044d0e + OTPGETREGIONINFO = 0x400c4d0f + OTPLOCK = 0x800c4d10 + OTPSELECT = 0x80044d0d O_APPEND = 0x400 O_ASYNC = 0x2000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go index 5e8e71ff86..314a2054fc 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go @@ -60,6 +60,8 @@ const ( CS8 = 0x30 CSIZE = 0x30 CSTOPB = 0x40 + ECCGETLAYOUT = 0x41484d11 + ECCGETSTATS = 0x40104d12 ECHOCTL = 0x200 ECHOE = 0x10 ECHOK = 0x20 @@ -121,6 +123,19 @@ const ( MCL_CURRENT = 0x1 MCL_FUTURE = 0x2 MCL_ONFAULT = 0x4 + MEMERASE = 0x80084d02 + MEMERASE64 = 0x80104d14 + MEMGETBADBLOCK = 0x80084d0b + MEMGETINFO = 0x40204d01 + MEMGETOOBSEL = 0x40c84d0a + MEMGETREGIONCOUNT = 0x40044d07 + MEMISLOCKED = 0x40084d17 + MEMLOCK = 0x80084d05 + MEMREADOOB = 0xc00c4d04 + MEMSETBADBLOCK = 0x80084d0c + MEMUNLOCK = 0x80084d06 + MEMWRITEOOB = 0xc00c4d03 + MTDFILEMODE = 0x20004d13 NFDBITS = 0x20 NLDLY = 0x100 NOFLSH = 0x80 @@ -130,6 +145,10 @@ const ( NS_GET_USERNS = 0x2000b701 OLCUC = 0x2 ONLCR = 0x4 + OTPGETREGIONCOUNT = 0x80044d0e + OTPGETREGIONINFO = 0x800c4d0f + OTPLOCK = 0x400c4d10 + OTPSELECT = 0x40044d0d O_APPEND = 0x8 O_ASYNC = 0x1000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go index e670ee1481..457e8de97d 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go @@ -60,6 +60,8 @@ const ( CS8 = 0x30 CSIZE = 0x30 CSTOPB = 0x40 + ECCGETLAYOUT = 0x41484d11 + ECCGETSTATS = 0x40104d12 ECHOCTL = 0x200 ECHOE = 0x10 ECHOK = 0x20 @@ -121,6 +123,19 @@ const ( MCL_CURRENT = 0x1 MCL_FUTURE = 0x2 MCL_ONFAULT = 0x4 + MEMERASE = 0x80084d02 + MEMERASE64 = 0x80104d14 + MEMGETBADBLOCK = 0x80084d0b + MEMGETINFO = 0x40204d01 + MEMGETOOBSEL = 0x40c84d0a + MEMGETREGIONCOUNT = 0x40044d07 + MEMISLOCKED = 0x40084d17 + MEMLOCK = 0x80084d05 + MEMREADOOB = 0xc0104d04 + MEMSETBADBLOCK = 0x80084d0c + MEMUNLOCK = 0x80084d06 + MEMWRITEOOB = 0xc0104d03 + MTDFILEMODE = 0x20004d13 NFDBITS = 0x40 NLDLY = 0x100 NOFLSH = 0x80 @@ -130,6 +145,10 @@ const ( NS_GET_USERNS = 0x2000b701 OLCUC = 0x2 ONLCR = 0x4 + OTPGETREGIONCOUNT = 0x80044d0e + OTPGETREGIONINFO = 0x800c4d0f + OTPLOCK = 0x400c4d10 + OTPSELECT = 0x40044d0d O_APPEND = 0x8 O_ASYNC = 0x1000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go index dd11eacb81..33cd28f6bd 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go @@ -60,6 +60,8 @@ const ( CS8 = 0x30 CSIZE = 0x30 CSTOPB = 0x40 + ECCGETLAYOUT = 0x41484d11 + ECCGETSTATS = 0x40104d12 ECHOCTL = 0x200 ECHOE = 0x10 ECHOK = 0x20 @@ -121,6 +123,19 @@ const ( MCL_CURRENT = 0x1 MCL_FUTURE = 0x2 MCL_ONFAULT = 0x4 + MEMERASE = 0x80084d02 + MEMERASE64 = 0x80104d14 + MEMGETBADBLOCK = 0x80084d0b + MEMGETINFO = 0x40204d01 + MEMGETOOBSEL = 0x40c84d0a + MEMGETREGIONCOUNT = 0x40044d07 + MEMISLOCKED = 0x40084d17 + MEMLOCK = 0x80084d05 + MEMREADOOB = 0xc0104d04 + MEMSETBADBLOCK = 0x80084d0c + MEMUNLOCK = 0x80084d06 + MEMWRITEOOB = 0xc0104d03 + MTDFILEMODE = 0x20004d13 NFDBITS = 0x40 NLDLY = 0x100 NOFLSH = 0x80 @@ -130,6 +145,10 @@ const ( NS_GET_USERNS = 0x2000b701 OLCUC = 0x2 ONLCR = 0x4 + OTPGETREGIONCOUNT = 0x80044d0e + OTPGETREGIONINFO = 0x800c4d0f + OTPLOCK = 0x400c4d10 + OTPSELECT = 0x40044d0d O_APPEND = 0x8 O_ASYNC = 0x1000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go index a0a5b22ae9..0e085ba147 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go @@ -60,6 +60,8 @@ const ( CS8 = 0x30 CSIZE = 0x30 CSTOPB = 0x40 + ECCGETLAYOUT = 0x41484d11 + ECCGETSTATS = 0x40104d12 ECHOCTL = 0x200 ECHOE = 0x10 ECHOK = 0x20 @@ -121,6 +123,19 @@ const ( MCL_CURRENT = 0x1 MCL_FUTURE = 0x2 MCL_ONFAULT = 0x4 + MEMERASE = 0x80084d02 + MEMERASE64 = 0x80104d14 + MEMGETBADBLOCK = 0x80084d0b + MEMGETINFO = 0x40204d01 + MEMGETOOBSEL = 0x40c84d0a + MEMGETREGIONCOUNT = 0x40044d07 + MEMISLOCKED = 0x40084d17 + MEMLOCK = 0x80084d05 + MEMREADOOB = 0xc00c4d04 + MEMSETBADBLOCK = 0x80084d0c + MEMUNLOCK = 0x80084d06 + MEMWRITEOOB = 0xc00c4d03 + MTDFILEMODE = 0x20004d13 NFDBITS = 0x20 NLDLY = 0x100 NOFLSH = 0x80 @@ -130,6 +145,10 @@ const ( NS_GET_USERNS = 0x2000b701 OLCUC = 0x2 ONLCR = 0x4 + OTPGETREGIONCOUNT = 0x80044d0e + OTPGETREGIONINFO = 0x800c4d0f + OTPLOCK = 0x400c4d10 + OTPSELECT = 0x40044d0d O_APPEND = 0x8 O_ASYNC = 0x1000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go index d9530e5fbf..1b5928cffb 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go @@ -60,6 +60,8 @@ const ( CS8 = 0x300 CSIZE = 0x300 CSTOPB = 0x400 + ECCGETLAYOUT = 0x41484d11 + ECCGETSTATS = 0x40104d12 ECHOCTL = 0x40 ECHOE = 0x2 ECHOK = 0x4 @@ -121,6 +123,19 @@ const ( MCL_CURRENT = 0x2000 MCL_FUTURE = 0x4000 MCL_ONFAULT = 0x8000 + MEMERASE = 0x80084d02 + MEMERASE64 = 0x80104d14 + MEMGETBADBLOCK = 0x80084d0b + MEMGETINFO = 0x40204d01 + MEMGETOOBSEL = 0x40c84d0a + MEMGETREGIONCOUNT = 0x40044d07 + MEMISLOCKED = 0x40084d17 + MEMLOCK = 0x80084d05 + MEMREADOOB = 0xc00c4d04 + MEMSETBADBLOCK = 0x80084d0c + MEMUNLOCK = 0x80084d06 + MEMWRITEOOB = 0xc00c4d03 + MTDFILEMODE = 0x20004d13 NFDBITS = 0x20 NL2 = 0x200 NL3 = 0x300 @@ -132,6 +147,10 @@ const ( NS_GET_USERNS = 0x2000b701 OLCUC = 0x4 ONLCR = 0x2 + OTPGETREGIONCOUNT = 0x80044d0e + OTPGETREGIONINFO = 0x800c4d0f + OTPLOCK = 0x400c4d10 + OTPSELECT = 0x40044d0d O_APPEND = 0x400 O_ASYNC = 0x2000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go index e60102f6a9..f3a41d6ecb 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go @@ -60,6 +60,8 @@ const ( CS8 = 0x300 CSIZE = 0x300 CSTOPB = 0x400 + ECCGETLAYOUT = 0x41484d11 + ECCGETSTATS = 0x40104d12 ECHOCTL = 0x40 ECHOE = 0x2 ECHOK = 0x4 @@ -121,6 +123,19 @@ const ( MCL_CURRENT = 0x2000 MCL_FUTURE = 0x4000 MCL_ONFAULT = 0x8000 + MEMERASE = 0x80084d02 + MEMERASE64 = 0x80104d14 + MEMGETBADBLOCK = 0x80084d0b + MEMGETINFO = 0x40204d01 + MEMGETOOBSEL = 0x40c84d0a + MEMGETREGIONCOUNT = 0x40044d07 + MEMISLOCKED = 0x40084d17 + MEMLOCK = 0x80084d05 + MEMREADOOB = 0xc0104d04 + MEMSETBADBLOCK = 0x80084d0c + MEMUNLOCK = 0x80084d06 + MEMWRITEOOB = 0xc0104d03 + MTDFILEMODE = 0x20004d13 NFDBITS = 0x40 NL2 = 0x200 NL3 = 0x300 @@ -132,6 +147,10 @@ const ( NS_GET_USERNS = 0x2000b701 OLCUC = 0x4 ONLCR = 0x2 + OTPGETREGIONCOUNT = 0x80044d0e + OTPGETREGIONINFO = 0x800c4d0f + OTPLOCK = 0x400c4d10 + OTPSELECT = 0x40044d0d O_APPEND = 0x400 O_ASYNC = 0x2000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go index 838ff4ea6d..6a5a555d5e 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go @@ -60,6 +60,8 @@ const ( CS8 = 0x300 CSIZE = 0x300 CSTOPB = 0x400 + ECCGETLAYOUT = 0x41484d11 + ECCGETSTATS = 0x40104d12 ECHOCTL = 0x40 ECHOE = 0x2 ECHOK = 0x4 @@ -121,6 +123,19 @@ const ( MCL_CURRENT = 0x2000 MCL_FUTURE = 0x4000 MCL_ONFAULT = 0x8000 + MEMERASE = 0x80084d02 + MEMERASE64 = 0x80104d14 + MEMGETBADBLOCK = 0x80084d0b + MEMGETINFO = 0x40204d01 + MEMGETOOBSEL = 0x40c84d0a + MEMGETREGIONCOUNT = 0x40044d07 + MEMISLOCKED = 0x40084d17 + MEMLOCK = 0x80084d05 + MEMREADOOB = 0xc0104d04 + MEMSETBADBLOCK = 0x80084d0c + MEMUNLOCK = 0x80084d06 + MEMWRITEOOB = 0xc0104d03 + MTDFILEMODE = 0x20004d13 NFDBITS = 0x40 NL2 = 0x200 NL3 = 0x300 @@ -132,6 +147,10 @@ const ( NS_GET_USERNS = 0x2000b701 OLCUC = 0x4 ONLCR = 0x2 + OTPGETREGIONCOUNT = 0x80044d0e + OTPGETREGIONINFO = 0x800c4d0f + OTPLOCK = 0x400c4d10 + OTPSELECT = 0x40044d0d O_APPEND = 0x400 O_ASYNC = 0x2000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go index 7cc98f09c3..a4da67edbb 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go @@ -60,6 +60,8 @@ const ( CS8 = 0x30 CSIZE = 0x30 CSTOPB = 0x40 + ECCGETLAYOUT = 0x81484d11 + ECCGETSTATS = 0x80104d12 ECHOCTL = 0x200 ECHOE = 0x10 ECHOK = 0x20 @@ -121,6 +123,19 @@ const ( MCL_CURRENT = 0x1 MCL_FUTURE = 0x2 MCL_ONFAULT = 0x4 + MEMERASE = 0x40084d02 + MEMERASE64 = 0x40104d14 + MEMGETBADBLOCK = 0x40084d0b + MEMGETINFO = 0x80204d01 + MEMGETOOBSEL = 0x80c84d0a + MEMGETREGIONCOUNT = 0x80044d07 + MEMISLOCKED = 0x80084d17 + MEMLOCK = 0x40084d05 + MEMREADOOB = 0xc0104d04 + MEMSETBADBLOCK = 0x40084d0c + MEMUNLOCK = 0x40084d06 + MEMWRITEOOB = 0xc0104d03 + MTDFILEMODE = 0x4d13 NFDBITS = 0x40 NLDLY = 0x100 NOFLSH = 0x80 @@ -130,6 +145,10 @@ const ( NS_GET_USERNS = 0xb701 OLCUC = 0x2 ONLCR = 0x4 + OTPGETREGIONCOUNT = 0x40044d0e + OTPGETREGIONINFO = 0x400c4d0f + OTPLOCK = 0x800c4d10 + OTPSELECT = 0x80044d0d O_APPEND = 0x400 O_ASYNC = 0x2000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go index 6d30e6fd84..a7028e0efb 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go @@ -60,6 +60,8 @@ const ( CS8 = 0x30 CSIZE = 0x30 CSTOPB = 0x40 + ECCGETLAYOUT = 0x81484d11 + ECCGETSTATS = 0x80104d12 ECHOCTL = 0x200 ECHOE = 0x10 ECHOK = 0x20 @@ -121,6 +123,19 @@ const ( MCL_CURRENT = 0x1 MCL_FUTURE = 0x2 MCL_ONFAULT = 0x4 + MEMERASE = 0x40084d02 + MEMERASE64 = 0x40104d14 + MEMGETBADBLOCK = 0x40084d0b + MEMGETINFO = 0x80204d01 + MEMGETOOBSEL = 0x80c84d0a + MEMGETREGIONCOUNT = 0x80044d07 + MEMISLOCKED = 0x80084d17 + MEMLOCK = 0x40084d05 + MEMREADOOB = 0xc0104d04 + MEMSETBADBLOCK = 0x40084d0c + MEMUNLOCK = 0x40084d06 + MEMWRITEOOB = 0xc0104d03 + MTDFILEMODE = 0x4d13 NFDBITS = 0x40 NLDLY = 0x100 NOFLSH = 0x80 @@ -130,6 +145,10 @@ const ( NS_GET_USERNS = 0xb701 OLCUC = 0x2 ONLCR = 0x4 + OTPGETREGIONCOUNT = 0x40044d0e + OTPGETREGIONINFO = 0x400c4d0f + OTPLOCK = 0x800c4d10 + OTPSELECT = 0x80044d0d O_APPEND = 0x400 O_ASYNC = 0x2000 O_CLOEXEC = 0x80000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go index d5e2dc94fa..ed3b3286c1 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go @@ -63,6 +63,8 @@ const ( CS8 = 0x30 CSIZE = 0x30 CSTOPB = 0x40 + ECCGETLAYOUT = 0x41484d11 + ECCGETSTATS = 0x40104d12 ECHOCTL = 0x200 ECHOE = 0x10 ECHOK = 0x20 @@ -126,6 +128,19 @@ const ( MCL_CURRENT = 0x2000 MCL_FUTURE = 0x4000 MCL_ONFAULT = 0x8000 + MEMERASE = 0x80084d02 + MEMERASE64 = 0x80104d14 + MEMGETBADBLOCK = 0x80084d0b + MEMGETINFO = 0x40204d01 + MEMGETOOBSEL = 0x40c84d0a + MEMGETREGIONCOUNT = 0x40044d07 + MEMISLOCKED = 0x40084d17 + MEMLOCK = 0x80084d05 + MEMREADOOB = 0xc0104d04 + MEMSETBADBLOCK = 0x80084d0c + MEMUNLOCK = 0x80084d06 + MEMWRITEOOB = 0xc0104d03 + MTDFILEMODE = 0x20004d13 NFDBITS = 0x40 NLDLY = 0x100 NOFLSH = 0x80 @@ -135,6 +150,10 @@ const ( NS_GET_USERNS = 0x2000b701 OLCUC = 0x2 ONLCR = 0x4 + OTPGETREGIONCOUNT = 0x80044d0e + OTPGETREGIONINFO = 0x800c4d0f + OTPLOCK = 0x400c4d10 + OTPSELECT = 0x40044d0d O_APPEND = 0x8 O_ASYNC = 0x40 O_CLOEXEC = 0x400000 diff --git a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go index 1d049d7a12..d0ba8e9b86 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go @@ -431,6 +431,9 @@ type Winsize struct { const ( AT_FDCWD = 0xfffafdcd AT_SYMLINK_NOFOLLOW = 0x1 + AT_REMOVEDIR = 0x2 + AT_EACCESS = 0x4 + AT_SYMLINK_FOLLOW = 0x8 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go index c51bc88ffd..1f99c024af 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go @@ -672,9 +672,10 @@ type Winsize struct { const ( AT_FDCWD = -0x64 - AT_REMOVEDIR = 0x800 - AT_SYMLINK_FOLLOW = 0x400 + AT_EACCESS = 0x100 AT_SYMLINK_NOFOLLOW = 0x200 + AT_SYMLINK_FOLLOW = 0x400 + AT_REMOVEDIR = 0x800 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go index 395b691871..ddf0305a5d 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go @@ -675,9 +675,10 @@ type Winsize struct { const ( AT_FDCWD = -0x64 - AT_REMOVEDIR = 0x800 - AT_SYMLINK_FOLLOW = 0x400 + AT_EACCESS = 0x100 AT_SYMLINK_NOFOLLOW = 0x200 + AT_SYMLINK_FOLLOW = 0x400 + AT_REMOVEDIR = 0x800 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go index d3f9d2541b..dce0a5c80c 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go @@ -656,9 +656,10 @@ type Winsize struct { const ( AT_FDCWD = -0x64 - AT_REMOVEDIR = 0x800 - AT_SYMLINK_FOLLOW = 0x400 + AT_EACCESS = 0x100 AT_SYMLINK_NOFOLLOW = 0x200 + AT_SYMLINK_FOLLOW = 0x400 + AT_REMOVEDIR = 0x800 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go index 434d6e8e83..e232447025 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go @@ -653,9 +653,10 @@ type Winsize struct { const ( AT_FDCWD = -0x64 - AT_REMOVEDIR = 0x800 - AT_SYMLINK_FOLLOW = 0x400 + AT_EACCESS = 0x100 AT_SYMLINK_NOFOLLOW = 0x200 + AT_SYMLINK_FOLLOW = 0x400 + AT_REMOVEDIR = 0x800 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go index 087323591e..72887abe55 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go @@ -351,6 +351,13 @@ type RawSockaddrIUCV struct { Name [8]int8 } +type RawSockaddrNFC struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 +} + type _Socklen uint32 type Linger struct { @@ -464,6 +471,7 @@ const ( SizeofSockaddrL2TPIP = 0x10 SizeofSockaddrL2TPIP6 = 0x20 SizeofSockaddrIUCV = 0x20 + SizeofSockaddrNFC = 0x10 SizeofLinger = 0x8 SizeofIPMreq = 0x8 SizeofIPMreqn = 0xc @@ -3742,3 +3750,158 @@ const ( NLMSGERR_ATTR_OFFS = 0x2 NLMSGERR_ATTR_COOKIE = 0x3 ) + +type ( + EraseInfo struct { + Start uint32 + Length uint32 + } + EraseInfo64 struct { + Start uint64 + Length uint64 + } + MtdOobBuf struct { + Start uint32 + Length uint32 + Ptr *uint8 + } + MtdOobBuf64 struct { + Start uint64 + Pad uint32 + Length uint32 + Ptr uint64 + } + MtdWriteReq struct { + Start uint64 + Len uint64 + Ooblen uint64 + Data uint64 + Oob uint64 + Mode uint8 + _ [7]uint8 + } + MtdInfo struct { + Type uint8 + Flags uint32 + Size uint32 + Erasesize uint32 + Writesize uint32 + Oobsize uint32 + _ uint64 + } + RegionInfo struct { + Offset uint32 + Erasesize uint32 + Numblocks uint32 + Regionindex uint32 + } + OtpInfo struct { + Start uint32 + Length uint32 + Locked uint32 + } + NandOobinfo struct { + Useecc uint32 + Eccbytes uint32 + Oobfree [8][2]uint32 + Eccpos [32]uint32 + } + NandOobfree struct { + Offset uint32 + Length uint32 + } + NandEcclayout struct { + Eccbytes uint32 + Eccpos [64]uint32 + Oobavail uint32 + Oobfree [8]NandOobfree + } + MtdEccStats struct { + Corrected uint32 + Failed uint32 + Badblocks uint32 + Bbtblocks uint32 + } +) + +const ( + MTD_OPS_PLACE_OOB = 0x0 + MTD_OPS_AUTO_OOB = 0x1 + MTD_OPS_RAW = 0x2 +) + +const ( + MTD_FILE_MODE_NORMAL = 0x0 + MTD_FILE_MODE_OTP_FACTORY = 0x1 + MTD_FILE_MODE_OTP_USER = 0x2 + MTD_FILE_MODE_RAW = 0x3 +) + +const ( + NFC_CMD_UNSPEC = 0x0 + NFC_CMD_GET_DEVICE = 0x1 + NFC_CMD_DEV_UP = 0x2 + NFC_CMD_DEV_DOWN = 0x3 + NFC_CMD_DEP_LINK_UP = 0x4 + NFC_CMD_DEP_LINK_DOWN = 0x5 + NFC_CMD_START_POLL = 0x6 + NFC_CMD_STOP_POLL = 0x7 + NFC_CMD_GET_TARGET = 0x8 + NFC_EVENT_TARGETS_FOUND = 0x9 + NFC_EVENT_DEVICE_ADDED = 0xa + NFC_EVENT_DEVICE_REMOVED = 0xb + NFC_EVENT_TARGET_LOST = 0xc + NFC_EVENT_TM_ACTIVATED = 0xd + NFC_EVENT_TM_DEACTIVATED = 0xe + NFC_CMD_LLC_GET_PARAMS = 0xf + NFC_CMD_LLC_SET_PARAMS = 0x10 + NFC_CMD_ENABLE_SE = 0x11 + NFC_CMD_DISABLE_SE = 0x12 + NFC_CMD_LLC_SDREQ = 0x13 + NFC_EVENT_LLC_SDRES = 0x14 + NFC_CMD_FW_DOWNLOAD = 0x15 + NFC_EVENT_SE_ADDED = 0x16 + NFC_EVENT_SE_REMOVED = 0x17 + NFC_EVENT_SE_CONNECTIVITY = 0x18 + NFC_EVENT_SE_TRANSACTION = 0x19 + NFC_CMD_GET_SE = 0x1a + NFC_CMD_SE_IO = 0x1b + NFC_CMD_ACTIVATE_TARGET = 0x1c + NFC_CMD_VENDOR = 0x1d + NFC_CMD_DEACTIVATE_TARGET = 0x1e + NFC_ATTR_UNSPEC = 0x0 + NFC_ATTR_DEVICE_INDEX = 0x1 + NFC_ATTR_DEVICE_NAME = 0x2 + NFC_ATTR_PROTOCOLS = 0x3 + NFC_ATTR_TARGET_INDEX = 0x4 + NFC_ATTR_TARGET_SENS_RES = 0x5 + NFC_ATTR_TARGET_SEL_RES = 0x6 + NFC_ATTR_TARGET_NFCID1 = 0x7 + NFC_ATTR_TARGET_SENSB_RES = 0x8 + NFC_ATTR_TARGET_SENSF_RES = 0x9 + NFC_ATTR_COMM_MODE = 0xa + NFC_ATTR_RF_MODE = 0xb + NFC_ATTR_DEVICE_POWERED = 0xc + NFC_ATTR_IM_PROTOCOLS = 0xd + NFC_ATTR_TM_PROTOCOLS = 0xe + NFC_ATTR_LLC_PARAM_LTO = 0xf + NFC_ATTR_LLC_PARAM_RW = 0x10 + NFC_ATTR_LLC_PARAM_MIUX = 0x11 + NFC_ATTR_SE = 0x12 + NFC_ATTR_LLC_SDP = 0x13 + NFC_ATTR_FIRMWARE_NAME = 0x14 + NFC_ATTR_SE_INDEX = 0x15 + NFC_ATTR_SE_TYPE = 0x16 + NFC_ATTR_SE_AID = 0x17 + NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS = 0x18 + NFC_ATTR_SE_APDU = 0x19 + NFC_ATTR_TARGET_ISO15693_DSFID = 0x1a + NFC_ATTR_TARGET_ISO15693_UID = 0x1b + NFC_ATTR_SE_PARAMS = 0x1c + NFC_ATTR_VENDOR_ID = 0x1d + NFC_ATTR_VENDOR_SUBCMD = 0x1e + NFC_ATTR_VENDOR_DATA = 0x1f + NFC_SDP_ATTR_UNSPEC = 0x0 + NFC_SDP_ATTR_URI = 0x1 + NFC_SDP_ATTR_SAP = 0x2 +) diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go index 4d4d283de5..235c62e46f 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go @@ -128,6 +128,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint32 +} + type RawSockaddr struct { Family uint16 Data [14]int8 @@ -160,9 +171,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x8 - SizeofMsghdr = 0x1c - SizeofCmsghdr = 0xc + SizeofSockaddrNFCLLCP = 0x58 + SizeofIovec = 0x8 + SizeofMsghdr = 0x1c + SizeofCmsghdr = 0xc ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go index 8a2eed5ec4..99b1e5b6ad 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go @@ -130,6 +130,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint64 +} + type RawSockaddr struct { Family uint16 Data [14]int8 @@ -163,9 +174,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 + SizeofSockaddrNFCLLCP = 0x60 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go index 94b34add64..cc8bba7918 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go @@ -134,6 +134,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint32 +} + type RawSockaddr struct { Family uint16 Data [14]uint8 @@ -166,9 +177,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x8 - SizeofMsghdr = 0x1c - SizeofCmsghdr = 0xc + SizeofSockaddrNFCLLCP = 0x58 + SizeofIovec = 0x8 + SizeofMsghdr = 0x1c + SizeofCmsghdr = 0xc ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go index 2143de4d59..fa8fe3a75c 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go @@ -131,6 +131,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint64 +} + type RawSockaddr struct { Family uint16 Data [14]int8 @@ -164,9 +175,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 + SizeofSockaddrNFCLLCP = 0x60 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go index a40216eee6..e7fb8d9b7a 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go @@ -133,6 +133,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint32 +} + type RawSockaddr struct { Family uint16 Data [14]int8 @@ -165,9 +176,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x8 - SizeofMsghdr = 0x1c - SizeofCmsghdr = 0xc + SizeofSockaddrNFCLLCP = 0x58 + SizeofIovec = 0x8 + SizeofMsghdr = 0x1c + SizeofCmsghdr = 0xc ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go index e834b069fd..2fa61d593b 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go @@ -131,6 +131,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint64 +} + type RawSockaddr struct { Family uint16 Data [14]int8 @@ -164,9 +175,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 + SizeofSockaddrNFCLLCP = 0x60 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go index e31083b048..7f36399338 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go @@ -131,6 +131,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint64 +} + type RawSockaddr struct { Family uint16 Data [14]int8 @@ -164,9 +175,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 + SizeofSockaddrNFCLLCP = 0x60 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go index 42811f7fb5..f3c20cb863 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go @@ -133,6 +133,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint32 +} + type RawSockaddr struct { Family uint16 Data [14]int8 @@ -165,9 +176,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x8 - SizeofMsghdr = 0x1c - SizeofCmsghdr = 0xc + SizeofSockaddrNFCLLCP = 0x58 + SizeofIovec = 0x8 + SizeofMsghdr = 0x1c + SizeofCmsghdr = 0xc ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go index af7a72017e..885d27950d 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go @@ -134,6 +134,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint32 +} + type RawSockaddr struct { Family uint16 Data [14]uint8 @@ -166,9 +177,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x8 - SizeofMsghdr = 0x1c - SizeofCmsghdr = 0xc + SizeofSockaddrNFCLLCP = 0x58 + SizeofIovec = 0x8 + SizeofMsghdr = 0x1c + SizeofCmsghdr = 0xc ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go index 2a3afbaef9..a94eb8e180 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go @@ -132,6 +132,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint64 +} + type RawSockaddr struct { Family uint16 Data [14]uint8 @@ -165,9 +176,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 + SizeofSockaddrNFCLLCP = 0x60 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go index c0de30a658..659e32ebd5 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go @@ -132,6 +132,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint64 +} + type RawSockaddr struct { Family uint16 Data [14]uint8 @@ -165,9 +176,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 + SizeofSockaddrNFCLLCP = 0x60 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go index 74faf2e91f..ab8ec604f0 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go @@ -131,6 +131,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint64 +} + type RawSockaddr struct { Family uint16 Data [14]uint8 @@ -164,9 +175,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 + SizeofSockaddrNFCLLCP = 0x60 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go index 9a8f0c2c6a..3ec08237fd 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go @@ -130,6 +130,17 @@ const ( FADV_NOREUSE = 0x7 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint64 +} + type RawSockaddr struct { Family uint16 Data [14]int8 @@ -163,9 +174,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 + SizeofSockaddrNFCLLCP = 0x60 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go index 72cdda75bd..23d474470a 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go @@ -134,6 +134,17 @@ const ( FADV_NOREUSE = 0x5 ) +type RawSockaddrNFCLLCP struct { + Sa_family uint16 + Dev_idx uint32 + Target_idx uint32 + Nfc_protocol uint32 + Dsap uint8 + Ssap uint8 + Service_name [63]uint8 + Service_name_len uint64 +} + type RawSockaddr struct { Family uint16 Data [14]int8 @@ -167,9 +178,10 @@ type Cmsghdr struct { } const ( - SizeofIovec = 0x10 - SizeofMsghdr = 0x38 - SizeofCmsghdr = 0x10 + SizeofSockaddrNFCLLCP = 0x60 + SizeofIovec = 0x10 + SizeofMsghdr = 0x38 + SizeofCmsghdr = 0x10 ) const ( diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go index b10e73abf9..2fd2060e61 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go +++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go @@ -445,8 +445,10 @@ type Ptmget struct { const ( AT_FDCWD = -0x64 - AT_SYMLINK_FOLLOW = 0x400 + AT_EACCESS = 0x100 AT_SYMLINK_NOFOLLOW = 0x200 + AT_SYMLINK_FOLLOW = 0x400 + AT_REMOVEDIR = 0x800 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go index 28ed6d55ae..6a5a1a8ae5 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go @@ -453,8 +453,10 @@ type Ptmget struct { const ( AT_FDCWD = -0x64 - AT_SYMLINK_FOLLOW = 0x400 + AT_EACCESS = 0x100 AT_SYMLINK_NOFOLLOW = 0x200 + AT_SYMLINK_FOLLOW = 0x400 + AT_REMOVEDIR = 0x800 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go index 4ba196ebe5..84cc8d01e6 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go +++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go @@ -450,8 +450,10 @@ type Ptmget struct { const ( AT_FDCWD = -0x64 - AT_SYMLINK_FOLLOW = 0x400 + AT_EACCESS = 0x100 AT_SYMLINK_NOFOLLOW = 0x200 + AT_SYMLINK_FOLLOW = 0x400 + AT_REMOVEDIR = 0x800 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go index dd642bd9c8..c844e7096f 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go @@ -453,8 +453,10 @@ type Ptmget struct { const ( AT_FDCWD = -0x64 - AT_SYMLINK_FOLLOW = 0x400 + AT_EACCESS = 0x100 AT_SYMLINK_NOFOLLOW = 0x200 + AT_SYMLINK_FOLLOW = 0x400 + AT_REMOVEDIR = 0x800 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go index 1fdb0e5fa5..2a8b1e6f73 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go +++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go @@ -438,8 +438,10 @@ type Winsize struct { const ( AT_FDCWD = -0x64 - AT_SYMLINK_FOLLOW = 0x4 + AT_EACCESS = 0x1 AT_SYMLINK_NOFOLLOW = 0x2 + AT_SYMLINK_FOLLOW = 0x4 + AT_REMOVEDIR = 0x8 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go index e2fc93c7c0..b1759cf705 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go @@ -438,8 +438,10 @@ type Winsize struct { const ( AT_FDCWD = -0x64 - AT_SYMLINK_FOLLOW = 0x4 + AT_EACCESS = 0x1 AT_SYMLINK_NOFOLLOW = 0x2 + AT_SYMLINK_FOLLOW = 0x4 + AT_REMOVEDIR = 0x8 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go index 8d34b5a2fc..e807de2065 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go +++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go @@ -439,8 +439,10 @@ type Winsize struct { const ( AT_FDCWD = -0x64 - AT_SYMLINK_FOLLOW = 0x4 + AT_EACCESS = 0x1 AT_SYMLINK_NOFOLLOW = 0x2 + AT_SYMLINK_FOLLOW = 0x4 + AT_REMOVEDIR = 0x8 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go index ea8f1a0d9b..ff3aecaee4 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go @@ -432,8 +432,10 @@ type Winsize struct { const ( AT_FDCWD = -0x64 - AT_SYMLINK_FOLLOW = 0x4 + AT_EACCESS = 0x1 AT_SYMLINK_NOFOLLOW = 0x2 + AT_SYMLINK_FOLLOW = 0x4 + AT_REMOVEDIR = 0x8 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go index ec6e8bc3f1..9ecda69174 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go @@ -432,8 +432,10 @@ type Winsize struct { const ( AT_FDCWD = -0x64 - AT_SYMLINK_FOLLOW = 0x4 + AT_EACCESS = 0x1 AT_SYMLINK_NOFOLLOW = 0x2 + AT_SYMLINK_FOLLOW = 0x4 + AT_REMOVEDIR = 0x8 ) type PollFd struct { diff --git a/vendor/golang.org/x/sys/windows/exec_windows.go b/vendor/golang.org/x/sys/windows/exec_windows.go index 9eb1fb633a..7a11e83b7e 100644 --- a/vendor/golang.org/x/sys/windows/exec_windows.go +++ b/vendor/golang.org/x/sys/windows/exec_windows.go @@ -9,6 +9,8 @@ package windows import ( errorspkg "errors" "unsafe" + + "golang.org/x/sys/internal/unsafeheader" ) // EscapeArg rewrites command line argument s as prescribed @@ -78,6 +80,40 @@ func EscapeArg(s string) string { return string(qs[:j]) } +// ComposeCommandLine escapes and joins the given arguments suitable for use as a Windows command line, +// in CreateProcess's CommandLine argument, CreateService/ChangeServiceConfig's BinaryPathName argument, +// or any program that uses CommandLineToArgv. +func ComposeCommandLine(args []string) string { + var commandLine string + for i := range args { + if i > 0 { + commandLine += " " + } + commandLine += EscapeArg(args[i]) + } + return commandLine +} + +// DecomposeCommandLine breaks apart its argument command line into unescaped parts using CommandLineToArgv, +// as gathered from GetCommandLine, QUERY_SERVICE_CONFIG's BinaryPathName argument, or elsewhere that +// command lines are passed around. +func DecomposeCommandLine(commandLine string) ([]string, error) { + if len(commandLine) == 0 { + return []string{}, nil + } + var argc int32 + argv, err := CommandLineToArgv(StringToUTF16Ptr(commandLine), &argc) + if err != nil { + return nil, err + } + defer LocalFree(Handle(unsafe.Pointer(argv))) + var args []string + for _, v := range (*argv)[:argc] { + args = append(args, UTF16ToString((*v)[:])) + } + return args, nil +} + func CloseOnExec(fd Handle) { SetHandleInformation(Handle(fd), HANDLE_FLAG_INHERIT, 0) } @@ -101,8 +137,8 @@ func FullPath(name string) (path string, err error) { } } -// NewProcThreadAttributeList allocates a new ProcThreadAttributeList, with the requested maximum number of attributes. -func NewProcThreadAttributeList(maxAttrCount uint32) (*ProcThreadAttributeList, error) { +// NewProcThreadAttributeList allocates a new ProcThreadAttributeListContainer, with the requested maximum number of attributes. +func NewProcThreadAttributeList(maxAttrCount uint32) (*ProcThreadAttributeListContainer, error) { var size uintptr err := initializeProcThreadAttributeList(nil, maxAttrCount, 0, &size) if err != ERROR_INSUFFICIENT_BUFFER { @@ -111,10 +147,9 @@ func NewProcThreadAttributeList(maxAttrCount uint32) (*ProcThreadAttributeList, } return nil, err } - const psize = unsafe.Sizeof(uintptr(0)) // size is guaranteed to be ≥1 by InitializeProcThreadAttributeList. - al := (*ProcThreadAttributeList)(unsafe.Pointer(&make([]unsafe.Pointer, (size+psize-1)/psize)[0])) - err = initializeProcThreadAttributeList(al, maxAttrCount, 0, &size) + al := &ProcThreadAttributeListContainer{data: (*ProcThreadAttributeList)(unsafe.Pointer(&make([]byte, size)[0]))} + err = initializeProcThreadAttributeList(al.data, maxAttrCount, 0, &size) if err != nil { return nil, err } @@ -122,11 +157,39 @@ func NewProcThreadAttributeList(maxAttrCount uint32) (*ProcThreadAttributeList, } // Update modifies the ProcThreadAttributeList using UpdateProcThreadAttribute. -func (al *ProcThreadAttributeList) Update(attribute uintptr, flags uint32, value unsafe.Pointer, size uintptr, prevValue unsafe.Pointer, returnedSize *uintptr) error { - return updateProcThreadAttribute(al, flags, attribute, value, size, prevValue, returnedSize) +// Note that the value passed to this function will be copied into memory +// allocated by LocalAlloc, the contents of which should not contain any +// Go-managed pointers, even if the passed value itself is a Go-managed +// pointer. +func (al *ProcThreadAttributeListContainer) Update(attribute uintptr, value unsafe.Pointer, size uintptr) error { + alloc, err := LocalAlloc(LMEM_FIXED, uint32(size)) + if err != nil { + return err + } + var src, dst []byte + hdr := (*unsafeheader.Slice)(unsafe.Pointer(&src)) + hdr.Data = value + hdr.Cap = int(size) + hdr.Len = int(size) + hdr = (*unsafeheader.Slice)(unsafe.Pointer(&dst)) + hdr.Data = unsafe.Pointer(alloc) + hdr.Cap = int(size) + hdr.Len = int(size) + copy(dst, src) + al.heapAllocations = append(al.heapAllocations, alloc) + return updateProcThreadAttribute(al.data, 0, attribute, unsafe.Pointer(alloc), size, nil, nil) } // Delete frees ProcThreadAttributeList's resources. -func (al *ProcThreadAttributeList) Delete() { - deleteProcThreadAttributeList(al) +func (al *ProcThreadAttributeListContainer) Delete() { + deleteProcThreadAttributeList(al.data) + for i := range al.heapAllocations { + LocalFree(Handle(al.heapAllocations[i])) + } + al.heapAllocations = nil +} + +// List returns the actual ProcThreadAttributeList to be passed to StartupInfoEx. +func (al *ProcThreadAttributeListContainer) List() *ProcThreadAttributeList { + return al.data } diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go index bb6aaf89e4..1215b2ae20 100644 --- a/vendor/golang.org/x/sys/windows/syscall_windows.go +++ b/vendor/golang.org/x/sys/windows/syscall_windows.go @@ -220,6 +220,7 @@ func NewCallbackCDecl(fn interface{}) uintptr { //sys CancelIo(s Handle) (err error) //sys CancelIoEx(s Handle, o *Overlapped) (err error) //sys CreateProcess(appName *uint16, commandLine *uint16, procSecurity *SecurityAttributes, threadSecurity *SecurityAttributes, inheritHandles bool, creationFlags uint32, env *uint16, currentDir *uint16, startupInfo *StartupInfo, outProcInfo *ProcessInformation) (err error) = CreateProcessW +//sys CreateProcessAsUser(token Token, appName *uint16, commandLine *uint16, procSecurity *SecurityAttributes, threadSecurity *SecurityAttributes, inheritHandles bool, creationFlags uint32, env *uint16, currentDir *uint16, startupInfo *StartupInfo, outProcInfo *ProcessInformation) (err error) = advapi32.CreateProcessAsUserW //sys initializeProcThreadAttributeList(attrlist *ProcThreadAttributeList, attrcount uint32, flags uint32, size *uintptr) (err error) = InitializeProcThreadAttributeList //sys deleteProcThreadAttributeList(attrlist *ProcThreadAttributeList) = DeleteProcThreadAttributeList //sys updateProcThreadAttribute(attrlist *ProcThreadAttributeList, flags uint32, attr uintptr, value unsafe.Pointer, size uintptr, prevvalue unsafe.Pointer, returnedsize *uintptr) (err error) = UpdateProcThreadAttribute diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go index 23fe18ecef..1f733398ee 100644 --- a/vendor/golang.org/x/sys/windows/types_windows.go +++ b/vendor/golang.org/x/sys/windows/types_windows.go @@ -909,14 +909,15 @@ type StartupInfoEx struct { // ProcThreadAttributeList is a placeholder type to represent a PROC_THREAD_ATTRIBUTE_LIST. // -// To create a *ProcThreadAttributeList, use NewProcThreadAttributeList, and -// free its memory using ProcThreadAttributeList.Delete. -type ProcThreadAttributeList struct { - // This is of type unsafe.Pointer, not of type byte or uintptr, because - // the contents of it is mostly a list of pointers, and in most cases, - // that's a list of pointers to Go-allocated objects. In order to keep - // the GC from collecting these objects, we declare this as unsafe.Pointer. - _ [1]unsafe.Pointer +// To create a *ProcThreadAttributeList, use NewProcThreadAttributeList, update +// it with ProcThreadAttributeListContainer.Update, free its memory using +// ProcThreadAttributeListContainer.Delete, and access the list itself using +// ProcThreadAttributeListContainer.List. +type ProcThreadAttributeList struct{} + +type ProcThreadAttributeListContainer struct { + data *ProcThreadAttributeList + heapAllocations []uintptr } type ProcessInformation struct { diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go index 559bc845c9..148de0ffb5 100644 --- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go +++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go @@ -69,6 +69,7 @@ var ( procConvertStringSecurityDescriptorToSecurityDescriptorW = modadvapi32.NewProc("ConvertStringSecurityDescriptorToSecurityDescriptorW") procConvertStringSidToSidW = modadvapi32.NewProc("ConvertStringSidToSidW") procCopySid = modadvapi32.NewProc("CopySid") + procCreateProcessAsUserW = modadvapi32.NewProc("CreateProcessAsUserW") procCreateServiceW = modadvapi32.NewProc("CreateServiceW") procCreateWellKnownSid = modadvapi32.NewProc("CreateWellKnownSid") procCryptAcquireContextW = modadvapi32.NewProc("CryptAcquireContextW") @@ -553,6 +554,18 @@ func CopySid(destSidLen uint32, destSid *SID, srcSid *SID) (err error) { return } +func CreateProcessAsUser(token Token, appName *uint16, commandLine *uint16, procSecurity *SecurityAttributes, threadSecurity *SecurityAttributes, inheritHandles bool, creationFlags uint32, env *uint16, currentDir *uint16, startupInfo *StartupInfo, outProcInfo *ProcessInformation) (err error) { + var _p0 uint32 + if inheritHandles { + _p0 = 1 + } + r1, _, e1 := syscall.Syscall12(procCreateProcessAsUserW.Addr(), 11, uintptr(token), uintptr(unsafe.Pointer(appName)), uintptr(unsafe.Pointer(commandLine)), uintptr(unsafe.Pointer(procSecurity)), uintptr(unsafe.Pointer(threadSecurity)), uintptr(_p0), uintptr(creationFlags), uintptr(unsafe.Pointer(env)), uintptr(unsafe.Pointer(currentDir)), uintptr(unsafe.Pointer(startupInfo)), uintptr(unsafe.Pointer(outProcInfo)), 0) + if r1 == 0 { + err = errnoErr(e1) + } + return +} + func CreateService(mgr Handle, serviceName *uint16, displayName *uint16, access uint32, srvType uint32, startType uint32, errCtl uint32, pathName *uint16, loadOrderGroup *uint16, tagId *uint32, dependencies *uint16, serviceStartName *uint16, password *uint16) (handle Handle, err error) { r0, _, e1 := syscall.Syscall15(procCreateServiceW.Addr(), 13, uintptr(mgr), uintptr(unsafe.Pointer(serviceName)), uintptr(unsafe.Pointer(displayName)), uintptr(access), uintptr(srvType), uintptr(startType), uintptr(errCtl), uintptr(unsafe.Pointer(pathName)), uintptr(unsafe.Pointer(loadOrderGroup)), uintptr(unsafe.Pointer(tagId)), uintptr(unsafe.Pointer(dependencies)), uintptr(unsafe.Pointer(serviceStartName)), uintptr(unsafe.Pointer(password)), 0, 0) handle = Handle(r0) diff --git a/vendor/google.golang.org/grpc/.travis.yml b/vendor/google.golang.org/grpc/.travis.yml deleted file mode 100644 index 5847d94e55..0000000000 --- a/vendor/google.golang.org/grpc/.travis.yml +++ /dev/null @@ -1,42 +0,0 @@ -language: go - -matrix: - include: - - go: 1.14.x - env: VET=1 GO111MODULE=on - - go: 1.14.x - env: RACE=1 GO111MODULE=on - - go: 1.14.x - env: RUN386=1 - - go: 1.14.x - env: GRPC_GO_RETRY=on - - go: 1.14.x - env: TESTEXTRAS=1 - - go: 1.13.x - env: GO111MODULE=on - - go: 1.12.x - env: GO111MODULE=on - - go: 1.11.x # Keep until interop tests no longer require Go1.11 - env: GO111MODULE=on - -go_import_path: google.golang.org/grpc - -before_install: - - if [[ "${GO111MODULE}" = "on" ]]; then mkdir "${HOME}/go"; export GOPATH="${HOME}/go"; fi - - if [[ -n "${RUN386}" ]]; then export GOARCH=386; fi - - if [[ "${TRAVIS_EVENT_TYPE}" = "cron" && -z "${RUN386}" ]]; then RACE=1; fi - - if [[ "${TRAVIS_EVENT_TYPE}" != "cron" ]]; then export VET_SKIP_PROTO=1; fi - -install: - - try3() { eval "$*" || eval "$*" || eval "$*"; } - - try3 'if [[ "${GO111MODULE}" = "on" ]]; then go mod download; else make testdeps; fi' - - if [[ -n "${GAE}" ]]; then source ./install_gae.sh; make testappenginedeps; fi - - if [[ -n "${VET}" ]]; then ./vet.sh -install; fi - -script: - - set -e - - if [[ -n "${TESTEXTRAS}" ]]; then examples/examples_test.sh; security/advancedtls/examples/examples_test.sh; interop/interop_test.sh; make testsubmodule; exit 0; fi - - if [[ -n "${VET}" ]]; then ./vet.sh; fi - - if [[ -n "${GAE}" ]]; then make testappengine; exit 0; fi - - if [[ -n "${RACE}" ]]; then make testrace; exit 0; fi - - make test diff --git a/vendor/google.golang.org/grpc/README.md b/vendor/google.golang.org/grpc/README.md index 3949a683fb..0e6ae69a58 100644 --- a/vendor/google.golang.org/grpc/README.md +++ b/vendor/google.golang.org/grpc/README.md @@ -136,6 +136,6 @@ errors. [Go module]: https://github.com/golang/go/wiki/Modules [gRPC]: https://grpc.io [Go gRPC docs]: https://grpc.io/docs/languages/go -[Performance benchmark]: https://performance-dot-grpc-testing.appspot.com/explore?dashboard=5652536396611584&widget=490377658&container=1286539696 +[Performance benchmark]: https://performance-dot-grpc-testing.appspot.com/explore?dashboard=5180705743044608 [quick start]: https://grpc.io/docs/languages/go/quickstart [go-releases]: https://golang.org/doc/devel/release.html diff --git a/vendor/google.golang.org/grpc/balancer_conn_wrappers.go b/vendor/google.golang.org/grpc/balancer_conn_wrappers.go index 4cc7f9159b..dd83979639 100644 --- a/vendor/google.golang.org/grpc/balancer_conn_wrappers.go +++ b/vendor/google.golang.org/grpc/balancer_conn_wrappers.go @@ -43,7 +43,8 @@ type ccBalancerWrapper struct { cc *ClientConn balancerMu sync.Mutex // synchronizes calls to the balancer balancer balancer.Balancer - scBuffer *buffer.Unbounded + updateCh *buffer.Unbounded + closed *grpcsync.Event done *grpcsync.Event mu sync.Mutex @@ -53,7 +54,8 @@ type ccBalancerWrapper struct { func newCCBalancerWrapper(cc *ClientConn, b balancer.Builder, bopts balancer.BuildOptions) *ccBalancerWrapper { ccb := &ccBalancerWrapper{ cc: cc, - scBuffer: buffer.NewUnbounded(), + updateCh: buffer.NewUnbounded(), + closed: grpcsync.NewEvent(), done: grpcsync.NewEvent(), subConns: make(map[*acBalancerWrapper]struct{}), } @@ -67,35 +69,53 @@ func newCCBalancerWrapper(cc *ClientConn, b balancer.Builder, bopts balancer.Bui func (ccb *ccBalancerWrapper) watcher() { for { select { - case t := <-ccb.scBuffer.Get(): - ccb.scBuffer.Load() - if ccb.done.HasFired() { + case t := <-ccb.updateCh.Get(): + ccb.updateCh.Load() + if ccb.closed.HasFired() { break } - ccb.balancerMu.Lock() - su := t.(*scStateUpdate) - ccb.balancer.UpdateSubConnState(su.sc, balancer.SubConnState{ConnectivityState: su.state, ConnectionError: su.err}) - ccb.balancerMu.Unlock() - case <-ccb.done.Done(): + switch u := t.(type) { + case *scStateUpdate: + ccb.balancerMu.Lock() + ccb.balancer.UpdateSubConnState(u.sc, balancer.SubConnState{ConnectivityState: u.state, ConnectionError: u.err}) + ccb.balancerMu.Unlock() + case *acBalancerWrapper: + ccb.mu.Lock() + if ccb.subConns != nil { + delete(ccb.subConns, u) + ccb.cc.removeAddrConn(u.getAddrConn(), errConnDrain) + } + ccb.mu.Unlock() + default: + logger.Errorf("ccBalancerWrapper.watcher: unknown update %+v, type %T", t, t) + } + case <-ccb.closed.Done(): } - if ccb.done.HasFired() { + if ccb.closed.HasFired() { + ccb.balancerMu.Lock() ccb.balancer.Close() + ccb.balancerMu.Unlock() ccb.mu.Lock() scs := ccb.subConns ccb.subConns = nil ccb.mu.Unlock() + ccb.UpdateState(balancer.State{ConnectivityState: connectivity.Connecting, Picker: nil}) + ccb.done.Fire() + // Fire done before removing the addr conns. We can safely unblock + // ccb.close and allow the removeAddrConns to happen + // asynchronously. for acbw := range scs { ccb.cc.removeAddrConn(acbw.getAddrConn(), errConnDrain) } - ccb.UpdateState(balancer.State{ConnectivityState: connectivity.Connecting, Picker: nil}) return } } } func (ccb *ccBalancerWrapper) close() { - ccb.done.Fire() + ccb.closed.Fire() + <-ccb.done.Done() } func (ccb *ccBalancerWrapper) handleSubConnStateChange(sc balancer.SubConn, s connectivity.State, err error) { @@ -109,7 +129,7 @@ func (ccb *ccBalancerWrapper) handleSubConnStateChange(sc balancer.SubConn, s co if sc == nil { return } - ccb.scBuffer.Put(&scStateUpdate{ + ccb.updateCh.Put(&scStateUpdate{ sc: sc, state: s, err: err, @@ -150,17 +170,10 @@ func (ccb *ccBalancerWrapper) NewSubConn(addrs []resolver.Address, opts balancer } func (ccb *ccBalancerWrapper) RemoveSubConn(sc balancer.SubConn) { - acbw, ok := sc.(*acBalancerWrapper) - if !ok { - return - } - ccb.mu.Lock() - defer ccb.mu.Unlock() - if ccb.subConns == nil { - return - } - delete(ccb.subConns, acbw) - ccb.cc.removeAddrConn(acbw.getAddrConn(), errConnDrain) + // The RemoveSubConn() is handled in the run() goroutine, to avoid deadlock + // during switchBalancer() if the old balancer calls RemoveSubConn() in its + // Close(). + ccb.updateCh.Put(sc) } func (ccb *ccBalancerWrapper) UpdateAddresses(sc balancer.SubConn, addrs []resolver.Address) { diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go index 24109264f5..5cef39295b 100644 --- a/vendor/google.golang.org/grpc/clientconn.go +++ b/vendor/google.golang.org/grpc/clientconn.go @@ -711,7 +711,12 @@ func (cc *ClientConn) switchBalancer(name string) { return } if cc.balancerWrapper != nil { + // Don't hold cc.mu while closing the balancers. The balancers may call + // methods that require cc.mu (e.g. cc.NewSubConn()). Holding the mutex + // would cause a deadlock in that case. + cc.mu.Unlock() cc.balancerWrapper.close() + cc.mu.Lock() } builder := balancer.Get(name) @@ -1046,12 +1051,12 @@ func (cc *ClientConn) Close() error { cc.blockingpicker.close() - if rWrapper != nil { - rWrapper.close() - } if bWrapper != nil { bWrapper.close() } + if rWrapper != nil { + rWrapper.close() + } for ac := range conns { ac.tearDown(ErrClientConnClosing) diff --git a/vendor/google.golang.org/grpc/go.mod b/vendor/google.golang.org/grpc/go.mod index b177cfa66d..6eed9370b4 100644 --- a/vendor/google.golang.org/grpc/go.mod +++ b/vendor/google.golang.org/grpc/go.mod @@ -4,14 +4,14 @@ go 1.11 require ( github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403 - github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d + github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b - github.com/golang/protobuf v1.4.2 + github.com/golang/protobuf v1.4.3 github.com/google/go-cmp v0.5.0 github.com/google/uuid v1.1.2 - golang.org/x/net v0.0.0-20190311183353-d8887717615a - golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be - golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a + golang.org/x/net v0.0.0-20200822124328-c89045814202 + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d + golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 google.golang.org/protobuf v1.25.0 ) diff --git a/vendor/google.golang.org/grpc/go.sum b/vendor/google.golang.org/grpc/go.sum index 24d2976abb..51fd1436e3 100644 --- a/vendor/google.golang.org/grpc/go.sum +++ b/vendor/google.golang.org/grpc/go.sum @@ -1,32 +1,42 @@ -cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403 h1:cqQfy1jclcSy/FwLjemeg3SR1yaINm74aQyupQ0Bl8M= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed h1:OZmjad4L3H8ncOIR8rnb5MREYqG8ixi5+WbeUsquF0c= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d h1:QyzYnTnPE15SQyUeqU6qLbWxMkwyAyu+vGksa0b7j00= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0 h1:dulLQAYQFYtG5MTplgNGHWuV2D+OBD+Z8lmDBmbLg+s= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -35,49 +45,64 @@ github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -90,7 +115,8 @@ google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/vendor/google.golang.org/grpc/internal/grpcrand/grpcrand.go b/vendor/google.golang.org/grpc/internal/grpcrand/grpcrand.go index 200b115ca2..7bc3583b5f 100644 --- a/vendor/google.golang.org/grpc/internal/grpcrand/grpcrand.go +++ b/vendor/google.golang.org/grpc/internal/grpcrand/grpcrand.go @@ -31,26 +31,30 @@ var ( mu sync.Mutex ) +// Int implements rand.Int on the grpcrand global source. +func Int() int { + mu.Lock() + defer mu.Unlock() + return r.Int() +} + // Int63n implements rand.Int63n on the grpcrand global source. func Int63n(n int64) int64 { mu.Lock() - res := r.Int63n(n) - mu.Unlock() - return res + defer mu.Unlock() + return r.Int63n(n) } // Intn implements rand.Intn on the grpcrand global source. func Intn(n int) int { mu.Lock() - res := r.Intn(n) - mu.Unlock() - return res + defer mu.Unlock() + return r.Intn(n) } // Float64 implements rand.Float64 on the grpcrand global source. func Float64() float64 { mu.Lock() - res := r.Float64() - mu.Unlock() - return res + defer mu.Unlock() + return r.Float64() } diff --git a/vendor/google.golang.org/grpc/internal/transport/controlbuf.go b/vendor/google.golang.org/grpc/internal/transport/controlbuf.go index f63a013762..45532f8aea 100644 --- a/vendor/google.golang.org/grpc/internal/transport/controlbuf.go +++ b/vendor/google.golang.org/grpc/internal/transport/controlbuf.go @@ -296,7 +296,7 @@ type controlBuffer struct { // closed and nilled when transportResponseFrames drops below the // threshold. Both fields are protected by mu. transportResponseFrames int - trfChan atomic.Value // *chan struct{} + trfChan atomic.Value // chan struct{} } func newControlBuffer(done <-chan struct{}) *controlBuffer { @@ -310,10 +310,10 @@ func newControlBuffer(done <-chan struct{}) *controlBuffer { // throttle blocks if there are too many incomingSettings/cleanupStreams in the // controlbuf. func (c *controlBuffer) throttle() { - ch, _ := c.trfChan.Load().(*chan struct{}) + ch, _ := c.trfChan.Load().(chan struct{}) if ch != nil { select { - case <-*ch: + case <-ch: case <-c.done: } } @@ -347,8 +347,7 @@ func (c *controlBuffer) executeAndPut(f func(it interface{}) bool, it cbItem) (b if c.transportResponseFrames == maxQueuedTransportResponseFrames { // We are adding the frame that puts us over the threshold; create // a throttling channel. - ch := make(chan struct{}) - c.trfChan.Store(&ch) + c.trfChan.Store(make(chan struct{})) } } c.mu.Unlock() @@ -389,9 +388,9 @@ func (c *controlBuffer) get(block bool) (interface{}, error) { if c.transportResponseFrames == maxQueuedTransportResponseFrames { // We are removing the frame that put us over the // threshold; close and clear the throttling channel. - ch := c.trfChan.Load().(*chan struct{}) - close(*ch) - c.trfChan.Store((*chan struct{})(nil)) + ch := c.trfChan.Load().(chan struct{}) + close(ch) + c.trfChan.Store((chan struct{})(nil)) } c.transportResponseFrames-- } @@ -407,7 +406,6 @@ func (c *controlBuffer) get(block bool) (interface{}, error) { select { case <-c.ch: case <-c.done: - c.finish() return nil, ErrConnClosing } } @@ -432,6 +430,14 @@ func (c *controlBuffer) finish() { hdr.onOrphaned(ErrConnClosing) } } + // In case throttle() is currently in flight, it needs to be unblocked. + // Otherwise, the transport may not close, since the transport is closed by + // the reader encountering the connection error. + ch, _ := c.trfChan.Load().(chan struct{}) + if ch != nil { + close(ch) + } + c.trfChan.Store((chan struct{})(nil)) c.mu.Unlock() } diff --git a/vendor/google.golang.org/grpc/internal/transport/handler_server.go b/vendor/google.golang.org/grpc/internal/transport/handler_server.go index 05d3871e62..1c3459c2b4 100644 --- a/vendor/google.golang.org/grpc/internal/transport/handler_server.go +++ b/vendor/google.golang.org/grpc/internal/transport/handler_server.go @@ -141,9 +141,8 @@ type serverHandlerTransport struct { stats stats.Handler } -func (ht *serverHandlerTransport) Close() error { +func (ht *serverHandlerTransport) Close() { ht.closeOnce.Do(ht.closeCloseChanOnce) - return nil } func (ht *serverHandlerTransport) closeCloseChanOnce() { close(ht.closedCh) } diff --git a/vendor/google.golang.org/grpc/internal/transport/http2_client.go b/vendor/google.golang.org/grpc/internal/transport/http2_client.go index 2c1213e3b3..d10b6aacbc 100644 --- a/vendor/google.golang.org/grpc/internal/transport/http2_client.go +++ b/vendor/google.golang.org/grpc/internal/transport/http2_client.go @@ -399,11 +399,10 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr resolver.Address, opts logger.Errorf("transport: loopyWriter.run returning. Err: %v", err) } } - // If it's a connection error, let reader goroutine handle it - // since there might be data in the buffers. - if _, ok := err.(net.Error); !ok { - t.conn.Close() - } + // Do not close the transport. Let reader goroutine handle it since + // there might be data in the buffers. + t.conn.Close() + t.controlBuf.finish() close(t.writerDone) }() return t, nil @@ -1260,11 +1259,97 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) { return } - state := &decodeState{} - // Initialize isGRPC value to be !initialHeader, since if a gRPC Response-Headers has already been received, then it means that the peer is speaking gRPC and we are in gRPC mode. - state.data.isGRPC = !initialHeader - if h2code, err := state.decodeHeader(frame); err != nil { - t.closeStream(s, err, true, h2code, status.Convert(err), nil, endStream) + // frame.Truncated is set to true when framer detects that the current header + // list size hits MaxHeaderListSize limit. + if frame.Truncated { + se := status.New(codes.Internal, "peer header list size exceeded limit") + t.closeStream(s, se.Err(), true, http2.ErrCodeFrameSize, se, nil, endStream) + return + } + + var ( + // If a gRPC Response-Headers has already been received, then it means + // that the peer is speaking gRPC and we are in gRPC mode. + isGRPC = !initialHeader + mdata = make(map[string][]string) + contentTypeErr string + grpcMessage string + statusGen *status.Status + + httpStatus string + rawStatus string + // headerError is set if an error is encountered while parsing the headers + headerError string + ) + + for _, hf := range frame.Fields { + switch hf.Name { + case "content-type": + if _, validContentType := grpcutil.ContentSubtype(hf.Value); !validContentType { + contentTypeErr = fmt.Sprintf("transport: received the unexpected content-type %q", hf.Value) + break + } + mdata[hf.Name] = append(mdata[hf.Name], hf.Value) + isGRPC = true + case "grpc-encoding": + s.recvCompress = hf.Value + case "grpc-status": + rawStatus = hf.Value + case "grpc-message": + grpcMessage = decodeGrpcMessage(hf.Value) + case "grpc-status-details-bin": + var err error + statusGen, err = decodeGRPCStatusDetails(hf.Value) + if err != nil { + headerError = fmt.Sprintf("transport: malformed grpc-status-details-bin: %v", err) + } + case ":status": + httpStatus = hf.Value + default: + if isReservedHeader(hf.Name) && !isWhitelistedHeader(hf.Name) { + break + } + v, err := decodeMetadataHeader(hf.Name, hf.Value) + if err != nil { + headerError = fmt.Sprintf("transport: malformed %s: %v", hf.Name, err) + logger.Warningf("Failed to decode metadata header (%q, %q): %v", hf.Name, hf.Value, err) + break + } + mdata[hf.Name] = append(mdata[hf.Name], v) + } + } + + if !isGRPC { + var ( + code = codes.Internal // when header does not include HTTP status, return INTERNAL + httpStatusCode int + ) + + if httpStatus != "" { + c, err := strconv.ParseInt(httpStatus, 10, 32) + if err != nil { + se := status.New(codes.Internal, fmt.Sprintf("transport: malformed http-status: %v", err)) + t.closeStream(s, se.Err(), true, http2.ErrCodeProtocol, se, nil, endStream) + return + } + httpStatusCode = int(c) + + var ok bool + code, ok = HTTPStatusConvTab[httpStatusCode] + if !ok { + code = codes.Unknown + } + } + + // Verify the HTTP response is a 200. + se := status.New(code, constructHTTPErrMsg(&httpStatusCode, contentTypeErr)) + t.closeStream(s, se.Err(), true, http2.ErrCodeProtocol, se, nil, endStream) + return + } + + if headerError != "" { + se := status.New(codes.Internal, headerError) + t.closeStream(s, se.Err(), true, http2.ErrCodeProtocol, se, nil, endStream) return } @@ -1299,9 +1384,8 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) { // These values can be set without any synchronization because // stream goroutine will read it only after seeing a closed // headerChan which we'll close after setting this. - s.recvCompress = state.data.encoding - if len(state.data.mdata) > 0 { - s.header = state.data.mdata + if len(mdata) > 0 { + s.header = mdata } } else { // HEADERS frame block carries a Trailers-Only. @@ -1314,9 +1398,23 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) { return } + if statusGen == nil { + rawStatusCode := codes.Unknown + if rawStatus != "" { + code, err := strconv.ParseInt(rawStatus, 10, 32) + if err != nil { + se := status.New(codes.Internal, fmt.Sprintf("transport: malformed grpc-status: %v", err)) + t.closeStream(s, se.Err(), true, http2.ErrCodeProtocol, se, nil, endStream) + return + } + rawStatusCode = codes.Code(uint32(code)) + } + statusGen = status.New(rawStatusCode, grpcMessage) + } + // if client received END_STREAM from server while stream was still active, send RST_STREAM rst := s.getState() == streamActive - t.closeStream(s, io.EOF, rst, http2.ErrCodeNo, state.status(), state.data.mdata, true) + t.closeStream(s, io.EOF, rst, http2.ErrCodeNo, statusGen, mdata, true) } // reader runs as a separate goroutine in charge of reading data from network diff --git a/vendor/google.golang.org/grpc/internal/transport/http2_server.go b/vendor/google.golang.org/grpc/internal/transport/http2_server.go index 11be5599cd..e3799d50aa 100644 --- a/vendor/google.golang.org/grpc/internal/transport/http2_server.go +++ b/vendor/google.golang.org/grpc/internal/transport/http2_server.go @@ -102,11 +102,11 @@ type http2Server struct { mu sync.Mutex // guard the following - // drainChan is initialized when drain(...) is called the first time. + // drainChan is initialized when Drain() is called the first time. // After which the server writes out the first GoAway(with ID 2^31-1) frame. // Then an independent goroutine will be launched to later send the second GoAway. // During this time we don't want to write another first GoAway(with ID 2^31 -1) frame. - // Thus call to drain(...) will be a no-op if drainChan is already initialized since draining is + // Thus call to Drain() will be a no-op if drainChan is already initialized since draining is // already underway. drainChan chan struct{} state transportState @@ -125,9 +125,14 @@ type http2Server struct { connectionID uint64 } -// newHTTP2Server constructs a ServerTransport based on HTTP2. ConnectionError is -// returned if something goes wrong. -func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err error) { +// NewServerTransport creates a http2 transport with conn and configuration +// options from config. +// +// It returns a non-nil transport and a nil error on success. On failure, it +// returns a non-nil transport and a nil-error. For a special case where the +// underlying conn gets closed before the client preface could be read, it +// returns a nil transport and a nil error. +func NewServerTransport(conn net.Conn, config *ServerConfig) (_ ServerTransport, err error) { writeBufSize := config.WriteBufferSize readBufSize := config.ReadBufferSize maxHeaderListSize := defaultServerMaxHeaderListSize @@ -266,6 +271,13 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err // Check the validity of client preface. preface := make([]byte, len(clientPreface)) if _, err := io.ReadFull(t.conn, preface); err != nil { + // In deployments where a gRPC server runs behind a cloud load balancer + // which performs regular TCP level health checks, the connection is + // closed immediately by the latter. Skipping the error here will help + // reduce log clutter. + if err == io.EOF { + return nil, nil + } return nil, connectionErrorf(false, err, "transport: http2Server.HandleStreams failed to receive the preface from client: %v", err) } if !bytes.Equal(preface, clientPreface) { @@ -295,6 +307,7 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err } } t.conn.Close() + t.controlBuf.finish() close(t.writerDone) }() go t.keepalive() @@ -304,37 +317,92 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err // operateHeader takes action on the decoded headers. func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(*Stream), traceCtx func(context.Context, string) context.Context) (fatal bool) { streamID := frame.Header().StreamID - state := &decodeState{ - serverSide: true, - } - if h2code, err := state.decodeHeader(frame); err != nil { - if _, ok := status.FromError(err); ok { - t.controlBuf.put(&cleanupStream{ - streamID: streamID, - rst: true, - rstCode: h2code, - onWrite: func() {}, - }) - } + + // frame.Truncated is set to true when framer detects that the current header + // list size hits MaxHeaderListSize limit. + if frame.Truncated { + t.controlBuf.put(&cleanupStream{ + streamID: streamID, + rst: true, + rstCode: http2.ErrCodeFrameSize, + onWrite: func() {}, + }) return false } buf := newRecvBuffer() s := &Stream{ - id: streamID, - st: t, - buf: buf, - fc: &inFlow{limit: uint32(t.initialWindowSize)}, - recvCompress: state.data.encoding, - method: state.data.method, - contentSubtype: state.data.contentSubtype, + id: streamID, + st: t, + buf: buf, + fc: &inFlow{limit: uint32(t.initialWindowSize)}, + } + + var ( + // If a gRPC Response-Headers has already been received, then it means + // that the peer is speaking gRPC and we are in gRPC mode. + isGRPC = false + mdata = make(map[string][]string) + httpMethod string + // headerError is set if an error is encountered while parsing the headers + headerError bool + + timeoutSet bool + timeout time.Duration + ) + + for _, hf := range frame.Fields { + switch hf.Name { + case "content-type": + contentSubtype, validContentType := grpcutil.ContentSubtype(hf.Value) + if !validContentType { + break + } + mdata[hf.Name] = append(mdata[hf.Name], hf.Value) + s.contentSubtype = contentSubtype + isGRPC = true + case "grpc-encoding": + s.recvCompress = hf.Value + case ":method": + httpMethod = hf.Value + case ":path": + s.method = hf.Value + case "grpc-timeout": + timeoutSet = true + var err error + if timeout, err = decodeTimeout(hf.Value); err != nil { + headerError = true + } + default: + if isReservedHeader(hf.Name) && !isWhitelistedHeader(hf.Name) { + break + } + v, err := decodeMetadataHeader(hf.Name, hf.Value) + if err != nil { + headerError = true + logger.Warningf("Failed to decode metadata header (%q, %q): %v", hf.Name, hf.Value, err) + break + } + mdata[hf.Name] = append(mdata[hf.Name], v) + } } + + if !isGRPC || headerError { + t.controlBuf.put(&cleanupStream{ + streamID: streamID, + rst: true, + rstCode: http2.ErrCodeProtocol, + onWrite: func() {}, + }) + return false + } + if frame.StreamEnded() { // s is just created by the caller. No lock needed. s.state = streamReadDone } - if state.data.timeoutSet { - s.ctx, s.cancel = context.WithTimeout(t.ctx, state.data.timeout) + if timeoutSet { + s.ctx, s.cancel = context.WithTimeout(t.ctx, timeout) } else { s.ctx, s.cancel = context.WithCancel(t.ctx) } @@ -347,14 +415,14 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func( } s.ctx = peer.NewContext(s.ctx, pr) // Attach the received metadata to the context. - if len(state.data.mdata) > 0 { - s.ctx = metadata.NewIncomingContext(s.ctx, state.data.mdata) - } - if state.data.statsTags != nil { - s.ctx = stats.SetIncomingTags(s.ctx, state.data.statsTags) - } - if state.data.statsTrace != nil { - s.ctx = stats.SetIncomingTrace(s.ctx, state.data.statsTrace) + if len(mdata) > 0 { + s.ctx = metadata.NewIncomingContext(s.ctx, mdata) + if statsTags := mdata["grpc-tags-bin"]; len(statsTags) > 0 { + s.ctx = stats.SetIncomingTags(s.ctx, []byte(statsTags[len(statsTags)-1])) + } + if statsTrace := mdata["grpc-trace-bin"]; len(statsTrace) > 0 { + s.ctx = stats.SetIncomingTrace(s.ctx, []byte(statsTrace[len(statsTrace)-1])) + } } t.mu.Lock() if t.state != reachable { @@ -383,10 +451,10 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func( return true } t.maxStreamID = streamID - if state.data.httpMethod != http.MethodPost { + if httpMethod != http.MethodPost { t.mu.Unlock() if logger.V(logLevel) { - logger.Warningf("transport: http2Server.operateHeaders parsed a :method field: %v which should be POST", state.data.httpMethod) + logger.Infof("transport: http2Server.operateHeaders parsed a :method field: %v which should be POST", httpMethod) } t.controlBuf.put(&cleanupStream{ streamID: streamID, @@ -399,7 +467,7 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func( } if t.inTapHandle != nil { var err error - if s.ctx, err = t.inTapHandle(s.ctx, &tap.Info{FullMethodName: state.data.method}); err != nil { + if s.ctx, err = t.inTapHandle(s.ctx, &tap.Info{FullMethodName: s.method}); err != nil { t.mu.Unlock() if logger.V(logLevel) { logger.Infof("transport: http2Server.operateHeaders got an error from InTapHandle: %v", err) @@ -437,7 +505,7 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func( LocalAddr: t.localAddr, Compression: s.recvCompress, WireLength: int(frame.Header().Length), - Header: metadata.MD(state.data.mdata).Copy(), + Header: metadata.MD(mdata).Copy(), } t.stats.HandleRPC(s.ctx, inHeader) } @@ -1004,12 +1072,12 @@ func (t *http2Server) keepalive() { if val <= 0 { // The connection has been idle for a duration of keepalive.MaxConnectionIdle or more. // Gracefully close the connection. - t.drain(http2.ErrCodeNo, []byte{}) + t.Drain() return } idleTimer.Reset(val) case <-ageTimer.C: - t.drain(http2.ErrCodeNo, []byte{}) + t.Drain() ageTimer.Reset(t.kp.MaxConnectionAgeGrace) select { case <-ageTimer.C: @@ -1063,11 +1131,11 @@ func (t *http2Server) keepalive() { // Close starts shutting down the http2Server transport. // TODO(zhaoq): Now the destruction is not blocked on any pending streams. This // could cause some resource issue. Revisit this later. -func (t *http2Server) Close() error { +func (t *http2Server) Close() { t.mu.Lock() if t.state == closing { t.mu.Unlock() - return errors.New("transport: Close() was already called") + return } t.state = closing streams := t.activeStreams @@ -1075,7 +1143,9 @@ func (t *http2Server) Close() error { t.mu.Unlock() t.controlBuf.finish() close(t.done) - err := t.conn.Close() + if err := t.conn.Close(); err != nil && logger.V(logLevel) { + logger.Infof("transport: error closing conn during Close: %v", err) + } if channelz.IsOn() { channelz.RemoveEntry(t.channelzID) } @@ -1087,7 +1157,6 @@ func (t *http2Server) Close() error { connEnd := &stats.ConnEnd{} t.stats.HandleConn(t.ctx, connEnd) } - return err } // deleteStream deletes the stream s from transport's active streams. @@ -1152,17 +1221,13 @@ func (t *http2Server) RemoteAddr() net.Addr { } func (t *http2Server) Drain() { - t.drain(http2.ErrCodeNo, []byte{}) -} - -func (t *http2Server) drain(code http2.ErrCode, debugData []byte) { t.mu.Lock() defer t.mu.Unlock() if t.drainChan != nil { return } t.drainChan = make(chan struct{}) - t.controlBuf.put(&goAway{code: code, debugData: debugData, headsUp: true}) + t.controlBuf.put(&goAway{code: http2.ErrCodeNo, debugData: []byte{}, headsUp: true}) } var goAwayPing = &ping{data: [8]byte{1, 6, 1, 8, 0, 3, 3, 9}} diff --git a/vendor/google.golang.org/grpc/internal/transport/http_util.go b/vendor/google.golang.org/grpc/internal/transport/http_util.go index c7dee140cf..15d775fca3 100644 --- a/vendor/google.golang.org/grpc/internal/transport/http_util.go +++ b/vendor/google.golang.org/grpc/internal/transport/http_util.go @@ -39,7 +39,6 @@ import ( spb "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" - "google.golang.org/grpc/internal/grpcutil" "google.golang.org/grpc/status" ) @@ -96,53 +95,6 @@ var ( logger = grpclog.Component("transport") ) -type parsedHeaderData struct { - encoding string - // statusGen caches the stream status received from the trailer the server - // sent. Client side only. Do not access directly. After all trailers are - // parsed, use the status method to retrieve the status. - statusGen *status.Status - // rawStatusCode and rawStatusMsg are set from the raw trailer fields and are not - // intended for direct access outside of parsing. - rawStatusCode *int - rawStatusMsg string - httpStatus *int - // Server side only fields. - timeoutSet bool - timeout time.Duration - method string - httpMethod string - // key-value metadata map from the peer. - mdata map[string][]string - statsTags []byte - statsTrace []byte - contentSubtype string - - // isGRPC field indicates whether the peer is speaking gRPC (otherwise HTTP). - // - // We are in gRPC mode (peer speaking gRPC) if: - // * We are client side and have already received a HEADER frame that indicates gRPC peer. - // * The header contains valid a content-type, i.e. a string starts with "application/grpc" - // And we should handle error specific to gRPC. - // - // Otherwise (i.e. a content-type string starts without "application/grpc", or does not exist), we - // are in HTTP fallback mode, and should handle error specific to HTTP. - isGRPC bool - grpcErr error - httpErr error - contentTypeErr string -} - -// decodeState configures decoding criteria and records the decoded data. -type decodeState struct { - // whether decoding on server side or not - serverSide bool - - // Records the states during HPACK decoding. It will be filled with info parsed from HTTP HEADERS - // frame once decodeHeader function has been invoked and returned. - data parsedHeaderData -} - // isReservedHeader checks whether hdr belongs to HTTP2 headers // reserved by gRPC protocol. Any other headers are classified as the // user-specified metadata. @@ -180,14 +132,6 @@ func isWhitelistedHeader(hdr string) bool { } } -func (d *decodeState) status() *status.Status { - if d.data.statusGen == nil { - // No status-details were provided; generate status using code/msg. - d.data.statusGen = status.New(codes.Code(int32(*(d.data.rawStatusCode))), d.data.rawStatusMsg) - } - return d.data.statusGen -} - const binHdrSuffix = "-bin" func encodeBinHeader(v []byte) string { @@ -217,170 +161,38 @@ func decodeMetadataHeader(k, v string) (string, error) { return v, nil } -func (d *decodeState) decodeHeader(frame *http2.MetaHeadersFrame) (http2.ErrCode, error) { - // frame.Truncated is set to true when framer detects that the current header - // list size hits MaxHeaderListSize limit. - if frame.Truncated { - return http2.ErrCodeFrameSize, status.Error(codes.Internal, "peer header list size exceeded limit") - } - - for _, hf := range frame.Fields { - d.processHeaderField(hf) - } - - if d.data.isGRPC { - if d.data.grpcErr != nil { - return http2.ErrCodeProtocol, d.data.grpcErr - } - if d.serverSide { - return http2.ErrCodeNo, nil - } - if d.data.rawStatusCode == nil && d.data.statusGen == nil { - // gRPC status doesn't exist. - // Set rawStatusCode to be unknown and return nil error. - // So that, if the stream has ended this Unknown status - // will be propagated to the user. - // Otherwise, it will be ignored. In which case, status from - // a later trailer, that has StreamEnded flag set, is propagated. - code := int(codes.Unknown) - d.data.rawStatusCode = &code - } - return http2.ErrCodeNo, nil +func decodeGRPCStatusDetails(rawDetails string) (*status.Status, error) { + v, err := decodeBinHeader(rawDetails) + if err != nil { + return nil, err } - - // HTTP fallback mode - if d.data.httpErr != nil { - return http2.ErrCodeProtocol, d.data.httpErr + st := &spb.Status{} + if err = proto.Unmarshal(v, st); err != nil { + return nil, err } - - var ( - code = codes.Internal // when header does not include HTTP status, return INTERNAL - ok bool - ) - - if d.data.httpStatus != nil { - code, ok = HTTPStatusConvTab[*(d.data.httpStatus)] - if !ok { - code = codes.Unknown - } - } - - return http2.ErrCodeProtocol, status.Error(code, d.constructHTTPErrMsg()) + return status.FromProto(st), nil } // constructErrMsg constructs error message to be returned in HTTP fallback mode. // Format: HTTP status code and its corresponding message + content-type error message. -func (d *decodeState) constructHTTPErrMsg() string { +func constructHTTPErrMsg(httpStatus *int, contentTypeErr string) string { var errMsgs []string - if d.data.httpStatus == nil { + if httpStatus == nil { errMsgs = append(errMsgs, "malformed header: missing HTTP status") } else { - errMsgs = append(errMsgs, fmt.Sprintf("%s: HTTP status code %d", http.StatusText(*(d.data.httpStatus)), *d.data.httpStatus)) + errMsgs = append(errMsgs, fmt.Sprintf("%s: HTTP status code %d", http.StatusText(*(httpStatus)), *httpStatus)) } - if d.data.contentTypeErr == "" { + if contentTypeErr == "" { errMsgs = append(errMsgs, "transport: missing content-type field") } else { - errMsgs = append(errMsgs, d.data.contentTypeErr) + errMsgs = append(errMsgs, contentTypeErr) } return strings.Join(errMsgs, "; ") } -func (d *decodeState) addMetadata(k, v string) { - if d.data.mdata == nil { - d.data.mdata = make(map[string][]string) - } - d.data.mdata[k] = append(d.data.mdata[k], v) -} - -func (d *decodeState) processHeaderField(f hpack.HeaderField) { - switch f.Name { - case "content-type": - contentSubtype, validContentType := grpcutil.ContentSubtype(f.Value) - if !validContentType { - d.data.contentTypeErr = fmt.Sprintf("transport: received the unexpected content-type %q", f.Value) - return - } - d.data.contentSubtype = contentSubtype - // TODO: do we want to propagate the whole content-type in the metadata, - // or come up with a way to just propagate the content-subtype if it was set? - // ie {"content-type": "application/grpc+proto"} or {"content-subtype": "proto"} - // in the metadata? - d.addMetadata(f.Name, f.Value) - d.data.isGRPC = true - case "grpc-encoding": - d.data.encoding = f.Value - case "grpc-status": - code, err := strconv.Atoi(f.Value) - if err != nil { - d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed grpc-status: %v", err) - return - } - d.data.rawStatusCode = &code - case "grpc-message": - d.data.rawStatusMsg = decodeGrpcMessage(f.Value) - case "grpc-status-details-bin": - v, err := decodeBinHeader(f.Value) - if err != nil { - d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed grpc-status-details-bin: %v", err) - return - } - s := &spb.Status{} - if err := proto.Unmarshal(v, s); err != nil { - d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed grpc-status-details-bin: %v", err) - return - } - d.data.statusGen = status.FromProto(s) - case "grpc-timeout": - d.data.timeoutSet = true - var err error - if d.data.timeout, err = decodeTimeout(f.Value); err != nil { - d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed time-out: %v", err) - } - case ":path": - d.data.method = f.Value - case ":status": - code, err := strconv.Atoi(f.Value) - if err != nil { - d.data.httpErr = status.Errorf(codes.Internal, "transport: malformed http-status: %v", err) - return - } - d.data.httpStatus = &code - case "grpc-tags-bin": - v, err := decodeBinHeader(f.Value) - if err != nil { - d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed grpc-tags-bin: %v", err) - return - } - d.data.statsTags = v - d.addMetadata(f.Name, string(v)) - case "grpc-trace-bin": - v, err := decodeBinHeader(f.Value) - if err != nil { - d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed grpc-trace-bin: %v", err) - return - } - d.data.statsTrace = v - d.addMetadata(f.Name, string(v)) - case ":method": - d.data.httpMethod = f.Value - default: - if isReservedHeader(f.Name) && !isWhitelistedHeader(f.Name) { - break - } - v, err := decodeMetadataHeader(f.Name, f.Value) - if err != nil { - if logger.V(logLevel) { - logger.Errorf("Failed to decode metadata header (%q, %q): %v", f.Name, f.Value, err) - } - return - } - d.addMetadata(f.Name, v) - } -} - type timeoutUnit uint8 const ( diff --git a/vendor/google.golang.org/grpc/internal/transport/networktype/networktype.go b/vendor/google.golang.org/grpc/internal/transport/networktype/networktype.go index 96967428b5..7bb53cff10 100644 --- a/vendor/google.golang.org/grpc/internal/transport/networktype/networktype.go +++ b/vendor/google.golang.org/grpc/internal/transport/networktype/networktype.go @@ -17,7 +17,7 @@ */ // Package networktype declares the network type to be used in the default -// dailer. Attribute of a resolver.Address. +// dialer. Attribute of a resolver.Address. package networktype import ( diff --git a/vendor/google.golang.org/grpc/internal/transport/transport.go b/vendor/google.golang.org/grpc/internal/transport/transport.go index 6cc1031fd9..1419812645 100644 --- a/vendor/google.golang.org/grpc/internal/transport/transport.go +++ b/vendor/google.golang.org/grpc/internal/transport/transport.go @@ -532,12 +532,6 @@ type ServerConfig struct { HeaderTableSize *uint32 } -// NewServerTransport creates a ServerTransport with conn or non-nil error -// if it fails. -func NewServerTransport(protocol string, conn net.Conn, config *ServerConfig) (ServerTransport, error) { - return newHTTP2Server(conn, config) -} - // ConnectOptions covers all relevant options for communicating with the server. type ConnectOptions struct { // UserAgent is the application user agent. @@ -694,7 +688,7 @@ type ServerTransport interface { // Close tears down the transport. Once it is called, the transport // should not be accessed any more. All the pending streams and their // handlers will be terminated asynchronously. - Close() error + Close() // RemoteAddr returns the remote network address. RemoteAddr() net.Addr diff --git a/vendor/google.golang.org/grpc/metadata/metadata.go b/vendor/google.golang.org/grpc/metadata/metadata.go index e4cbea9174..8d9686375a 100644 --- a/vendor/google.golang.org/grpc/metadata/metadata.go +++ b/vendor/google.golang.org/grpc/metadata/metadata.go @@ -93,12 +93,16 @@ func (md MD) Copy() MD { } // Get obtains the values for a given key. +// +// k is converted to lowercase before searching in md. func (md MD) Get(k string) []string { k = strings.ToLower(k) return md[k] } // Set sets the value of a given key with a slice of values. +// +// k is converted to lowercase before storing in md. func (md MD) Set(k string, vals ...string) { if len(vals) == 0 { return @@ -107,7 +111,10 @@ func (md MD) Set(k string, vals ...string) { md[k] = vals } -// Append adds the values to key k, not overwriting what was already stored at that key. +// Append adds the values to key k, not overwriting what was already stored at +// that key. +// +// k is converted to lowercase before storing in md. func (md MD) Append(k string, vals ...string) { if len(vals) == 0 { return @@ -117,8 +124,9 @@ func (md MD) Append(k string, vals ...string) { } // Join joins any number of mds into a single MD. -// The order of values for each key is determined by the order in which -// the mds containing those values are presented to Join. +// +// The order of values for each key is determined by the order in which the mds +// containing those values are presented to Join. func Join(mds ...MD) MD { out := MD{} for _, md := range mds { @@ -145,8 +153,8 @@ func NewOutgoingContext(ctx context.Context, md MD) context.Context { } // AppendToOutgoingContext returns a new context with the provided kv merged -// with any existing metadata in the context. Please refer to the -// documentation of Pairs for a description of kv. +// with any existing metadata in the context. Please refer to the documentation +// of Pairs for a description of kv. func AppendToOutgoingContext(ctx context.Context, kv ...string) context.Context { if len(kv)%2 == 1 { panic(fmt.Sprintf("metadata: AppendToOutgoingContext got an odd number of input pairs for metadata: %d", len(kv))) @@ -159,20 +167,34 @@ func AppendToOutgoingContext(ctx context.Context, kv ...string) context.Context return context.WithValue(ctx, mdOutgoingKey{}, rawMD{md: md.md, added: added}) } -// FromIncomingContext returns the incoming metadata in ctx if it exists. The -// returned MD should not be modified. Writing to it may cause races. -// Modification should be made to copies of the returned MD. -func FromIncomingContext(ctx context.Context) (md MD, ok bool) { - md, ok = ctx.Value(mdIncomingKey{}).(MD) - return +// FromIncomingContext returns the incoming metadata in ctx if it exists. +// +// All keys in the returned MD are lowercase. +func FromIncomingContext(ctx context.Context) (MD, bool) { + md, ok := ctx.Value(mdIncomingKey{}).(MD) + if !ok { + return nil, false + } + out := MD{} + for k, v := range md { + // We need to manually convert all keys to lower case, because MD is a + // map, and there's no guarantee that the MD attached to the context is + // created using our helper functions. + key := strings.ToLower(k) + out[key] = v + } + return out, true } -// FromOutgoingContextRaw returns the un-merged, intermediary contents -// of rawMD. Remember to perform strings.ToLower on the keys. The returned -// MD should not be modified. Writing to it may cause races. Modification -// should be made to copies of the returned MD. +// FromOutgoingContextRaw returns the un-merged, intermediary contents of rawMD. +// +// Remember to perform strings.ToLower on the keys, for both the returned MD (MD +// is a map, there's no guarantee it's created using our helper functions) and +// the extra kv pairs (AppendToOutgoingContext doesn't turn them into +// lowercase). // -// This is intended for gRPC-internal use ONLY. +// This is intended for gRPC-internal use ONLY. Users should use +// FromOutgoingContext instead. func FromOutgoingContextRaw(ctx context.Context) (MD, [][]string, bool) { raw, ok := ctx.Value(mdOutgoingKey{}).(rawMD) if !ok { @@ -182,16 +204,23 @@ func FromOutgoingContextRaw(ctx context.Context) (MD, [][]string, bool) { return raw.md, raw.added, true } -// FromOutgoingContext returns the outgoing metadata in ctx if it exists. The -// returned MD should not be modified. Writing to it may cause races. -// Modification should be made to copies of the returned MD. +// FromOutgoingContext returns the outgoing metadata in ctx if it exists. +// +// All keys in the returned MD are lowercase. func FromOutgoingContext(ctx context.Context) (MD, bool) { raw, ok := ctx.Value(mdOutgoingKey{}).(rawMD) if !ok { return nil, false } - out := raw.md.Copy() + out := MD{} + for k, v := range raw.md { + // We need to manually convert all keys to lower case, because MD is a + // map, and there's no guarantee that the MD attached to the context is + // created using our helper functions. + key := strings.ToLower(k) + out[key] = v + } for _, added := range raw.added { if len(added)%2 == 1 { panic(fmt.Sprintf("metadata: FromOutgoingContext got an odd number of input pairs for metadata: %d", len(added))) diff --git a/vendor/google.golang.org/grpc/resolver_conn_wrapper.go b/vendor/google.golang.org/grpc/resolver_conn_wrapper.go index 4118de571a..2c47cd54f0 100644 --- a/vendor/google.golang.org/grpc/resolver_conn_wrapper.go +++ b/vendor/google.golang.org/grpc/resolver_conn_wrapper.go @@ -39,6 +39,8 @@ type ccResolverWrapper struct { resolver resolver.Resolver done *grpcsync.Event curState resolver.State + + incomingMu sync.Mutex // Synchronizes all the incoming calls. } // newCCResolverWrapper uses the resolver.Builder to build a Resolver and @@ -90,6 +92,8 @@ func (ccr *ccResolverWrapper) close() { } func (ccr *ccResolverWrapper) UpdateState(s resolver.State) error { + ccr.incomingMu.Lock() + defer ccr.incomingMu.Unlock() if ccr.done.HasFired() { return nil } @@ -105,6 +109,8 @@ func (ccr *ccResolverWrapper) UpdateState(s resolver.State) error { } func (ccr *ccResolverWrapper) ReportError(err error) { + ccr.incomingMu.Lock() + defer ccr.incomingMu.Unlock() if ccr.done.HasFired() { return } @@ -114,6 +120,8 @@ func (ccr *ccResolverWrapper) ReportError(err error) { // NewAddress is called by the resolver implementation to send addresses to gRPC. func (ccr *ccResolverWrapper) NewAddress(addrs []resolver.Address) { + ccr.incomingMu.Lock() + defer ccr.incomingMu.Unlock() if ccr.done.HasFired() { return } @@ -128,6 +136,8 @@ func (ccr *ccResolverWrapper) NewAddress(addrs []resolver.Address) { // NewServiceConfig is called by the resolver implementation to send service // configs to gRPC. func (ccr *ccResolverWrapper) NewServiceConfig(sc string) { + ccr.incomingMu.Lock() + defer ccr.incomingMu.Unlock() if ccr.done.HasFired() { return } diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go index 6db356fa56..1831a73e73 100644 --- a/vendor/google.golang.org/grpc/rpc_util.go +++ b/vendor/google.golang.org/grpc/rpc_util.go @@ -258,7 +258,8 @@ func (o PeerCallOption) after(c *callInfo, attempt *csAttempt) { } // WaitForReady configures the action to take when an RPC is attempted on broken -// connections or unreachable servers. If waitForReady is false, the RPC will fail +// connections or unreachable servers. If waitForReady is false and the +// connection is in the TRANSIENT_FAILURE state, the RPC will fail // immediately. Otherwise, the RPC client will block the call until a // connection is available (or the call is canceled or times out) and will // retry the call if it fails due to a transient error. gRPC will not retry if diff --git a/vendor/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go index 0a151dee4f..d90f3fcd3b 100644 --- a/vendor/google.golang.org/grpc/server.go +++ b/vendor/google.golang.org/grpc/server.go @@ -844,10 +844,16 @@ func (s *Server) handleRawConn(lisAddr string, rawConn net.Conn) { // ErrConnDispatched means that the connection was dispatched away from // gRPC; those connections should be left open. if err != credentials.ErrConnDispatched { - s.mu.Lock() - s.errorf("ServerHandshake(%q) failed: %v", rawConn.RemoteAddr(), err) - s.mu.Unlock() - channelz.Warningf(logger, s.channelzID, "grpc: Server.Serve failed to complete security handshake from %q: %v", rawConn.RemoteAddr(), err) + // In deployments where a gRPC server runs behind a cloud load + // balancer which performs regular TCP level health checks, the + // connection is closed immediately by the latter. Skipping the + // error here will help reduce log clutter. + if err != io.EOF { + s.mu.Lock() + s.errorf("ServerHandshake(%q) failed: %v", rawConn.RemoteAddr(), err) + s.mu.Unlock() + channelz.Warningf(logger, s.channelzID, "grpc: Server.Serve failed to complete security handshake from %q: %v", rawConn.RemoteAddr(), err) + } rawConn.Close() } rawConn.SetDeadline(time.Time{}) @@ -897,7 +903,7 @@ func (s *Server) newHTTP2Transport(c net.Conn, authInfo credentials.AuthInfo) tr MaxHeaderListSize: s.opts.maxHeaderListSize, HeaderTableSize: s.opts.headerTableSize, } - st, err := transport.NewServerTransport("http2", c, config) + st, err := transport.NewServerTransport(c, config) if err != nil { s.mu.Lock() s.errorf("NewServerTransport(%q) failed: %v", c.RemoteAddr(), err) @@ -1521,6 +1527,8 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp } } + ss.ctx = newContextWithRPCInfo(ss.ctx, false, ss.codec, ss.cp, ss.comp) + if trInfo != nil { trInfo.tr.LazyLog(&trInfo.firstLine, false) } @@ -1588,7 +1596,7 @@ func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Str trInfo.tr.SetError() } errDesc := fmt.Sprintf("malformed method name: %q", stream.Method()) - if err := t.WriteStatus(stream, status.New(codes.ResourceExhausted, errDesc)); err != nil { + if err := t.WriteStatus(stream, status.New(codes.Unimplemented, errDesc)); err != nil { if trInfo != nil { trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true) trInfo.tr.SetError() diff --git a/vendor/google.golang.org/grpc/version.go b/vendor/google.golang.org/grpc/version.go index 8eb547e25a..3dd146afb1 100644 --- a/vendor/google.golang.org/grpc/version.go +++ b/vendor/google.golang.org/grpc/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.38.1" +const Version = "1.39.0" diff --git a/vendor/google.golang.org/grpc/vet.sh b/vendor/google.golang.org/grpc/vet.sh index 1a0dbd7ee5..5eaa8b05d6 100644 --- a/vendor/google.golang.org/grpc/vet.sh +++ b/vendor/google.golang.org/grpc/vet.sh @@ -32,26 +32,14 @@ PATH="${HOME}/go/bin:${GOROOT}/bin:${PATH}" go version if [[ "$1" = "-install" ]]; then - # Check for module support - if go help mod >& /dev/null; then - # Install the pinned versions as defined in module tools. - pushd ./test/tools - go install \ - golang.org/x/lint/golint \ - golang.org/x/tools/cmd/goimports \ - honnef.co/go/tools/cmd/staticcheck \ - github.com/client9/misspell/cmd/misspell - popd - else - # Ye olde `go get` incantation. - # Note: this gets the latest version of all tools (vs. the pinned versions - # with Go modules). - go get -u \ - golang.org/x/lint/golint \ - golang.org/x/tools/cmd/goimports \ - honnef.co/go/tools/cmd/staticcheck \ - github.com/client9/misspell/cmd/misspell - fi + # Install the pinned versions as defined in module tools. + pushd ./test/tools + go install \ + golang.org/x/lint/golint \ + golang.org/x/tools/cmd/goimports \ + honnef.co/go/tools/cmd/staticcheck \ + github.com/client9/misspell/cmd/misspell + popd if [[ -z "${VET_SKIP_PROTO}" ]]; then if [[ "${TRAVIS}" = "true" ]]; then PROTOBUF_VERSION=3.14.0 diff --git a/vendor/modules.txt b/vendor/modules.txt index d6d88f2577..0249ca298d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -106,7 +106,7 @@ github.com/cilium/hubble/pkg/printer # github.com/cilium/workerpool v1.0.0 ## explicit github.com/cilium/workerpool -# github.com/cloudflare/cfssl v1.5.0 +# github.com/cloudflare/cfssl v1.6.0 ## explicit github.com/cloudflare/cfssl/api github.com/cloudflare/cfssl/api/client @@ -304,7 +304,7 @@ github.com/pierrec/lz4/v4/internal/lz4block github.com/pierrec/lz4/v4/internal/lz4errors github.com/pierrec/lz4/v4/internal/lz4stream github.com/pierrec/lz4/v4/internal/xxh32 -# github.com/pkg/browser v0.0.0-20210606212950-a7b7a6107d32 +# github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 ## explicit github.com/pkg/browser # github.com/pkg/errors v0.9.1 @@ -362,23 +362,23 @@ github.com/weppos/publicsuffix-go/publicsuffix github.com/xi2/xz # github.com/xlab/treeprint v1.0.0 github.com/xlab/treeprint -# github.com/zmap/zcrypto v0.0.0-20200911161511-43ff0ea04f21 +# github.com/zmap/zcrypto v0.0.0-20201128221613-3719af1573cf github.com/zmap/zcrypto/json github.com/zmap/zcrypto/util github.com/zmap/zcrypto/x509 github.com/zmap/zcrypto/x509/ct github.com/zmap/zcrypto/x509/pkix -# github.com/zmap/zlint/v2 v2.2.1 -github.com/zmap/zlint/v2 -github.com/zmap/zlint/v2/lint -github.com/zmap/zlint/v2/lints/apple -github.com/zmap/zlint/v2/lints/cabf_br -github.com/zmap/zlint/v2/lints/cabf_ev -github.com/zmap/zlint/v2/lints/community -github.com/zmap/zlint/v2/lints/etsi -github.com/zmap/zlint/v2/lints/mozilla -github.com/zmap/zlint/v2/lints/rfc -github.com/zmap/zlint/v2/util +# github.com/zmap/zlint/v3 v3.0.0 +github.com/zmap/zlint/v3 +github.com/zmap/zlint/v3/lint +github.com/zmap/zlint/v3/lints/apple +github.com/zmap/zlint/v3/lints/cabf_br +github.com/zmap/zlint/v3/lints/cabf_ev +github.com/zmap/zlint/v3/lints/community +github.com/zmap/zlint/v3/lints/etsi +github.com/zmap/zlint/v3/lints/mozilla +github.com/zmap/zlint/v3/lints/rfc +github.com/zmap/zlint/v3/util # go.mongodb.org/mongo-driver v1.4.4 go.mongodb.org/mongo-driver/bson go.mongodb.org/mongo-driver/bson/bsoncodec @@ -425,7 +425,7 @@ golang.org/x/oauth2/jws golang.org/x/oauth2/jwt # golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sync/semaphore -# golang.org/x/sys v0.0.0-20210510120138-977fb7262007 +# golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71 golang.org/x/sys/internal/unsafeheader golang.org/x/sys/plan9 golang.org/x/sys/unix @@ -459,7 +459,7 @@ google.golang.org/appengine/internal/urlfetch google.golang.org/appengine/urlfetch # google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c google.golang.org/genproto/googleapis/rpc/status -# google.golang.org/grpc v1.38.1 +# google.golang.org/grpc v1.39.0 ## explicit google.golang.org/grpc google.golang.org/grpc/attributes