diff -Nru mkcert-1.4.3/analysis.go mkcert-1.4.4/analysis.go --- mkcert-1.4.3/analysis.go 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/analysis.go 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -// Copyright 2018 The mkcert Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build analysis - -package main - -import ( - "golang.org/x/tools/go/analysis" - "golang.org/x/tools/go/analysis/multichecker" - - "golang.org/x/tools/go/analysis/passes/asmdecl" - "golang.org/x/tools/go/analysis/passes/assign" - "golang.org/x/tools/go/analysis/passes/atomic" - "golang.org/x/tools/go/analysis/passes/bools" - "golang.org/x/tools/go/analysis/passes/buildtag" - "golang.org/x/tools/go/analysis/passes/cgocall" - "golang.org/x/tools/go/analysis/passes/composite" - "golang.org/x/tools/go/analysis/passes/copylock" - "golang.org/x/tools/go/analysis/passes/errorsas" - "golang.org/x/tools/go/analysis/passes/httpresponse" - "golang.org/x/tools/go/analysis/passes/ifaceassert" - "golang.org/x/tools/go/analysis/passes/loopclosure" - "golang.org/x/tools/go/analysis/passes/lostcancel" - "golang.org/x/tools/go/analysis/passes/nilfunc" - "golang.org/x/tools/go/analysis/passes/printf" - "golang.org/x/tools/go/analysis/passes/shift" - "golang.org/x/tools/go/analysis/passes/stdmethods" - "golang.org/x/tools/go/analysis/passes/stringintconv" - "golang.org/x/tools/go/analysis/passes/structtag" - "golang.org/x/tools/go/analysis/passes/testinggoroutine" - "golang.org/x/tools/go/analysis/passes/tests" - "golang.org/x/tools/go/analysis/passes/unmarshal" - "golang.org/x/tools/go/analysis/passes/unreachable" - "golang.org/x/tools/go/analysis/passes/unusedresult" - - "honnef.co/go/tools/simple" - "honnef.co/go/tools/staticcheck" - "honnef.co/go/tools/stylecheck" -) - -func main() { - var analyzers []*analysis.Analyzer - - // Add all cmd/vet analyzers. - // https://github.com/golang/go/issues/35487 - analyzers = append(analyzers, - asmdecl.Analyzer, - assign.Analyzer, - atomic.Analyzer, - bools.Analyzer, - buildtag.Analyzer, - cgocall.Analyzer, - composite.Analyzer, - copylock.Analyzer, - errorsas.Analyzer, - httpresponse.Analyzer, - ifaceassert.Analyzer, - loopclosure.Analyzer, - lostcancel.Analyzer, - nilfunc.Analyzer, - printf.Analyzer, - shift.Analyzer, - stdmethods.Analyzer, - stringintconv.Analyzer, - structtag.Analyzer, - tests.Analyzer, - testinggoroutine.Analyzer, - unmarshal.Analyzer, - unreachable.Analyzer, - // False positives when using Windows DLL procs. - // https://github.com/golang/go/issues/41205 - // unsafeptr.Analyzer, - unusedresult.Analyzer) - - for _, v := range simple.Analyzers { - analyzers = append(analyzers, v) - } - for _, v := range staticcheck.Analyzers { - analyzers = append(analyzers, v) - } - for _, v := range stylecheck.Analyzers { - analyzers = append(analyzers, v) - } - - multichecker.Main(analyzers...) -} diff -Nru mkcert-1.4.3/cert.go mkcert-1.4.4/cert.go --- mkcert-1.4.3/cert.go 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/cert.go 2022-04-26 17:37:25.000000000 +0000 @@ -253,14 +253,16 @@ cert, err := x509.CreateCertificate(rand.Reader, tpl, m.caCert, csr.PublicKey, m.caKey) fatalIfErr(err, "failed to generate certificate") + c, err := x509.ParseCertificate(cert) + fatalIfErr(err, "failed to parse generated certificate") var hosts []string - hosts = append(hosts, csr.DNSNames...) - hosts = append(hosts, csr.EmailAddresses...) - for _, ip := range csr.IPAddresses { + hosts = append(hosts, c.DNSNames...) + hosts = append(hosts, c.EmailAddresses...) + for _, ip := range c.IPAddresses { hosts = append(hosts, ip.String()) } - for _, uri := range csr.URIs { + for _, uri := range c.URIs { hosts = append(hosts, uri.String()) } certFile, _, _ := m.fileNames(hosts) @@ -356,7 +358,7 @@ err = ioutil.WriteFile(filepath.Join(m.CAROOT, rootName), pem.EncodeToMemory( &pem.Block{Type: "CERTIFICATE", Bytes: cert}), 0644) - fatalIfErr(err, "failed to save CA key") + fatalIfErr(err, "failed to save CA certificate") log.Printf("Created a new local CA 💥\n") } diff -Nru mkcert-1.4.3/debian/changelog mkcert-1.4.4/debian/changelog --- mkcert-1.4.3/debian/changelog 2021-11-08 16:14:59.000000000 +0000 +++ mkcert-1.4.4/debian/changelog 2022-07-25 11:15:17.000000000 +0000 @@ -1,3 +1,9 @@ +mkcert (1.4.4-1) unstable; urgency=medium + + * New upstream version. + + -- Aloïs Micard Mon, 25 Jul 2022 13:15:17 +0200 + mkcert (1.4.3-1) unstable; urgency=medium * Initial release (Closes: #953974) diff -Nru mkcert-1.4.3/.github/ISSUE_TEMPLATE/bug-report.md mkcert-1.4.4/.github/ISSUE_TEMPLATE/bug-report.md --- mkcert-1.4.3/.github/ISSUE_TEMPLATE/bug-report.md 1970-01-01 00:00:00.000000000 +0000 +++ mkcert-1.4.4/.github/ISSUE_TEMPLATE/bug-report.md 2022-04-26 17:37:25.000000000 +0000 @@ -0,0 +1,23 @@ +--- +name: Bug report 🐞 +about: Did mkcert not work as intended? Is it broken in a certain environment? +title: '' +labels: '' +assignees: '' + +--- + +## Environment + +* Operating system (including version): +* mkcert version (from `mkcert -version`): +* Server (where the certificate is loaded): +* Client (e.g. browser, CLI tool, or script): + +## What you did + + + +## What went wrong + + diff -Nru mkcert-1.4.3/.github/ISSUE_TEMPLATE/config.yml mkcert-1.4.4/.github/ISSUE_TEMPLATE/config.yml --- mkcert-1.4.3/.github/ISSUE_TEMPLATE/config.yml 1970-01-01 00:00:00.000000000 +0000 +++ mkcert-1.4.4/.github/ISSUE_TEMPLATE/config.yml 2022-04-26 17:37:25.000000000 +0000 @@ -0,0 +1,7 @@ +contact_links: + - name: Question 🙋 + url: https://github.com/FiloSottile/mkcert/discussions/new?category=q-a + about: Have a question about how to use mkcert? + - name: Feature request or suggestion + url: https://github.com/FiloSottile/mkcert/discussions/new?category=ideas + about: Wish mkcert had a feature it doesn't currently have? diff -Nru mkcert-1.4.3/.github/workflows/release.yml mkcert-1.4.4/.github/workflows/release.yml --- mkcert-1.4.3/.github/workflows/release.yml 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/.github/workflows/release.yml 2022-04-26 17:37:25.000000000 +0000 @@ -19,7 +19,9 @@ CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -o "mkcert-$(git describe --tags)-linux-arm" -ldflags "-X main.Version=$(git describe --tags)" CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o "mkcert-$(git describe --tags)-linux-arm64" -ldflags "-X main.Version=$(git describe --tags)" CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o "mkcert-$(git describe --tags)-darwin-amd64" -ldflags "-X main.Version=$(git describe --tags)" + CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o "mkcert-$(git describe --tags)-darwin-arm64" -ldflags "-X main.Version=$(git describe --tags)" CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o "mkcert-$(git describe --tags)-windows-amd64.exe" -ldflags "-X main.Version=$(git describe --tags)" + CGO_ENABLED=0 GOOS=windows GOARCH=arm64 go build -o "mkcert-$(git describe --tags)-windows-arm64.exe" -ldflags "-X main.Version=$(git describe --tags)" - name: Upload release artifacts uses: actions/github-script@v3 with: @@ -42,5 +44,5 @@ release_id: release.data.id, name: file, data: await fs.readFile(file), - }); + }); } diff -Nru mkcert-1.4.3/.github/workflows/test.yml mkcert-1.4.4/.github/workflows/test.yml --- mkcert-1.4.3/.github/workflows/test.yml 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/.github/workflows/test.yml 2022-04-26 17:37:25.000000000 +0000 @@ -6,17 +6,18 @@ strategy: fail-fast: false matrix: - go: [1.14.x, 1.x] os: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - name: Install Go ${{ matrix.go }} uses: actions/setup-go@v2 with: - go-version: ${{ matrix.go }} + go-version: 1.x - name: Checkout repository uses: actions/checkout@v2 - - name: Run analyses - run: go run analysis.go ./... + - name: Run staticcheck + run: | + go install honnef.co/go/tools/cmd/staticcheck@latest + staticcheck ./... - name: Run tests run: go test -race ./... diff -Nru mkcert-1.4.3/go.mod mkcert-1.4.4/go.mod --- mkcert-1.4.3/go.mod 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/go.mod 2022-04-26 17:37:25.000000000 +0000 @@ -1,11 +1,14 @@ module filippo.io/mkcert -go 1.13 +go 1.18 require ( - golang.org/x/net v0.0.0-20201021035429-f5854403a974 - golang.org/x/tools v0.0.0-20201124202034-299f270db459 - honnef.co/go/tools v0.0.1-2020.1.6 - howett.net/plist v0.0.0-20181124034731-591f970eefbb - software.sslmate.com/src/go-pkcs12 v0.0.0-20180114231543-2291e8f0f237 + golang.org/x/net v0.0.0-20220421235706-1d1ef9303861 + howett.net/plist v1.0.0 + software.sslmate.com/src/go-pkcs12 v0.2.0 +) + +require ( + golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect + golang.org/x/text v0.3.7 // indirect ) diff -Nru mkcert-1.4.3/go.sum mkcert-1.4.4/go.sum --- mkcert-1.4.3/go.sum 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/go.sum 2022-04-26 17:37:25.000000000 +0000 @@ -1,54 +1,20 @@ -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -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-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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-20200930185726-fdedc70b468f/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/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 h1:tkVvjkPTB7pnW3jnid7kNyAMPVWllTNOf/qKDze4p9o= +golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220421235706-1d1ef9303861 h1:yssD99+7tqHWO5Gwh81phT+67hg+KttniBr6UnEXOY8= +golang.org/x/net v0.0.0-20220421235706-1d1ef9303861/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20201124202034-299f270db459 h1:XrUnpqJ8xqeZHrgPu3FuYCv9/O3MrxnIKh5/+MLDE8Q= -golang.org/x/tools v0.0.0-20201124202034-299f270db459/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -honnef.co/go/tools v0.0.1-2020.1.6 h1:W18jzjh8mfPez+AwGLxmOImucz/IFjpNlrKVnaj2YVc= -honnef.co/go/tools v0.0.1-2020.1.6/go.mod h1:pyyisuGw24ruLjrr1ddx39WE0y9OooInRzEYLhQB2YY= -howett.net/plist v0.0.0-20181124034731-591f970eefbb h1:jhnBjNi9UFpfpl8YZhA9CrOqpnJdvzuiHsl/dnxl11M= -howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= -software.sslmate.com/src/go-pkcs12 v0.0.0-20180114231543-2291e8f0f237 h1:iAEkCBPbRaflBgZ7o9gjVUuWuvWeV4sytFWg9o+Pj2k= -software.sslmate.com/src/go-pkcs12 v0.0.0-20180114231543-2291e8f0f237/go.mod h1:/xvNRWUqm0+/ZMiF4EX00vrSCMsE4/NHb+Pt3freEeQ= +gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= +howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= +howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= +software.sslmate.com/src/go-pkcs12 v0.2.0 h1:nlFkj7bTysH6VkC4fGphtjXRbezREPgrHuJG20hBGPE= +software.sslmate.com/src/go-pkcs12 v0.2.0/go.mod h1:23rNcYsMabIc1otwLpTkCCPwUq6kQsTyowttG/as0kQ= diff -Nru mkcert-1.4.3/main.go mkcert-1.4.4/main.go --- mkcert-1.4.3/main.go 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/main.go 2022-04-26 17:37:25.000000000 +0000 @@ -85,6 +85,10 @@ var Version string func main() { + if len(os.Args) == 1 { + fmt.Print(shortUsage) + return + } log.SetFlags(0) var ( installFlag = flag.Bool("install", false, "") diff -Nru mkcert-1.4.3/README.md mkcert-1.4.4/README.md --- mkcert-1.4.3/README.md 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/README.md 2022-04-26 17:37:25.000000000 +0000 @@ -62,7 +62,7 @@ sudo zypper install mozilla-nss-tools ``` -Then you can install using [Linuxbrew](http://linuxbrew.sh/) +Then you can install using [Homebrew on Linux](https://docs.brew.sh/Homebrew-on-Linux) ``` brew install mkcert @@ -77,6 +77,12 @@ or use [the pre-built binaries](https://github.com/FiloSottile/mkcert/releases). +``` +curl -JLO "https://dl.filippo.io/mkcert/latest?for=linux/amd64" +chmod +x mkcert-v*-linux-amd64 +sudo cp mkcert-v*-linux-amd64 /usr/local/bin/mkcert +``` + For Arch Linux users, [`mkcert`](https://www.archlinux.org/packages/community/x86_64/mkcert/) is available on the official Arch Linux repository. ``` diff -Nru mkcert-1.4.3/truststore_darwin.go mkcert-1.4.4/truststore_darwin.go --- mkcert-1.4.3/truststore_darwin.go 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/truststore_darwin.go 2022-04-26 17:37:25.000000000 +0000 @@ -16,7 +16,7 @@ ) var ( - FirefoxProfile = os.Getenv("HOME") + "/Library/Application Support/Firefox/Profiles/*" + FirefoxProfiles = []string{os.Getenv("HOME") + "/Library/Application Support/Firefox/Profiles/*"} CertutilInstallHelp = "brew install nss" NSSBrowsers = "Firefox" ) diff -Nru mkcert-1.4.3/truststore_linux.go mkcert-1.4.4/truststore_linux.go --- mkcert-1.4.3/truststore_linux.go 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/truststore_linux.go 2022-04-26 17:37:25.000000000 +0000 @@ -15,8 +15,9 @@ ) var ( - FirefoxProfile = os.Getenv("HOME") + "/.mozilla/firefox/*" - NSSBrowsers = "Firefox and/or Chrome/Chromium" + FirefoxProfiles = []string{os.Getenv("HOME") + "/.mozilla/firefox/*", + os.Getenv("HOME") + "/snap/firefox/common/.mozilla/firefox/*"} + NSSBrowsers = "Firefox and/or Chrome/Chromium" SystemTrustFilename string SystemTrustCommand []string diff -Nru mkcert-1.4.3/truststore_nss.go mkcert-1.4.4/truststore_nss.go --- mkcert-1.4.3/truststore_nss.go 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/truststore_nss.go 2022-04-26 17:37:25.000000000 +0000 @@ -27,6 +27,7 @@ "/usr/bin/firefox", "/usr/bin/firefox-nightly", "/usr/bin/firefox-developer-edition", + "/snap/firefox", "/Applications/Firefox.app", "/Applications/FirefoxDeveloperEdition.app", "/Applications/Firefox Developer Edition.app", @@ -128,8 +129,12 @@ } func (m *mkcert) forEachNSSProfile(f func(profile string)) (found int) { - profiles, _ := filepath.Glob(FirefoxProfile) + var profiles []string profiles = append(profiles, nssDBs...) + for _, ff := range FirefoxProfiles { + pp, _ := filepath.Glob(ff) + profiles = append(profiles, pp...) + } for _, profile := range profiles { if stat, err := os.Stat(profile); err != nil || !stat.IsDir() { continue diff -Nru mkcert-1.4.3/truststore_windows.go mkcert-1.4.4/truststore_windows.go --- mkcert-1.4.3/truststore_windows.go 2020-11-25 13:09:45.000000000 +0000 +++ mkcert-1.4.4/truststore_windows.go 2022-04-26 17:37:25.000000000 +0000 @@ -17,7 +17,7 @@ ) var ( - FirefoxProfile = os.Getenv("USERPROFILE") + "\\AppData\\Roaming\\Mozilla\\Firefox\\Profiles" + FirefoxProfiles = []string{os.Getenv("USERPROFILE") + "\\AppData\\Roaming\\Mozilla\\Firefox\\Profiles"} CertutilInstallHelp = "" // certutil unsupported on Windows NSSBrowsers = "Firefox" )