Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f4d742 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary PKCS#1 authorization on legacy keys." into mnc-dev

parents 69dd4bba 2e3aaa7d

keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -226,9 +226,8 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato 
                                    | KeyProperties.PURPOSE_VERIFY);

                                    | KeyProperties.PURPOSE_VERIFY);

                            // Authorized to be used with any digest (including no digest).

                            // Authorized to be used with any digest (including no digest).

                            specBuilder.setDigests(KeyProperties.DIGEST_NONE);

                            specBuilder.setDigests(KeyProperties.DIGEST_NONE);

                            specBuilder.setSignaturePaddings(

                            // Authorized to be used with any encryption and signature padding

                                    KeyProperties.SIGNATURE_PADDING_RSA_PKCS1);

                            // scheme (including no padding).

                            // Authorized to be used with any padding (including no padding).

                            specBuilder.setEncryptionPaddings(

                            specBuilder.setEncryptionPaddings(

                                    KeyProperties.ENCRYPTION_PADDING_NONE);

                                    KeyProperties.ENCRYPTION_PADDING_NONE);

                            // Disable randomized encryption requirement to support encryption

                            // Disable randomized encryption requirement to support encryption

keystore/java/android/security/keystore/AndroidKeyStoreSpi.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -258,9 +258,8 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { 
                            | KeyProperties.PURPOSE_VERIFY);

                            | KeyProperties.PURPOSE_VERIFY);

            // Authorized to be used with any digest (including no digest).

            // Authorized to be used with any digest (including no digest).

            specBuilder.setDigests(KeyProperties.DIGEST_NONE);

            specBuilder.setDigests(KeyProperties.DIGEST_NONE);

            specBuilder.setSignaturePaddings(

            // Authorized to be used with any encryption and signature padding scheme (including no

                    KeyProperties.SIGNATURE_PADDING_RSA_PKCS1);

            // padding).

            // Authorized to be used with any padding (including no padding).

            specBuilder.setEncryptionPaddings(

            specBuilder.setEncryptionPaddings(

                    KeyProperties.ENCRYPTION_PADDING_NONE);

                    KeyProperties.ENCRYPTION_PADDING_NONE);

            // Disable randomized encryption requirement to support encryption padding NONE

            // Disable randomized encryption requirement to support encryption padding NONE