Code

[2/3] Keydata v3 scope changes#270

Code

Merged

chrisccoulson merged 49 commits intocanonical:mastercanonical/secboot:masterfrom sespiros:keydata-v3-platform-scope-testssespiros/secboot:keydata-v3-platform-scope-testsCopy head branch name to clipboardFeb 28, 2024

+3,227-991

Commits

Commits on Feb 20, 2024

• platform.go: add role field to PlatformKeyData

  Show description for 74f8b08
  sespiros

  committed
  74f8b08

  Copy full SHA for 74f8b08

• keydata.go, keydata_legacy.go: refactor handling of authorized snap models

  Show description for 4645ce8
  sespiros

  committed
  4645ce8

  Copy full SHA for 4645ce8

• keydata_test.go: fix mockProtectKeys after scope changes

  sespiros

  committed
  ed975b3

  Copy full SHA for ed975b3

• bootenv: move keydata model authorization to separate package

  Show description for a76f332
  sespiros

  committed
  a76f332

  Copy full SHA for a76f332

• keydata.go: add role field in secboot.keydata

  sespiros

  committed
  cc16a83

  Copy full SHA for cc16a83

• crypt.go: make SkipSnapModelCheck the default behaviour

  Show description for 1af77a7
  sespiros

  committed
  1af77a7

  Copy full SHA for 1af77a7

• keydata_test.go: fix legacy test for the new role field

  sespiros

  committed
  bfe8980

  Copy full SHA for bfe8980

• bootenv/keydata.go: initialize model digest hash algorithm

  Show description for 6c9fb0f
  sespiros

  committed
  6c9fb0f

  Copy full SHA for 6c9fb0f

• bootenv/keydata.go: add kdfAlg, baseVersion fields in additionalData

  sespiros

  committed
  84e6d65

  Copy full SHA for 84e6d65

• bootenv: add tests for keyDataScope

  sespiros

  committed
  48fab3f

  Copy full SHA for 48fab3f

• bootenv/keydata.go: add doc comments

  sespiros

  committed
  a214639

  Copy full SHA for a214639

• crypt_test.go: rename primaryKey to diskUnlockKey

  sespiros

  committed
  78e3364

  Copy full SHA for 78e3364

• crypt_test.go, keydata*test.go: modify tests for new keydata format

  Show description for a6e3520
  sespiros

  committed
  a6e3520

  Copy full SHA for a6e3520

• bootenv: add tests for MakeAdditionalData

  Show description for f9a7f8e
  sespiros

  committed
  f9a7f8e

  Copy full SHA for f9a7f8e

• snap_test.go: add test for computeSnapModelHash

  sespiros

  committed
  8810ae5

  Copy full SHA for 8810ae5

• bootenv/keydata_test.go: add tests for hashAlg/ecdsaPublicKey marshalling/unmarshalling

  sespiros

  committed
  dad82f9

  Copy full SHA for dad82f9

• bootenv/keydata_test.go: add a test for wrong key supplied to SetAuthorizedSnapModels

  sespiros

  committed
  d9b9a2a

  Copy full SHA for d9b9a2a

• bootenv/keydata_test.go: add a test for wrong key supplied to SetAuthorizedBootModes

  sespiros

  committed
  2e4c29a

  Copy full SHA for 2e4c29a

• bootenv/keydata_test.go: add test for deterministic derivation of elliptic key

  sespiros

  committed
  f2ffc65

  Copy full SHA for f2ffc65

• bootenv: add scope tests

  Show description for 2f0e295
  sespiros

  committed
  2f0e295

  Copy full SHA for 2f0e295

Commits on Feb 27, 2024

• bootenv/keydata_test.go: add deriveSigner tests with fixed keys

  sespiros

  committed
  4c10b40

  Copy full SHA for 4c10b40

• keydata_legacy.go: rename primaryKey to auxKey in unmarshalV1KeyPayload

  Show description for 0521626
  sespiros

  committed
  0521626

  Copy full SHA for 0521626

• keydata.go: expand doc comment for AuthorizedSnapModels

  sespiros

  committed
  6625be3

  Copy full SHA for 6625be3

• bootenv: make additionalData private

  sespiros

  committed
  767ac13

  Copy full SHA for 767ac13

• bootenv/keydata.go: expand MakeAdditionalData comment

  sespiros

  committed
  dae8903

  Copy full SHA for dae8903

• bootenv: move unmarshalHashAlg to export_test.go

  sespiros

  committed
  d42e414

  Copy full SHA for d42e414

• bootenv: change baseVersion to generation

  sespiros

  committed
  8e77c31

  Copy full SHA for 8e77c31

• bootenv/keydata.go: add doc comments for KeyDataScopeParams fields

  sespiros

  committed
  b1e8248

  Copy full SHA for b1e8248

• multiple: fix wording for comments mentioning ASN1

  sespiros

  committed
  8299964

  Copy full SHA for 8299964

• keydata_test.go: add extra checks in TestNewKeyDataScopeSuccess

  sespiros

  committed
  8cec665

  Copy full SHA for 8cec665

• bootenv/keydata_test.go: add small style change

  sespiros

  committed
  8177fbc

  Copy full SHA for 8177fbc

• bootenv: move NewPrimaryKey to keydata_test.go

  sespiros

  committed
  6bc4186

  Copy full SHA for 6bc4186

• bootenv: convert MakeAdditionalData tests to fixed

  Show description for da49e74
  sespiros

  committed
  da49e74

  Copy full SHA for da49e74

• bootenv/keydata_test.go: add extra checks for TestSetAuthorizedSnapModels

  sespiros

  committed
  f65f537

  Copy full SHA for f65f537

• bootenv/keydata_test.go: cleanup tests

  sespiros

  committed
  0cd840a

  Copy full SHA for 0cd840a

• bootenv/keydata_test.go: consistent variable names in tests

  sespiros

  committed
  159895f

  Copy full SHA for 159895f

• bootenv/keydata_test.go: add extra checks for TestSetAuthorizedBootModes

  sespiros

  committed
  e6408fd

  Copy full SHA for e6408fd

• keydata_test.go: rename diskUnlockKey to unlockKey

  sespiros

  committed
  284ebca

  Copy full SHA for 284ebca

• keydata_test.go: remove TestRecoverLegacyKeyWithPassphrase

  Show description for 2a5277c
  sespiros

  committed
  2a5277c

  Copy full SHA for 2a5277c

• keydata_test.go: add TestChangePassphraseWrongPassphrase again

  sespiros

  committed
  c12c559

  Copy full SHA for c12c559

• bootenv: refactor use of currentBootMode and currentModel in tests

  sespiros

  committed
  6051c17

  Copy full SHA for 6051c17

• bootenv: rename to bootscope

  sespiros

  committed
  8f2f770

  Copy full SHA for 8f2f770

• bootscope: rename env.go to scope.go and add package doc comment

  sespiros

  committed
  27bdb5f

  Copy full SHA for 27bdb5f

• bootscope: rename MakeAdditionalData to MakeAEADAdditionalData

  sespiros

  committed
  65291ec

  Copy full SHA for 65291ec

• bootscope/export_test.go: remove unmarshalHashAlg

  sespiros

  committed
  07bab29

  Copy full SHA for 07bab29

• bootscope/keydata_test.go: remove tests for mockPlatformKeyDataHandler

  sespiros

  committed
  6a0df9b

  Copy full SHA for 6a0df9b

• keydata_test.go: move and rename TestSnapModelAuthErrorHandling

  sespiros

  committed
  29521d8

  Copy full SHA for 29521d8

• bootscope/keydata_test.go: fix typo

  sespiros

  committed
  576b3cf

  Copy full SHA for 576b3cf

Commits on Feb 28, 2024

• bootscope/keydata: add marshal and unmarshal JSON for KeyDataScope

  sespiros

  committed
  7957f52

  Copy full SHA for 7957f52