Skip to content

Commit e4b7a87

Browse files
umbynosumbynos
authored
add support for .pem cert format (#132)
* add support for `.pem` cert format * bump x/sys causing build failure
1 parent ba458a2 commit e4b7a87

File tree

8 files changed

+40
-21
lines changed

8 files changed

+40
-21
lines changed

‎.licenses/go/golang.org/x/sys/internal/unsafeheader.dep.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
name: golang.org/x/sys/internal/unsafeheader
3-
version: v0.0.0-20200909081042-eff7692f9009
3+
version: v0.0.0-20220422013727-9388b58f7150
44
type: go
55
summary: Package unsafeheader contains header declarations for the Go runtime's slice
66
and string implementations.
77
homepage: https://pkg.go.dev/golang.org/x/sys/internal/unsafeheader
88
license: bsd-3-clause
99
licenses:
10-
- sources: [email protected]20200909081042-eff7692f9009/LICENSE
10+
- sources: [email protected]20220422013727-9388b58f7150/LICENSE
1111
text: |
1212
Copyright (c) 2009 The Go Authors. All rights reserved.
1313
@@ -36,7 +36,7 @@ licenses:
3636
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3737
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3838
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39-
- sources: [email protected]20200909081042-eff7692f9009/PATENTS
39+
- sources: [email protected]20220422013727-9388b58f7150/PATENTS
4040
text: |
4141
Additional IP Rights Grant (Patents)
4242

‎.licenses/go/golang.org/x/sys/unix.dep.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
name: golang.org/x/sys/unix
3-
version: v0.0.0-20200909081042-eff7692f9009
3+
version: v0.0.0-20220422013727-9388b58f7150
44
type: go
55
summary: Package unix contains an interface to the low-level operating system primitives.
66
homepage: https://pkg.go.dev/golang.org/x/sys/unix
77
license: bsd-3-clause
88
licenses:
9-
- sources: [email protected]20200909081042-eff7692f9009/LICENSE
9+
- sources: [email protected]20220422013727-9388b58f7150/LICENSE
1010
text: |
1111
Copyright (c) 2009 The Go Authors. All rights reserved.
1212
@@ -35,7 +35,7 @@ licenses:
3535
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3636
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3737
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
38-
- sources: [email protected]20200909081042-eff7692f9009/PATENTS
38+
- sources: [email protected]20220422013727-9388b58f7150/PATENTS
3939
text: |
4040
Additional IP Rights Grant (Patents)
4141

‎docs/usage.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ The tool offers also the ability to flash SSL certificates to a module:
7474
./arduino-fwuploader certificates flash -b arduino:samd:nano_33_iot" -a COM10 -u arduino.cc:443 -u google.com:443
7575
```
7676

77-
or you can specify a path to a file in `.der` format with `-f` instead of the URL of the certificate
77+
or you can specify a path to a file in `.der` format or in `.pem` format with `-f` or `--file` instead of the URL of the
78+
certificate
7879

7980
Due to a limitation on the handling of certs in the NINA modules, when `certificates flash` command is launched, all the
8081
previous certificates are going to be erased. To overcome this it's required to upload them all together:

‎docsgen/go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,8 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
397397
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
398398
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 h1:W0lCpv29Hv0UaM1LXb9QlBHLNP8UFfcKjblhVCWftOM=
399399
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
400+
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
401+
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
400402
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
401403
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
402404
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=

‎flasher/nina.go‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,21 @@ func (f *NinaFlasher) certificateFromFile(certificateFile *paths.Path) ([]byte,
147147
logrus.Error(err)
148148
return nil, err
149149
}
150-
151-
cert, err := x509.ParseCertificate(data)
152-
if err != nil {
153-
logrus.Error(err)
154-
return nil, err
150+
switch certificateFile.Ext() {
151+
case ".cer":
152+
// the data needs to be formatted in PEM format
153+
cert, err := x509.ParseCertificate(data)
154+
if err != nil {
155+
logrus.Error(err)
156+
return nil, err
157+
}
158+
return pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: cert.Raw}), nil
159+
case ".pem":
160+
// the data is already encoded in pem format and we do not need to parse it.
161+
return data, nil
162+
default:
163+
return nil, fmt.Errorf("cert format %s not supported, please use .pem or .cer", certificateFile.Ext())
155164
}
156-
157-
return pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: cert.Raw}), nil
158165
}
159166

160167
func (f *NinaFlasher) certificateFromURL(URL string) ([]byte, error) {

‎flasher/winc.go‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,20 @@ func (f *WincFlasher) certificateFromFile(certificateFile *paths.Path) ([]byte,
119119
logrus.Error(err)
120120
return nil, err
121121
}
122-
123-
cert, err := x509.ParseCertificate(data)
124-
if err != nil {
125-
logrus.Error(err)
126-
return nil, err
122+
switch certificateFile.Ext() {
123+
case ".cer":
124+
cert, err := x509.ParseCertificate(data)
125+
if err != nil {
126+
logrus.Error(err)
127+
return nil, err
128+
}
129+
return f.getCertificateData(cert)
130+
case ".pem":
131+
// the data is already encoded in pem format and we do not need to parse it.
132+
return data, nil
133+
default:
134+
return nil, fmt.Errorf("cert format %s not supported, please use .pem or .cer", certificateFile.Ext())
127135
}
128-
129-
return f.getCertificateData(cert)
130136
}
131137

132138
func (f *WincFlasher) certificateFromURL(URL string) ([]byte, error) {

‎go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ require (
1515
go.bug.st/downloader/v2 v2.1.1
1616
go.bug.st/relaxed-semver v0.0.0-20190922224835-391e10178d18
1717
go.bug.st/serial v1.3.0
18+
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
1819
)

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,8 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
403403
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
404404
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 h1:W0lCpv29Hv0UaM1LXb9QlBHLNP8UFfcKjblhVCWftOM=
405405
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
406+
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
407+
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
406408
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
407409
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
408410
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=

0 commit comments

Comments
 (0)