Merge branch 'comment'

benma · benma · commit 404d59780c75 · 2024-05-15T10:36:50.000+02:00
diff --git a/api/bootloader/util.go b/api/bootloader/util.go
@@ -40,8 +40,7 @@ func HashFirmware(firmwareVersion uint32, unsignedFirmware []byte) []byte {
 }
 
 // ParseSignedFirmware parses a signed firmware file and returns (sigdata, firmware). Errors if the
-// format is invalid, or the firmware magic does not match the expected magic according to the
-// device product.
+// format is invalid, or the firmware magic is not recognized.
 func ParseSignedFirmware(firmware []byte) (common.Product, []byte, []byte, error) {
 	if len(firmware) <= magicLen+sigDataLen {
 		return "", nil, nil, errp.New("firmware too small")

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,7 @@ func HashFirmware(firmwareVersion uint32, unsignedFirmware []byte) []byte {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// ParseSignedFirmware parses a signed firmware file and returns (sigdata, firmware). Errors if the`
`43`		`-// format is invalid, or the firmware magic does not match the expected magic according to the`
`44`		`-// device product.`
	`43`	`+// format is invalid, or the firmware magic is not recognized.`
`45`	`44`	`func ParseSignedFirmware(firmware []byte) (common.Product, []byte, []byte, error) {`
`46`	`45`	`if len(firmware) <= magicLen+sigDataLen {`
`47`	`46`	`return "", nil, nil, errp.New("firmware too small")`