Removing unnecessary attributes from keystore wrap operation, Fixes AB#3137956 (#2578)

In an older
[PR](#2558),
I replaced the deprecated Keystore API for Android 28+
But it did not fix the issue of unwrap keystore operation failing on
some Pixel 5 devices. Since it is not reproducing on other devices, I am
removing the unnecessary attributes from the keystore wrap operation to
see if it fixes the issue. certificate parameters are no longer actively
used in other parts of the code. Hence removed those.

I have already shared the test build with 2 customers and the issue has
NOT reproduced on their devices so far with this fix.

Fixes
[AB#3137956](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3137956)

Author: somalaya

changelog.txt

@@ -4,6 +4,7 @@ vNext
 - [MINOR] Organize browser selection classes and change signature for get AuthorizationStrategy (#2564)
 - [MINOR] Add support for OneBox Environment (#2559)
 - [MINOR] Add support for claims requests for native authentication (#2572)
+- [MINOR] Removing unnecessary attributes from keystore wrap operation (#2578)
 
 Version 19.0.0
 ----------

common/src/main/java/com/microsoft/identity/common/crypto/AndroidWrappedKeyLoader.java

@@ -46,9 +46,7 @@
 import java.security.KeyStore;
 import java.security.spec.AlgorithmParameterSpec;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.Locale;
-import java.util.concurrent.TimeUnit;
 
 import javax.crypto.SecretKey;
 import javax.security.auth.x500.X500Principal;
@@ -311,18 +309,11 @@ private static AlgorithmParameterSpec getSpecForKeyStoreKey(@NonNull final Conte
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
             return getLegacySpecForKeyStoreKey(context, alias);
         } else {
-            final String certInfo = String.format(Locale.ROOT, "CN=%s, OU=%s",
-                    alias,
-                    context.getPackageName());
-            final int certValidYears = 100;
-            int purposes = KeyProperties.PURPOSE_WRAP_KEY | KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT;
+            int purposes = KeyProperties.PURPOSE_WRAP_KEY  | KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT;
             return new KeyGenParameterSpec.Builder(alias, purposes)
-                    .setCertificateSubject(new X500Principal(certInfo))
-                    .setCertificateSerialNumber(BigInteger.ONE)
-                    .setCertificateNotBefore(new Date())
-                    .setCertificateNotAfter(new Date(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(365 * certValidYears)))
                     .setKeySize(2048)
                     .setDigests(KeyProperties.DIGEST_SHA256, KeyProperties.DIGEST_SHA512)
+                    .setBlockModes(KeyProperties.BLOCK_MODE_ECB) // Ensure compatibility with RSA
                     .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_RSA_PKCS1)
                     .build();
         }