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

Commit 34288aa2 authored by David Drysdale's avatar David Drysdale Committed by Gerrit Code Review
Browse files

Merge "Alter spec text for RSA-PSS to match reality"

parents da89cea2 c6b8907a

current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -903,6 +903,7 @@ c8a57364f6ad20842be14f4db284df5304f7521ca8eac6bcc1fa6c5b466fb8a6 android.hardwar 




# ABI preserving changes to HALs during Android T

# ABI preserving changes to HALs during Android T

62ace52d9c3ff1f60f94118557a2aaf0b953513e59dcd34d5f94ae28d4c7e780 android.hardware.fastboot@1.0::IFastboot

62ace52d9c3ff1f60f94118557a2aaf0b953513e59dcd34d5f94ae28d4c7e780 android.hardware.fastboot@1.0::IFastboot

d0fb32f3ddeb9af7115ab32905225ea69b930d2472be8e9610f0cf136c15aefb android.hardware.keymaster@4.0::IKeymasterDevice # b/210424594

ca62a2a95d173ed323309e5e00f653ad3cceec82a6e5e4976a249cb5aafe2515 android.hardware.neuralnetworks@1.2::types

ca62a2a95d173ed323309e5e00f653ad3cceec82a6e5e4976a249cb5aafe2515 android.hardware.neuralnetworks@1.2::types

fa76bced6b1b71c40fc706c508a9011284c57f57831cd0cf5f45653ed4ea463e android.hardware.neuralnetworks@1.3::types

fa76bced6b1b71c40fc706c508a9011284c57f57831cd0cf5f45653ed4ea463e android.hardware.neuralnetworks@1.3::types

keymaster/4.0/IKeymasterDevice.hal

+2 −1
Original line number Original line Diff line number Diff line
@@ -1254,7 +1254,8 @@ interface IKeymasterDevice { 
     * o PaddingMode::RSA_PSS.  For PSS-padded signature operations, the PSS salt length must match

     * o PaddingMode::RSA_PSS.  For PSS-padded signature operations, the PSS salt length must match

     *   the size of the PSS digest selected.  The digest specified with Tag::DIGEST in inputParams

     *   the size of the PSS digest selected.  The digest specified with Tag::DIGEST in inputParams

     *   on begin() must be used as the PSS digest algorithm, MGF1 must be used as the mask

     *   on begin() must be used as the PSS digest algorithm, MGF1 must be used as the mask

     *   generation function and SHA1 must be used as the MGF1 digest algorithm.

     *   generation function and the digest specified with Tag:DIGEST in inputParams must also be

     *   used as the MGF1 digest algorithm.

     *

     *

     * o PaddingMode::RSA_OAEP.  The digest specified with Tag::DIGEST in inputParams on begin is

     * o PaddingMode::RSA_OAEP.  The digest specified with Tag::DIGEST in inputParams on begin is

     *   used as the OAEP digest algorithm, MGF1 must be used as the mask generation function and

     *   used as the OAEP digest algorithm, MGF1 must be used as the mask generation function and

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -1712,6 +1712,7 @@ TEST_P(VerificationOperationsTest, RsaAllPaddingsAndDigests) { 
                    case PaddingMode::RSA_PSS:

                    case PaddingMode::RSA_PSS:

                        EXPECT_GT(EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING), 0);

                        EXPECT_GT(EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING), 0);

                        EXPECT_GT(EVP_PKEY_CTX_set_rsa_pss_saltlen(pkey_ctx, EVP_MD_size(md)), 0);

                        EXPECT_GT(EVP_PKEY_CTX_set_rsa_pss_saltlen(pkey_ctx, EVP_MD_size(md)), 0);

                        EXPECT_GT(EVP_PKEY_CTX_set_rsa_mgf1_md(pkey_ctx, md), 0);

                        break;

                        break;

                    case PaddingMode::RSA_PKCS1_1_5_SIGN:

                    case PaddingMode::RSA_PKCS1_1_5_SIGN:

                        // PKCS1 is the default; don't need to set anything.

                        // PKCS1 is the default; don't need to set anything.

security/keymint/aidl/android/hardware/security/keymint/IKeyMintOperation.aidl

+2 −1
Original line number Original line Diff line number Diff line
@@ -227,7 +227,8 @@ interface IKeyMintOperation { 
     * o PaddingMode::RSA_PSS.  For PSS-padded signature operations, the PSS salt length must match

     * o PaddingMode::RSA_PSS.  For PSS-padded signature operations, the PSS salt length must match

     *   the size of the PSS digest selected.  The digest specified with Tag::DIGEST in params

     *   the size of the PSS digest selected.  The digest specified with Tag::DIGEST in params

     *   on begin() must be used as the PSS digest algorithm, MGF1 must be used as the mask

     *   on begin() must be used as the PSS digest algorithm, MGF1 must be used as the mask

     *   generation function and SHA1 must be used as the MGF1 digest algorithm.

     *   generation function and the digest specified with Tag:DIGEST in params on begin() must also

     *   be used as the MGF1 digest algorithm.

     *

     *

     * -- ECDSA keys --

     * -- ECDSA keys --

     *

     *

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -812,6 +812,7 @@ void KeyMintAidlTestBase::LocalVerifyMessage(const string& message, const string 
        if (padding == PaddingMode::RSA_PSS) {

        if (padding == PaddingMode::RSA_PSS) {

            EXPECT_GT(EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING), 0);

            EXPECT_GT(EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING), 0);

            EXPECT_GT(EVP_PKEY_CTX_set_rsa_pss_saltlen(pkey_ctx, EVP_MD_size(md)), 0);

            EXPECT_GT(EVP_PKEY_CTX_set_rsa_pss_saltlen(pkey_ctx, EVP_MD_size(md)), 0);

            EXPECT_GT(EVP_PKEY_CTX_set_rsa_mgf1_md(pkey_ctx, md), 0);

        }

        }





        ASSERT_EQ(1, EVP_DigestVerifyUpdate(&digest_ctx,

        ASSERT_EQ(1, EVP_DigestVerifyUpdate(&digest_ctx,