Skip to content

Remove implementation details of key release policy; instead use opaque blob #10916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lmazuel merged 5 commits into from
Oct 27, 2020
Merged

Remove implementation details of key release policy; instead use opaque blob #10916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d2a39a
Remove implementation details of key release policy; instead use opaq…
Sep 23, 2020
7f43fba
syntax fix
Sep 23, 2020
8870e7d
Include a content-type
Sep 25, 2020
3461b43
add charset
Sep 25, 2020
600fd24
fix export key example
Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions ...eyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/ExportKey-example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,8 @@
"key_hsm": "CxX3qVTt22ZvjwdS-fmMSsLpaQQ8IcfGAC2TYWo3FXIPnOrSmZWdWN3gLMNSLUtUOhXqwXCe6jOxH2jMr6suO4Q0mfrKurAB-IC5gbDZGGD9XksrAkyYS-0p4p4I4Q4QxEOCtCKYPYWWu91dg5xg5aYjVRyR5G3C6O0haotp1FL1FiOB1PVcW9HchDIdHMFCszsb33pbvDuYvJXPPqdSIGIT8P8ExVG9_RwYTZl2Kj3MTSbe9zjOEEW-EnA6Phr0EFO0h94dWK0Y2tPhyzGYOSBScJCWIdwD9lT1aaHNFE0rSLJ9wv0qGezR10nD7V7ALZiEscsrAcwrWTtmmCJMAIJpGf0u9rN1_JQiXuO4Q9Cf4b73nSP1kIIAPkZ3r6Fqmrm8F7NeKis"
},
"release_policy": {
"anyOf": [
{
"allOf": [
{
"claim": "sgx-mrsigner",
"condition": "equals",
"value": "86788fe40448f2a12e20bf8d5e7a1c3139bc5fdc1432b370c1da3489ab649a85"
},
{
"claim": "is-debuggable",
"condition": "equals",
"value": "false"
}
],
"authority": "http://localhost:8023/"
}
],
"version": "0.2"
"contentType": "application/json; charset=utf-8; version=1.0",
"data": "eyJhbnlPZiI6W3siYWxsT2YiOlt7ImNsYWltIjoic2d4LW1yc2lnbmVyIiwiY29uZGl0aW9uIjoiZXF1YWxzIiwidmFsdWUiOiI4Njc4OGZlNDA0NDhmMmExMmUyMGJmOGQ1ZTdhMWMzMTM5YmM1ZmRjMTQzMmIzNzBjMWRhMzQ4OWFiNjQ5YTg1In0seyJjbGFpbSI6ImlzLWRlYnVnZ2FibGUiLCJjb25kaXRpb24iOiJlcXVhbHMiLCJ2YWx1ZSI6ImZhbHNlIn1dLCJhdXRob3JpdHkiOiJodHRwOi8vbG9jYWxob3N0OjgwMjMvIn1dfQ"
}
}
}
Expand Down
91 changes: 14 additions & 77 deletions specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/keys.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,83 +1033,6 @@
}
},
"definitions": {
"KeyReleaseCondition": {
"properties": {
"claim": {
"x-ms-client-name": "claimType",
"type": "string",
"minLength": 1,
"description": "claim type name"
},
"condition": {
"x-ms-client-name": "claimCondition",
"type": "string",
"minLength": 1,
"description": "condition to test",
"enum": [
"equals"
],
"x-ms-enum": {
"name": "KeyReleaseConditionCondition",
"modelAsString": true,
"values": [
{
"value": "equals",
"description": "equals comparison."
}
]
}
},
"value": {
"type": "string"
}
}
},
"KeyReleaseAuthority": {
"properties": {
"authority": {
"x-ms-client-name": "authorityURL",
"type": "string",
"minLength": 1,
"description": "Base URL of the attestation service."
},
"allOf": {
"type": "array",
"items": {
"$ref": "#/definitions/KeyReleaseCondition",
"description": "The set of claim conditions that must be met."
}
}
}
},
"KeyReleasePolicy": {
"properties": {
"version": {
"description": "key release policy version",
"type": "string",
"enum": [
"0.2"
],
"x-ms-enum": {
"name": "KeyReleasePolicyVersion",
"modelAsString": true,
"values": [
{
"value": "0.2",
"description": "Schema version 0.2"
}
]
}
},
"anyOf": {
"type": "array",
"items": {
"$ref": "#/definitions/KeyReleaseAuthority",
"description": "Authorities."
}
}
}
},
"JsonWebKey": {
"properties": {
"kid": {
Expand Down Expand Up @@ -1387,6 +1310,20 @@
},
"description": "The key item containing key metadata."
},
"KeyReleasePolicy": {
"properties": {
"contentType": {
"description": "Content type and version of key release policy",
"type": "string",
"default": "application/json; charset=utf-8; version=1.0"
},
"data": {
"description": "Blob encoding the policy rules under which the key can be exported.",
"type": "string",
"format": "base64url"
}
}
},
"DeletedKeyBundle": {
"allOf": [
{
Expand Down