Skip to content

Commit 62a9bd2

Browse files
authored
docs: Clarify naming of KMS to AWS KMS (#124)
1 parent 094efe0 commit 62a9bd2

File tree

3 files changed

+87
-73
lines changed

3 files changed

+87
-73
lines changed

framework/keyring-interface.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@
55

66
## Version
77

8-
0.2.0
8+
0.2.1
99

1010
### Changelog
1111

12+
- 0.2.1
13+
14+
- [Clarify naming of KMS to AWS KMS](https://github.com/awslabs/aws-encryption-sdk-specification/issues/67)
15+
1216
- 0.2.0
1317

1418
- [Remove Keyring Trace](../changes/2020-05-13_remove-keyring-trace/change.md)
@@ -41,7 +45,7 @@ in this document are to be interpreted as described in [RFC 2119](https://tools.
4145

4246
## Supported Keyrings
4347

44-
- [KMS Keyring](kms-keyring.md)
48+
- [AWS KMS Keyring](kms-keyring.md)
4549
- [Multi-Keyring](multi-keyring.md)
4650
- [Raw AES Keyring](raw-aes-keyring.md)
4751
- [Raw RSA Keyring](raw-rsa-keyring.md)
@@ -149,7 +153,7 @@ the decryption is overwhelmingly likely to fail.
149153
Users SHOULD use a keyring that protects wrapping keys and performs cryptographic operations within a secure boundary.
150154
Examples are:
151155

152-
- The built-in [KMS keyring](kms-keyring.md),
156+
- The built-in [AWS KMS keyring](kms-keyring.md),
153157
which uses AWS Key Management Service (AWS KMS) customer master keys (CMKs) that never leave AWS KMS plaintext.
154158
- A custom keyring that uses wrapping keys that are stored in your hardware security modules (HSMs)
155159
- A custom keyring protected by another master key service.
@@ -166,7 +170,7 @@ The following keyrings are compatible with the referenced [master key providers]
166170

167171
| Keyring | Master Key Provider: Java and Python |
168172
| --------------- | ---------------------------------------------------------------------------------------------------------------- |
169-
| KMS keyring | KMS master key (Java), KMS master key provider (Java), KMS master key (Python), KMS master key provider (Python) |
173+
| AWS KMS keyring | KMS master key (Java), KMS master key provider (Java), KMS master key (Python), KMS master key provider (Python) |
170174
| Raw AES keyring | When they are used with symmetric encryption keys: JceMasterKey (Java), RawMasterKey (Python) |
171175
| Raw RSA keyring | When they are used with asymmetric encryption keys: JceMasterKey (Java), RawMasterKey (Python) |
172176

0 commit comments

Comments
 (0)