[AWSKeyValueStore] Add disagnostic messages for key generation and loading in KeyProvider

Author: Karthikeyan Vasuki Balasubramaniam

aws-android-sdk-core/src/main/java/com/amazonaws/internal/keyvaluestore/KeyProvider10.java

@@ -41,6 +41,7 @@ public Key getKey(SharedPreferences sharedPreferences, String keyAlias, Context
             try {
                 // If SharedPreferences contains the key, load it.
                 if (sharedPreferences.contains(SHARED_PREFERENCES_KEY_NAME_FOR_ENCRYPTION_KEY)) {
+                    logger.debug("Loading the encryption key from SharedPreferences");
                     final String keyInStringFormat = sharedPreferences
                             .getString(SHARED_PREFERENCES_KEY_NAME_FOR_ENCRYPTION_KEY, null);
                     return new SecretKeySpec(Base64.decode(keyInStringFormat), AES_KEY_ALGORITHM);
@@ -55,6 +56,8 @@ public Key getKey(SharedPreferences sharedPreferences, String keyAlias, Context
                             .putString(SHARED_PREFERENCES_KEY_NAME_FOR_ENCRYPTION_KEY,
                                     Base64.encodeAsString(secretKey.getEncoded()))
                             .apply();
+
+                    logger.info("Generated and saved the encryption key to SharedPreferences");
                     return secretKey;
                 }
             } catch (Exception ex) {

aws-android-sdk-core/src/main/java/com/amazonaws/internal/keyvaluestore/KeyProvider18.java

@@ -73,6 +73,7 @@ public Key getKey(SharedPreferences sharedPreferences,
 
                 // Check if SharedPreferences has the encrypted AES key
                 if (sharedPreferences.contains(ENCRYPTED_AES_KEY)) {
+                    logger.debug("Loading the encryption key from SharedPreferences");
                     String encryptedAesEncryptionKey = sharedPreferences
                             .getString(ENCRYPTED_AES_KEY, null);
                     return new SecretKeySpec(
@@ -88,6 +89,8 @@ public Key getKey(SharedPreferences sharedPreferences,
                             .putString(ENCRYPTED_AES_KEY,
                                     Base64.encodeAsString(rsaEncrypt(keyAlias, aesEncryptionKey.getEncoded())))
                             .apply();
+
+                    logger.info("Generated and saved the encryption key to SharedPreferences");
                     return aesEncryptionKey;
                 }
             } catch (Exception ex) {

aws-android-sdk-core/src/main/java/com/amazonaws/internal/keyvaluestore/KeyProvider23.java

@@ -55,9 +55,13 @@ public Key getKey(SharedPreferences sharedPreferences,
                                     .setKeySize(CIPHER_AES_GCM_NOPADDING_KEY_LENGTH_IN_BITS) // 256-bit key
                                     .setRandomizedEncryptionRequired(false)
                                     .build());
-                    return generator.generateKey();
+                    Key key = generator.generateKey();
+
+                    logger.info("Generated the encryption key using Android KeyStore.");
+                    return key;
                 } else {
                     logger.debug("AndroidKeyStore contains keyAlias " + keyAlias);
+                    logger.debug("Loading the encryption key from Android KeyStore.");
                     return keyStore.getKey(keyAlias, null);
                 }
             } catch (Exception ex) {