Skip to content

Commit c9a5253

Browse files
awsmobilesdkawsmobilesdk
authored
feat(aws-android-sdk-kms): update models to latest (#3269)
1 parent beb43a5 commit c9a5253

38 files changed

+3577
-283
lines changed

‎aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMS.java‎

Lines changed: 83 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,14 +1241,22 @@ CreateKeyResult createKey(CreateKeyRequest createKeyRequest) throws AmazonClient
12411241
* Developer Guide</i>.
12421242
* </p>
12431243
* <p>
1244-
* Applications in Amazon Web Services Nitro Enclaves can call this
1245-
* operation by using the <a
1246-
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
1247-
* Services Nitro Enclaves Development Kit</a>. For information about the
1248-
* supporting parameters, see <a href=
1244+
* <code>Decrypt</code> also supports <a href=
1245+
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
1246+
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
1247+
* compute environment in Amazon EC2. To call <code>Decrypt</code> for a
1248+
* Nitro enclave, use the <a href=
1249+
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
1250+
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
1251+
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
1252+
* document for the enclave. Instead of the plaintext data, the response
1253+
* includes the plaintext data encrypted with the public key from the
1254+
* attestation document (<code>CiphertextForRecipient</code>).For
1255+
* information about the interaction between KMS and Amazon Web Services
1256+
* Nitro Enclaves, see <a href=
12491257
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
1250-
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
1251-
* Management Service Developer Guide</i>.
1258+
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
1259+
* Management Service Developer Guide</i>..
12521260
* </p>
12531261
* <p>
12541262
* The KMS key that you use for this operation must be in a compatible key
@@ -2459,14 +2467,24 @@ EncryptResult encrypt(EncryptRequest encryptRequest) throws AmazonClientExceptio
24592467
* Guide</i>.
24602468
* </p>
24612469
* <p>
2462-
* Applications in Amazon Web Services Nitro Enclaves can call this
2463-
* operation by using the <a
2464-
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
2465-
* Services Nitro Enclaves Development Kit</a>. For information about the
2466-
* supporting parameters, see <a href=
2470+
* <code>GenerateDataKey</code> also supports <a href=
2471+
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
2472+
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
2473+
* compute environment in Amazon EC2. To call <code>GenerateDataKey</code>
2474+
* for an Amazon Web Services Nitro enclave, use the <a href=
2475+
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
2476+
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
2477+
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
2478+
* document for the enclave. <code>GenerateDataKey</code> returns a copy of
2479+
* the data key encrypted under the specified KMS key, as usual. But instead
2480+
* of a plaintext copy of the data key, the response includes a copy of the
2481+
* data key encrypted under the public key from the attestation document (
2482+
* <code>CiphertextForRecipient</code>). For information about the
2483+
* interaction between KMS and Amazon Web Services Nitro Enclaves, see <a
2484+
* href=
24672485
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
2468-
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
2469-
* Management Service Developer Guide</i>.
2486+
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
2487+
* Management Service Developer Guide</i>..
24702488
* </p>
24712489
* <p>
24722490
* The KMS key that you use for this operation must be in a compatible key
@@ -2644,6 +2662,28 @@ GenerateDataKeyResult generateDataKey(GenerateDataKeyRequest generateDataKeyRequ
26442662
* href="https://tools.ietf.org/html/rfc5958">RFC 5958</a>.
26452663
* </p>
26462664
* <p>
2665+
* <code>GenerateDataKeyPair</code> also supports <a href=
2666+
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
2667+
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
2668+
* compute environment in Amazon EC2. To call
2669+
* <code>GenerateDataKeyPair</code> for an Amazon Web Services Nitro
2670+
* enclave, use the <a href=
2671+
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
2672+
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
2673+
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
2674+
* document for the enclave. <code>GenerateDataKeyPair</code> returns the
2675+
* public data key and a copy of the private data key encrypted under the
2676+
* specified KMS key, as usual. But instead of a plaintext copy of the
2677+
* private data key (<code>PrivateKeyPlaintext</code>), the response
2678+
* includes a copy of the private data key encrypted under the public key
2679+
* from the attestation document (<code>CiphertextForRecipient</code>). For
2680+
* information about the interaction between KMS and Amazon Web Services
2681+
* Nitro Enclaves, see <a href=
2682+
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
2683+
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
2684+
* Management Service Developer Guide</i>..
2685+
* </p>
2686+
* <p>
26472687
* You can use an optional encryption context to add additional security to
26482688
* the encryption operation. If you specify an
26492689
* <code>EncryptionContext</code>, you must specify the same encryption
@@ -2899,7 +2939,7 @@ GenerateDataKeyPairWithoutPlaintextResult generateDataKeyPairWithoutPlaintext(
28992939
* <p>
29002940
* To generate an SM4 data key (China Regions only), specify a
29012941
* <code>KeySpec</code> value of <code>AES_128</code> or
2902-
* <code>NumberOfBytes</code> value of <code>128</code>. The symmetric
2942+
* <code>NumberOfBytes</code> value of <code>16</code>. The symmetric
29032943
* encryption key used in China Regions to encrypt your data key is an SM4
29042944
* encryption key.
29052945
* </p>
@@ -3078,13 +3118,21 @@ GenerateMacResult generateMac(GenerateMacRequest generateMacRequest)
30783118
* store, use the <code>CustomKeyStoreId</code> parameter.
30793119
* </p>
30803120
* <p>
3081-
* Applications in Amazon Web Services Nitro Enclaves can call this
3082-
* operation by using the <a
3083-
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
3084-
* Services Nitro Enclaves Development Kit</a>. For information about the
3085-
* supporting parameters, see <a href=
3121+
* <code>GenerateRandom</code> also supports <a href=
3122+
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
3123+
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
3124+
* compute environment in Amazon EC2. To call <code>GenerateRandom</code>
3125+
* for a Nitro enclave, use the <a href=
3126+
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
3127+
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
3128+
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
3129+
* document for the enclave. Instead of plaintext bytes, the response
3130+
* includes the plaintext bytes encrypted under the public key from the
3131+
* attestation document (<code>CiphertextForRecipient</code>).For
3132+
* information about the interaction between KMS and Amazon Web Services
3133+
* Nitro Enclaves, see <a href=
30863134
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
3087-
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
3135+
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
30883136
* Management Service Developer Guide</i>.
30893137
* </p>
30903138
* <p>
@@ -6193,13 +6241,21 @@ VerifyMacResult verifyMac(VerifyMacRequest verifyMacRequest) throws AmazonClient
61936241
* store, use the <code>CustomKeyStoreId</code> parameter.
61946242
* </p>
61956243
* <p>
6196-
* Applications in Amazon Web Services Nitro Enclaves can call this
6197-
* operation by using the <a
6198-
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
6199-
* Services Nitro Enclaves Development Kit</a>. For information about the
6200-
* supporting parameters, see <a href=
6244+
* <code>GenerateRandom</code> also supports <a href=
6245+
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
6246+
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
6247+
* compute environment in Amazon EC2. To call <code>GenerateRandom</code>
6248+
* for a Nitro enclave, use the <a href=
6249+
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
6250+
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
6251+
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
6252+
* document for the enclave. Instead of plaintext bytes, the response
6253+
* includes the plaintext bytes encrypted under the public key from the
6254+
* attestation document (<code>CiphertextForRecipient</code>).For
6255+
* information about the interaction between KMS and Amazon Web Services
6256+
* Nitro Enclaves, see <a href=
62016257
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
6202-
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
6258+
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
62036259
* Management Service Developer Guide</i>.
62046260
* </p>
62056261
* <p>

‎aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMSClient.java‎

Lines changed: 83 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,14 +1702,22 @@ public CreateKeyResult createKey(CreateKeyRequest createKeyRequest)
17021702
* Developer Guide</i>.
17031703
* </p>
17041704
* <p>
1705-
* Applications in Amazon Web Services Nitro Enclaves can call this
1706-
* operation by using the <a
1707-
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
1708-
* Services Nitro Enclaves Development Kit</a>. For information about the
1709-
* supporting parameters, see <a href=
1705+
* <code>Decrypt</code> also supports <a href=
1706+
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
1707+
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
1708+
* compute environment in Amazon EC2. To call <code>Decrypt</code> for a
1709+
* Nitro enclave, use the <a href=
1710+
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
1711+
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
1712+
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
1713+
* document for the enclave. Instead of the plaintext data, the response
1714+
* includes the plaintext data encrypted with the public key from the
1715+
* attestation document (<code>CiphertextForRecipient</code>).For
1716+
* information about the interaction between KMS and Amazon Web Services
1717+
* Nitro Enclaves, see <a href=
17101718
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
1711-
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
1712-
* Management Service Developer Guide</i>.
1719+
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
1720+
* Management Service Developer Guide</i>..
17131721
* </p>
17141722
* <p>
17151723
* The KMS key that you use for this operation must be in a compatible key
@@ -3209,14 +3217,24 @@ public EncryptResult encrypt(EncryptRequest encryptRequest)
32093217
* Guide</i>.
32103218
* </p>
32113219
* <p>
3212-
* Applications in Amazon Web Services Nitro Enclaves can call this
3213-
* operation by using the <a
3214-
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
3215-
* Services Nitro Enclaves Development Kit</a>. For information about the
3216-
* supporting parameters, see <a href=
3220+
* <code>GenerateDataKey</code> also supports <a href=
3221+
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
3222+
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
3223+
* compute environment in Amazon EC2. To call <code>GenerateDataKey</code>
3224+
* for an Amazon Web Services Nitro enclave, use the <a href=
3225+
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
3226+
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
3227+
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
3228+
* document for the enclave. <code>GenerateDataKey</code> returns a copy of
3229+
* the data key encrypted under the specified KMS key, as usual. But instead
3230+
* of a plaintext copy of the data key, the response includes a copy of the
3231+
* data key encrypted under the public key from the attestation document (
3232+
* <code>CiphertextForRecipient</code>). For information about the
3233+
* interaction between KMS and Amazon Web Services Nitro Enclaves, see <a
3234+
* href=
32173235
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
3218-
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
3219-
* Management Service Developer Guide</i>.
3236+
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
3237+
* Management Service Developer Guide</i>..
32203238
* </p>
32213239
* <p>
32223240
* The KMS key that you use for this operation must be in a compatible key
@@ -3420,6 +3438,28 @@ public GenerateDataKeyResult generateDataKey(GenerateDataKeyRequest generateData
34203438
* href="https://tools.ietf.org/html/rfc5958">RFC 5958</a>.
34213439
* </p>
34223440
* <p>
3441+
* <code>GenerateDataKeyPair</code> also supports <a href=
3442+
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
3443+
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
3444+
* compute environment in Amazon EC2. To call
3445+
* <code>GenerateDataKeyPair</code> for an Amazon Web Services Nitro
3446+
* enclave, use the <a href=
3447+
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
3448+
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
3449+
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
3450+
* document for the enclave. <code>GenerateDataKeyPair</code> returns the
3451+
* public data key and a copy of the private data key encrypted under the
3452+
* specified KMS key, as usual. But instead of a plaintext copy of the
3453+
* private data key (<code>PrivateKeyPlaintext</code>), the response
3454+
* includes a copy of the private data key encrypted under the public key
3455+
* from the attestation document (<code>CiphertextForRecipient</code>). For
3456+
* information about the interaction between KMS and Amazon Web Services
3457+
* Nitro Enclaves, see <a href=
3458+
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
3459+
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
3460+
* Management Service Developer Guide</i>..
3461+
* </p>
3462+
* <p>
34233463
* You can use an optional encryption context to add additional security to
34243464
* the encryption operation. If you specify an
34253465
* <code>EncryptionContext</code>, you must specify the same encryption
@@ -3729,7 +3769,7 @@ public GenerateDataKeyPairWithoutPlaintextResult generateDataKeyPairWithoutPlain
37293769
* <p>
37303770
* To generate an SM4 data key (China Regions only), specify a
37313771
* <code>KeySpec</code> value of <code>AES_128</code> or
3732-
* <code>NumberOfBytes</code> value of <code>128</code>. The symmetric
3772+
* <code>NumberOfBytes</code> value of <code>16</code>. The symmetric
37333773
* encryption key used in China Regions to encrypt your data key is an SM4
37343774
* encryption key.
37353775
* </p>
@@ -3961,13 +4001,21 @@ public GenerateMacResult generateMac(GenerateMacRequest generateMacRequest)
39614001
* store, use the <code>CustomKeyStoreId</code> parameter.
39624002
* </p>
39634003
* <p>
3964-
* Applications in Amazon Web Services Nitro Enclaves can call this
3965-
* operation by using the <a
3966-
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
3967-
* Services Nitro Enclaves Development Kit</a>. For information about the
3968-
* supporting parameters, see <a href=
4004+
* <code>GenerateRandom</code> also supports <a href=
4005+
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
4006+
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
4007+
* compute environment in Amazon EC2. To call <code>GenerateRandom</code>
4008+
* for a Nitro enclave, use the <a href=
4009+
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
4010+
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
4011+
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
4012+
* document for the enclave. Instead of plaintext bytes, the response
4013+
* includes the plaintext bytes encrypted under the public key from the
4014+
* attestation document (<code>CiphertextForRecipient</code>).For
4015+
* information about the interaction between KMS and Amazon Web Services
4016+
* Nitro Enclaves, see <a href=
39694017
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
3970-
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
4018+
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
39714019
* Management Service Developer Guide</i>.
39724020
* </p>
39734021
* <p>
@@ -7764,13 +7812,21 @@ public void retireGrant()
77647812
* store, use the <code>CustomKeyStoreId</code> parameter.
77657813
* </p>
77667814
* <p>
7767-
* Applications in Amazon Web Services Nitro Enclaves can call this
7768-
* operation by using the <a
7769-
* href="https://github.com/aws/aws-nitro-enclaves-sdk-c">Amazon Web
7770-
* Services Nitro Enclaves Development Kit</a>. For information about the
7771-
* supporting parameters, see <a href=
7815+
* <code>GenerateRandom</code> also supports <a href=
7816+
* "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html"
7817+
* >Amazon Web Services Nitro Enclaves</a>, which provide an isolated
7818+
* compute environment in Amazon EC2. To call <code>GenerateRandom</code>
7819+
* for a Nitro enclave, use the <a href=
7820+
* "https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk"
7821+
* >Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services
7822+
* SDK. Use the <code>Recipient</code> parameter to provide the attestation
7823+
* document for the enclave. Instead of plaintext bytes, the response
7824+
* includes the plaintext bytes encrypted under the public key from the
7825+
* attestation document (<code>CiphertextForRecipient</code>).For
7826+
* information about the interaction between KMS and Amazon Web Services
7827+
* Nitro Enclaves, see <a href=
77727828
* "https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html"
7773-
* >How Amazon Web Services Nitro Enclaves use KMS</a> in the <i>Key
7829+
* >How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key
77747830
* Management Service Developer Guide</i>.
77757831
* </p>
77767832
* <p>

0 commit comments

Comments
 (0)