Merge branch 'main' into main

notaryproject · Aug 9, 2022 · 3913130 · 3913130
2 parents 019335f + 55fd020
commit 3913130
Show file tree

Hide file tree

Showing 5 changed files with 568 additions and 13 deletions.
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.17
 require (
 	github.com/go-ldap/ldap/v3 v3.4.3
 	github.com/golang-jwt/jwt/v4 v4.4.2
-	github.com/notaryproject/notation-core-go v0.0.0-20220712013708-3c4b3efa03c5
+	github.com/notaryproject/notation-core-go v0.0.0-20220803031124-6670fef9acec
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.0.2
 	github.com/oras-project/artifacts-spec v1.0.0-rc.2

diff --git a/go.sum b/go.sum
@@ -7,8 +7,8 @@ github.com/go-ldap/ldap/v3 v3.4.3/go.mod h1:7LdHfVt6iIOESVEe3Bs4Jp2sHEKgDeduAhgM
 github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs=
 github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/notaryproject/notation-core-go v0.0.0-20220712013708-3c4b3efa03c5 h1:tQ+lwjnQb4gD/a3YBlS7GmTEccW1w9nWem5fB3mITcg=
-github.com/notaryproject/notation-core-go v0.0.0-20220712013708-3c4b3efa03c5/go.mod h1:n+UjcUoYhvawO/JW5JfZerUUsGbHYTd4wH8ndGeeyas=
+github.com/notaryproject/notation-core-go v0.0.0-20220803031124-6670fef9acec h1:TSv/NhArMA95eu8nrJexdtaWkGhctAwqUnM2hN5b4dw=
+github.com/notaryproject/notation-core-go v0.0.0-20220803031124-6670fef9acec/go.mod h1:n+UjcUoYhvawO/JW5JfZerUUsGbHYTd4wH8ndGeeyas=
 github.com/opencontainers/distribution-spec/specs-go v0.0.0-20220620172159-4ab4752c3b86 h1:Oumw+lPnO8qNLTY2mrqPJZMoGExLi/0h/DdikoLTXVU=
 github.com/opencontainers/distribution-spec/specs-go v0.0.0-20220620172159-4ab4752c3b86/go.mod h1:aA4vdXRS8E1TG7pLZOz85InHi3BiPdErh8IpJN6E0x4=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=

diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -122,12 +122,12 @@ type DescribeKeyResponse struct {
 
 // GenerateSignatureRequest contains the parameters passed in a generate-signature request.
 type GenerateSignatureRequest struct {
-	ContractVersion string                 `json:"contractVersion"`
-	KeyID           string                 `json:"keyId"`
-	KeySpec         signer.KeySpec         `json:"keySpec"`
-	Hash            string                 `json:"hashAlgorithm"`
-	Payload         []byte                 `json:"payload"`
-	PluginConfig    map[string]string      `json:"pluginConfig,omitempty"`
+	ContractVersion string               `json:"contractVersion"`
+	KeyID           string               `json:"keyId"`
+	KeySpec         signer.KeySpec       `json:"keySpec"`
+	Hash            signer.HashAlgorithm `json:"hashAlgorithm"`
+	Payload         []byte               `json:"payload"`
+	PluginConfig    map[string]string    `json:"pluginConfig,omitempty"`
 }
 
 func (GenerateSignatureRequest) Command() Command {
@@ -136,9 +136,9 @@ func (GenerateSignatureRequest) Command() Command {
 
 // GenerateSignatureResponse is the response of a generate-signature request.
 type GenerateSignatureResponse struct {
-	KeyID            string                      `json:"keyId"`
-	Signature        []byte                      `json:"signature"`
-	SigningAlgorithm signer.SignatureAlgorithm   `json:"signingAlgorithm"`
+	KeyID            string                    `json:"keyId"`
+	Signature        []byte                    `json:"signature"`
+	SigningAlgorithm signer.SignatureAlgorithm `json:"signingAlgorithm"`
 
 	// Ordered list of certificates starting with leaf certificate
 	// and ending with root certificate.