aboutsummaryrefslogtreecommitdiff
path: root/tvloader
diff options
context:
space:
mode:
Diffstat (limited to 'tvloader')
-rw-r--r--tvloader/parser2v2/parse_file.go8
-rw-r--r--tvloader/parser2v2/parse_package.go8
2 files changed, 8 insertions, 8 deletions
diff --git a/tvloader/parser2v2/parse_file.go b/tvloader/parser2v2/parse_file.go
index c0e3c26..8151a6e 100644
--- a/tvloader/parser2v2/parse_file.go
+++ b/tvloader/parser2v2/parse_file.go
@@ -59,15 +59,15 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error
return err
}
if parser.file.FileChecksums == nil {
- parser.file.FileChecksums = map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{}
+ parser.file.FileChecksums = map[spdx.ChecksumAlgorithm]spdx.Checksum{}
}
switch subkey {
case spdx.SHA1:
- parser.file.FileChecksums[spdx.SHA1] = spdx.Checksum2_2{Algorithm: spdx.SHA1, Value: subvalue}
+ parser.file.FileChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: subvalue}
case spdx.SHA256:
- parser.file.FileChecksums[spdx.SHA256] = spdx.Checksum2_2{Algorithm: spdx.SHA256, Value: subvalue}
+ parser.file.FileChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: subvalue}
case spdx.MD5:
- parser.file.FileChecksums[spdx.MD5] = spdx.Checksum2_2{Algorithm: spdx.MD5, Value: subvalue}
+ parser.file.FileChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: subvalue}
default:
return fmt.Errorf("got unknown checksum type %s", subkey)
}
diff --git a/tvloader/parser2v2/parse_package.go b/tvloader/parser2v2/parse_package.go
index 32a6aca..e7d86dc 100644
--- a/tvloader/parser2v2/parse_package.go
+++ b/tvloader/parser2v2/parse_package.go
@@ -101,15 +101,15 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err
return err
}
if parser.pkg.PackageChecksums == nil {
- parser.pkg.PackageChecksums = make(map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2, 9)
+ parser.pkg.PackageChecksums = make(map[spdx.ChecksumAlgorithm]spdx.Checksum, 9)
}
switch subkey {
case spdx.SHA1:
- parser.pkg.PackageChecksums[spdx.SHA1] = spdx.Checksum2_2{Algorithm: spdx.SHA1, Value: subvalue}
+ parser.pkg.PackageChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: subvalue}
case spdx.SHA256:
- parser.pkg.PackageChecksums[spdx.SHA256] = spdx.Checksum2_2{Algorithm: spdx.SHA256, Value: subvalue}
+ parser.pkg.PackageChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: subvalue}
case spdx.MD5:
- parser.pkg.PackageChecksums[spdx.MD5] = spdx.Checksum2_2{Algorithm: spdx.MD5, Value: subvalue}
+ parser.pkg.PackageChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: subvalue}
default:
return fmt.Errorf("got unknown checksum type %s", subkey)
}