Skip to content
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

kms Update models to latest #3269

Merged
merged 2 commits into from
May 3, 2023
Merged

kms Update models to latest #3269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f68c1ae
feat(aws-android-sdk-kms): update models to latest
awsmobilesdk May 1, 2023
445fe5c
Merge branch 'main' into models-update-JAkms20230501hnb2tNFC617
div5yesh May 3, 2023
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
110 changes: 83 additions & 27 deletions aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,14 +1241,22 @@ CreateKeyResult createKey(CreateKeyRequest createKeyRequest) throws AmazonClient
* Developer Guide</i>.
* </p>
* <p>
* Applications in Amazon Web Services Nitro Enclaves can call this
* operation by using the <a
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
* Services Nitro Enclaves Development Kit</a>. For information about the
* supporting parameters, see <a href=
* <code>Decrypt</code> also supports <a href=
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
* compute environment in Amazon EC2. To call <code>Decrypt</code> for a
* Nitro enclave, use the <a href=
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
* document for the enclave. Instead of the plaintext data, the response
* includes the plaintext data encrypted with the public key from the
* attestation document (<code>CiphertextForRecipient</code>).For
* information about the interaction between KMS and Amazon Web Services
* Nitro Enclaves, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
* Management Service Developer Guide</i>.
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
* Management Service Developer Guide</i>..
* </p>
* <p>
* The KMS key that you use for this operation must be in a compatible key
Expand Down Expand Up @@ -2459,14 +2467,24 @@ EncryptResult encrypt(EncryptRequest encryptRequest) throws AmazonClientExceptio
* Guide</i>.
* </p>
* <p>
* Applications in Amazon Web Services Nitro Enclaves can call this
* operation by using the <a
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
* Services Nitro Enclaves Development Kit</a>. For information about the
* supporting parameters, see <a href=
* <code>GenerateDataKey</code> also supports <a href=
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
* compute environment in Amazon EC2. To call <code>GenerateDataKey</code>
* for an Amazon Web Services Nitro enclave, use the <a href=
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
* document for the enclave. <code>GenerateDataKey</code> returns a copy of
* the data key encrypted under the specified KMS key, as usual. But instead
* of a plaintext copy of the data key, the response includes a copy of the
* data key encrypted under the public key from the attestation document (
* <code>CiphertextForRecipient</code>). For information about the
* interaction between KMS and Amazon Web Services Nitro Enclaves, see <a
* href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
* Management Service Developer Guide</i>.
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
* Management Service Developer Guide</i>..
* </p>
* <p>
* The KMS key that you use for this operation must be in a compatible key
Expand Down Expand Up @@ -2644,6 +2662,28 @@ GenerateDataKeyResult generateDataKey(GenerateDataKeyRequest generateDataKeyRequ
* href="https://tools.ietf.org/html/rfc5958">RFC 5958</a>.
* </p>
* <p>
* <code>GenerateDataKeyPair</code> also supports <a href=
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
* compute environment in Amazon EC2. To call
* <code>GenerateDataKeyPair</code> for an Amazon Web Services Nitro
* enclave, use the <a href=
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
* document for the enclave. <code>GenerateDataKeyPair</code> returns the
* public data key and a copy of the private data key encrypted under the
* specified KMS key, as usual. But instead of a plaintext copy of the
* private data key (<code>PrivateKeyPlaintext</code>), the response
* includes a copy of the private data key encrypted under the public key
* from the attestation document (<code>CiphertextForRecipient</code>). For
* information about the interaction between KMS and Amazon Web Services
* Nitro Enclaves, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
* Management Service Developer Guide</i>..
* </p>
* <p>
* You can use an optional encryption context to add additional security to
* the encryption operation. If you specify an
* <code>EncryptionContext</code>, you must specify the same encryption
Expand Down Expand Up @@ -2899,7 +2939,7 @@ GenerateDataKeyPairWithoutPlaintextResult generateDataKeyPairWithoutPlaintext(
* <p>
* To generate an SM4 data key (China Regions only), specify a
* <code>KeySpec</code> value of <code>AES_128</code> or
* <code>NumberOfBytes</code> value of <code>128</code>. The symmetric
* <code>NumberOfBytes</code> value of <code>16</code>. The symmetric
* encryption key used in China Regions to encrypt your data key is an SM4
* encryption key.
* </p>
Expand Down Expand Up @@ -3078,13 +3118,21 @@ GenerateMacResult generateMac(GenerateMacRequest generateMacRequest)
* store, use the <code>CustomKeyStoreId</code> parameter.
* </p>
* <p>
* Applications in Amazon Web Services Nitro Enclaves can call this
* operation by using the <a
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
* Services Nitro Enclaves Development Kit</a>. For information about the
* supporting parameters, see <a href=
* <code>GenerateRandom</code> also supports <a href=
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
* compute environment in Amazon EC2. To call <code>GenerateRandom</code>
* for a Nitro enclave, use the <a href=
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
* document for the enclave. Instead of plaintext bytes, the response
* includes the plaintext bytes encrypted under the public key from the
* attestation document (<code>CiphertextForRecipient</code>).For
* information about the interaction between KMS and Amazon Web Services
* Nitro Enclaves, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
* Management Service Developer Guide</i>.
* </p>
* <p>
Expand Down Expand Up @@ -6193,13 +6241,21 @@ VerifyMacResult verifyMac(VerifyMacRequest verifyMacRequest) throws AmazonClient
* store, use the <code>CustomKeyStoreId</code> parameter.
* </p>
* <p>
* Applications in Amazon Web Services Nitro Enclaves can call this
* operation by using the <a
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
* Services Nitro Enclaves Development Kit</a>. For information about the
* supporting parameters, see <a href=
* <code>GenerateRandom</code> also supports <a href=
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
* compute environment in Amazon EC2. To call <code>GenerateRandom</code>
* for a Nitro enclave, use the <a href=
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
* document for the enclave. Instead of plaintext bytes, the response
* includes the plaintext bytes encrypted under the public key from the
* attestation document (<code>CiphertextForRecipient</code>).For
* information about the interaction between KMS and Amazon Web Services
* Nitro Enclaves, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
* Management Service Developer Guide</i>.
* </p>
* <p>
Expand Down
110 changes: 83 additions & 27 deletions aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMSClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1702,14 +1702,22 @@ public CreateKeyResult createKey(CreateKeyRequest createKeyRequest)
* Developer Guide</i>.
* </p>
* <p>
* Applications in Amazon Web Services Nitro Enclaves can call this
* operation by using the <a
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
* Services Nitro Enclaves Development Kit</a>. For information about the
* supporting parameters, see <a href=
* <code>Decrypt</code> also supports <a href=
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
* compute environment in Amazon EC2. To call <code>Decrypt</code> for a
* Nitro enclave, use the <a href=
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
* document for the enclave. Instead of the plaintext data, the response
* includes the plaintext data encrypted with the public key from the
* attestation document (<code>CiphertextForRecipient</code>).For
* information about the interaction between KMS and Amazon Web Services
* Nitro Enclaves, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
* Management Service Developer Guide</i>.
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
* Management Service Developer Guide</i>..
* </p>
* <p>
* The KMS key that you use for this operation must be in a compatible key
Expand Down Expand Up @@ -3209,14 +3217,24 @@ public EncryptResult encrypt(EncryptRequest encryptRequest)
* Guide</i>.
* </p>
* <p>
* Applications in Amazon Web Services Nitro Enclaves can call this
* operation by using the <a
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
* Services Nitro Enclaves Development Kit</a>. For information about the
* supporting parameters, see <a href=
* <code>GenerateDataKey</code> also supports <a href=
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
* compute environment in Amazon EC2. To call <code>GenerateDataKey</code>
* for an Amazon Web Services Nitro enclave, use the <a href=
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
* document for the enclave. <code>GenerateDataKey</code> returns a copy of
* the data key encrypted under the specified KMS key, as usual. But instead
* of a plaintext copy of the data key, the response includes a copy of the
* data key encrypted under the public key from the attestation document (
* <code>CiphertextForRecipient</code>). For information about the
* interaction between KMS and Amazon Web Services Nitro Enclaves, see <a
* href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
* Management Service Developer Guide</i>.
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
* Management Service Developer Guide</i>..
* </p>
* <p>
* The KMS key that you use for this operation must be in a compatible key
Expand Down Expand Up @@ -3420,6 +3438,28 @@ public GenerateDataKeyResult generateDataKey(GenerateDataKeyRequest generateData
* href="https://tools.ietf.org/html/rfc5958">RFC 5958</a>.
* </p>
* <p>
* <code>GenerateDataKeyPair</code> also supports <a href=
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
* compute environment in Amazon EC2. To call
* <code>GenerateDataKeyPair</code> for an Amazon Web Services Nitro
* enclave, use the <a href=
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
* document for the enclave. <code>GenerateDataKeyPair</code> returns the
* public data key and a copy of the private data key encrypted under the
* specified KMS key, as usual. But instead of a plaintext copy of the
* private data key (<code>PrivateKeyPlaintext</code>), the response
* includes a copy of the private data key encrypted under the public key
* from the attestation document (<code>CiphertextForRecipient</code>). For
* information about the interaction between KMS and Amazon Web Services
* Nitro Enclaves, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
* Management Service Developer Guide</i>..
* </p>
* <p>
* You can use an optional encryption context to add additional security to
* the encryption operation. If you specify an
* <code>EncryptionContext</code>, you must specify the same encryption
Expand Down Expand Up @@ -3729,7 +3769,7 @@ public GenerateDataKeyPairWithoutPlaintextResult generateDataKeyPairWithoutPlain
* <p>
* To generate an SM4 data key (China Regions only), specify a
* <code>KeySpec</code> value of <code>AES_128</code> or
* <code>NumberOfBytes</code> value of <code>128</code>. The symmetric
* <code>NumberOfBytes</code> value of <code>16</code>. The symmetric
* encryption key used in China Regions to encrypt your data key is an SM4
* encryption key.
* </p>
Expand Down Expand Up @@ -3961,13 +4001,21 @@ public GenerateMacResult generateMac(GenerateMacRequest generateMacRequest)
* store, use the <code>CustomKeyStoreId</code> parameter.
* </p>
* <p>
* Applications in Amazon Web Services Nitro Enclaves can call this
* operation by using the <a
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
* Services Nitro Enclaves Development Kit</a>. For information about the
* supporting parameters, see <a href=
* <code>GenerateRandom</code> also supports <a href=
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
* compute environment in Amazon EC2. To call <code>GenerateRandom</code>
* for a Nitro enclave, use the <a href=
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
* document for the enclave. Instead of plaintext bytes, the response
* includes the plaintext bytes encrypted under the public key from the
* attestation document (<code>CiphertextForRecipient</code>).For
* information about the interaction between KMS and Amazon Web Services
* Nitro Enclaves, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
* Management Service Developer Guide</i>.
* </p>
* <p>
Expand Down Expand Up @@ -7764,13 +7812,21 @@ public void retireGrant()
* store, use the <code>CustomKeyStoreId</code> parameter.
* </p>
* <p>
* Applications in Amazon Web Services Nitro Enclaves can call this
* operation by using the <a
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
* Services Nitro Enclaves Development Kit</a>. For information about the
* supporting parameters, see <a href=
* <code>GenerateRandom</code> also supports <a href=
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
* compute environment in Amazon EC2. To call <code>GenerateRandom</code>
* for a Nitro enclave, use the <a href=
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
* document for the enclave. Instead of plaintext bytes, the response
* includes the plaintext bytes encrypted under the public key from the
* attestation document (<code>CiphertextForRecipient</code>).For
* information about the interaction between KMS and Amazon Web Services
* Nitro Enclaves, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
* Management Service Developer Guide</i>.
* </p>
* <p>
Expand Down
Loading