diff options
author | Adolfo García Veytia (Puerco) <puerco@chainguard.dev> | 2022-11-30 19:46:13 -0600 |
---|---|---|
committer | Adolfo García Veytia (Puerco) <puerco@chainguard.dev> | 2022-11-30 19:46:13 -0600 |
commit | 72adf564f89a4e4ef42bb3e672ae153b1e9f7923 (patch) | |
tree | 143d8ba19d3df020d5486cf0990771a84d21e63b | |
parent | 04d9c4663b0011f14f92979861bbb4ecdcdb7183 (diff) | |
download | spdx-tools-72adf564f89a4e4ef42bb3e672ae153b1e9f7923.tar.gz |
Update 2.3 parsers to support SHA512
Signed-off-by: Adolfo García Veytia (Puerco) <puerco@chainguard.dev>
-rw-r--r-- | spdx/v2_3/package.go | 2 | ||||
-rw-r--r-- | tvloader/parser2v3/parse_file.go | 1 | ||||
-rw-r--r-- | tvloader/parser2v3/parse_package.go | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/spdx/v2_3/package.go b/spdx/v2_3/package.go index 7df331d..d6c4b42 100644 --- a/spdx/v2_3/package.go +++ b/spdx/v2_3/package.go @@ -51,7 +51,7 @@ type Package struct { // Cardinality: if FilesAnalyzed == true must be present, if FilesAnalyzed == false must be omitted PackageVerificationCode *common.PackageVerificationCode `json:"packageVerificationCode,omitempty"` - // 7.10: Package Checksum: may have keys for SHA1, SHA256, MD5, SHA3-256, SHA3-384, SHA3-512, BLAKE2b-256, BLAKE2b-384, BLAKE2b-512, BLAKE3, ADLER32 + // 7.10: Package Checksum: may have keys for SHA1, SHA256, SHA512, MD5, SHA3-256, SHA3-384, SHA3-512, BLAKE2b-256, BLAKE2b-384, BLAKE2b-512, BLAKE3, ADLER32 // Cardinality: optional, one or many PackageChecksums []common.Checksum `json:"checksums,omitempty"` diff --git a/tvloader/parser2v3/parse_file.go b/tvloader/parser2v3/parse_file.go index 7f6d99c..f019195 100644 --- a/tvloader/parser2v3/parse_file.go +++ b/tvloader/parser2v3/parse_file.go @@ -73,6 +73,7 @@ func (parser *tvParser2_3) parsePairFromFile2_3(tag string, value string) error switch common.ChecksumAlgorithm(subkey) { case common.SHA1, common.SHA256, + common.SHA512, common.MD5, common.SHA3_256, common.SHA3_384, diff --git a/tvloader/parser2v3/parse_package.go b/tvloader/parser2v3/parse_package.go index d7c87e1..15f30e1 100644 --- a/tvloader/parser2v3/parse_package.go +++ b/tvloader/parser2v3/parse_package.go @@ -111,7 +111,7 @@ func (parser *tvParser2_3) parsePairFromPackage2_3(tag string, value string) err parser.pkg.PackageChecksums = []common.Checksum{} } switch common.ChecksumAlgorithm(subkey) { - case common.SHA1, common.SHA256, common.MD5: + case common.SHA1, common.SHA256, common.SHA512, common.MD5: algorithm := common.ChecksumAlgorithm(subkey) parser.pkg.PackageChecksums = append(parser.pkg.PackageChecksums, common.Checksum{Algorithm: algorithm, Value: subvalue}) default: |