Skip to content

Commit 1f6b6c5

Browse files
authored
See notes ... (#1232)
1 parent eb4dfeb commit 1f6b6c5

File tree

5 files changed

+46
-6
lines changed

5 files changed

+46
-6
lines changed

.github/workflows/actionlint.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Lint GitHub Actions workflows
2+
on:
3+
push:
4+
workflow_call:
5+
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
8+
cancel-in-progress: true
9+
10+
permissions:
11+
contents: write
12+
pull-requests: write
13+
14+
jobs:
15+
actionlint:
16+
uses: smallstep/workflows/.github/workflows/actionlint.yml@main
17+
secrets: inherit

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2626

2727
---
2828

29+
## [0.27.0] - 2024-07-11
30+
31+
### Changed
32+
33+
- Makefile: install to /usr/local/bin, not /usr/bin (smallstep/cli#1214)
34+
35+
### Fixed
36+
37+
- Set proper JOSE algorithm for Ed25519 keys (smallstep/cli#1208)
38+
- Makefile: usage of install command line flags on MacOS (smallstep/cli#1212)
39+
- Restore operation of '--bundle' flag in certificate inspect (smallstep/cli#1215)
40+
- Fish completion (smallstep/cli#1222)
41+
- Restore operation of inspect CSR from STDIN (smallstep/cli#1232)
42+
43+
### Security
44+
45+
2946
## [0.26.2] - 2024-06-13
3047

3148
### Added

command/certificate/inspect.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/pkg/errors"
1212
"github.com/smallstep/certinfo"
1313
"github.com/smallstep/cli/flags"
14+
"github.com/smallstep/cli/utils"
1415
zx509 "github.com/smallstep/zcrypto/x509"
1516
"github.com/urfave/cli"
1617
"go.step.sm/cli-utils/errs"
@@ -218,17 +219,22 @@ func inspectAction(ctx *cli.Context) error {
218219
}
219220
return inspectCertificates(ctx, peerCertificates[:1], os.Stdout)
220221
default: // is not URL
222+
b, err := utils.ReadFile(crtFile)
223+
if err != nil {
224+
return errors.Wrapf(err, "error reading file %s", crtFile)
225+
}
226+
221227
var pemError *pemutil.InvalidPEMError
222-
crts, err := pemutil.ReadCertificateBundle(crtFile)
228+
crts, err := pemutil.ParseCertificateBundle(b)
223229
switch {
224230
case errors.As(err, &pemError) && pemError.Type == pemutil.PEMTypeCertificate:
225-
csr, err := pemutil.ReadCertificateRequest(crtFile)
231+
csr, err := pemutil.ParseCertificateRequest(b)
226232
if err != nil {
227233
return errors.Errorf("file %s does not contain any valid CERTIFICATE or CERTIFICATE REQUEST blocks", crtFile)
228234
}
229235
return inspectCertificateRequest(ctx, csr, os.Stdout)
230236
case err != nil:
231-
return err
237+
return fmt.Errorf("error parsing %s: %w", crtFile, err)
232238
default:
233239
if bundle {
234240
return inspectCertificates(ctx, crts, os.Stdout)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/urfave/cli v1.22.15
2727
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352
2828
go.step.sm/cli-utils v0.9.0
29-
go.step.sm/crypto v0.49.0
29+
go.step.sm/crypto v0.50.0
3030
go.step.sm/linkedca v0.22.1
3131
golang.org/x/crypto v0.25.0
3232
golang.org/x/sys v0.22.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y
473473
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
474474
go.step.sm/cli-utils v0.9.0 h1:55jYcsQbnArNqepZyAwcato6Zy2MoZDRkWW+jF+aPfQ=
475475
go.step.sm/cli-utils v0.9.0/go.mod h1:Y/CRoWl1FVR9j+7PnAewufAwKmBOTzR6l9+7EYGAnp8=
476-
go.step.sm/crypto v0.49.0 h1:J4qW5/ODYeHJFAM4PuNLSHKBMGWh4iwX6Tcrsp42r+U=
477-
go.step.sm/crypto v0.49.0/go.mod h1:NCFMhLS6FJXQ9sD9PP282oHtsBWLrI6wXZY0eOkq7t8=
476+
go.step.sm/crypto v0.50.0 h1:BqI9sEgocoHDLLHiZnFqdqXl5FjdMvOWKMm/fKL/lrw=
477+
go.step.sm/crypto v0.50.0/go.mod h1:NCFMhLS6FJXQ9sD9PP282oHtsBWLrI6wXZY0eOkq7t8=
478478
go.step.sm/linkedca v0.22.1 h1:GvprpH9P4Sv9U+eZ3bxDgRSSpW14cFDYpe1kS6yWLkw=
479479
go.step.sm/linkedca v0.22.1/go.mod h1:dOKdF4HSn73YUEkfS5/FECngZmBtj2Il5DTKWXY4S6Y=
480480
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=

0 commit comments

Comments
 (0)