Lubuntu/snapd-extra-utils
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In snapd-seed-glue, remove redundant decoding/encoding for account key.

Browse Source
This commit is contained in:
Simon Quigley 2024-11-23 21:05:40 -06:00
parent 573cdfe186
commit 4cbf003726
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
snapd-extra-utils (1.0.2ubuntu1) UNRELEASED; urgency=medium
* In snapd-seed-glue, remove redundant decoding/encoding for account key.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 23 Nov 2024 21:05:07 -0600
snapd-extra-utils (1.0.2) plucky; urgency=medium
* Fix edge cases where the snap revision may be older in the target channel

7
snapd-seed-glue/validation.go
View File

@ -62,12 +62,7 @@ func ensureAssertions(assertionsDir string) {
if signKeySha3 == "" {
log.Fatalf("Failed to extract sign-key-sha3-384 from model assertion.")
}
decodedSignKey, err := base64.StdEncoding.DecodeString(signKeySha3)
if err != nil {
log.Fatalf("Failed to decode sign-key-sha3-384: %v", err)
}
encodedSignKey := base64.StdEncoding.EncodeToString(decodedSignKey)
output, err := exec.Command("snap", "known", "--remote", "account-key", "public-key-sha3-384="+encodedSignKey).CombinedOutput()
output, err := exec.Command("snap", "known", "--remote", "account-key", "public-key-sha3-384="+signKeySha3).CombinedOutput()
if err != nil {
log.Fatalf("Failed to fetch account-key assertion: %v, Output: %s", err, string(output))
}