feat(aws-android-sdk-kms): update models to latest (#3311)

Author: awsmobilesdk

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

@@ -25,7 +25,9 @@ public enum AlgorithmSpec {
 
     RSAES_PKCS1_V1_5("RSAES_PKCS1_V1_5"),
     RSAES_OAEP_SHA_1("RSAES_OAEP_SHA_1"),
-    RSAES_OAEP_SHA_256("RSAES_OAEP_SHA_256");
+    RSAES_OAEP_SHA_256("RSAES_OAEP_SHA_256"),
+    RSA_AES_KEY_WRAP_SHA_1("RSA_AES_KEY_WRAP_SHA_1"),
+    RSA_AES_KEY_WRAP_SHA_256("RSA_AES_KEY_WRAP_SHA_256");
 
     private String value;
 
@@ -44,6 +46,8 @@ public String toString() {
         enumMap.put("RSAES_PKCS1_V1_5", RSAES_PKCS1_V1_5);
         enumMap.put("RSAES_OAEP_SHA_1", RSAES_OAEP_SHA_1);
         enumMap.put("RSAES_OAEP_SHA_256", RSAES_OAEP_SHA_256);
+        enumMap.put("RSA_AES_KEY_WRAP_SHA_1", RSA_AES_KEY_WRAP_SHA_1);
+        enumMap.put("RSA_AES_KEY_WRAP_SHA_256", RSA_AES_KEY_WRAP_SHA_256);
     }
 
     /**

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

@@ -117,15 +117,6 @@
  * HMAC codes for messages up to 4096 bytes.
  * </p>
  * <p>
- * HMAC KMS keys are not supported in all Amazon Web Services Regions. If you
- * try to create an HMAC KMS key in an Amazon Web Services Region in which HMAC
- * keys are not supported, the <code>CreateKey</code> operation returns an
- * <code>UnsupportedOperationException</code>. For a list of Regions in which
- * HMAC KMS keys are supported, see <a
- * href="https://docs.aws.amazon.com/kms/latest/developerguide/hmac.html">HMAC
- * keys in KMS</a> in the <i>Key Management Service Developer Guide</i>.
- * </p>
- * <p>
  * </p></dd>
  * <dt>Multi-Region primary keys</dt>
  * <dt>Imported key material</dt>
@@ -162,21 +153,23 @@
  * </p></dd>
  * <dd>
  * <p>
- * To import your own key material into a KMS key, begin by creating a symmetric
- * encryption KMS key with no key material. To do this, use the
- * <code>Origin</code> parameter of <code>CreateKey</code> with a value of
- * <code>EXTERNAL</code>. Next, use <a>GetParametersForImport</a> operation to
- * get a public key and import token, and use the public key to encrypt your key
- * material. Then, use <a>ImportKeyMaterial</a> with your import token to import
- * the key material. For step-by-step instructions, see <a href=
+ * To import your own key material into a KMS key, begin by creating a KMS key
+ * with no key material. To do this, use the <code>Origin</code> parameter of
+ * <code>CreateKey</code> with a value of <code>EXTERNAL</code>. Next, use
+ * <a>GetParametersForImport</a> operation to get a public key and import token.
+ * Use the wrapping public key to encrypt your key material. Then, use
+ * <a>ImportKeyMaterial</a> with your import token to import the key material.
+ * For step-by-step instructions, see <a href=
  * "https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html"
  * >Importing Key Material</a> in the <i> <i>Key Management Service Developer
  * Guide</i> </i>.
  * </p>
  * <p>
- * This feature supports only symmetric encryption KMS keys, including
- * multi-Region symmetric encryption KMS keys. You cannot import key material
- * into any other type of KMS key.
+ * You can import key material into KMS keys of all supported KMS key types:
+ * symmetric encryption KMS keys, HMAC KMS keys, asymmetric encryption KMS keys,
+ * and asymmetric signing KMS keys. You can also create multi-Region keys with
+ * imported key material. However, you can't import key material into a KMS key
+ * in a custom key store.
  * </p>
  * <p>
  * To create a multi-Region primary key with imported key material, use the

aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/AlgorithmSpec.java

@@ -21,9 +21,10 @@
 
 /**
  * <p>
- * Deletes key material that you previously imported. This operation makes the
- * specified KMS key unusable. For more information about importing key material
- * into KMS, see <a href=
+ * Deletes key material that was previously imported. This operation makes the
+ * specified KMS key temporarily unusable. To restore the usability of the KMS
+ * key, reimport the same key material. For more information about importing key
+ * material into KMS, see <a href=
  * "https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html"
  * >Importing Key Material</a> in the <i>Key Management Service Developer
  * Guide</i>.
@@ -34,10 +35,6 @@
  * key's state to <code>PendingImport</code>.
  * </p>
  * <p>
- * After you delete key material, you can use <a>ImportKeyMaterial</a> to
- * reimport the same key material into the KMS key.
- * </p>
- * <p>
  * The KMS key that you use for this operation must be in a compatible key
  * state. For details, see <a
  * href="https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html"