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

Commit ba14346e authored by David Benjamin's avatar David Benjamin Committed by Automerger Merge Worker
Browse files

Use BoringSSL's public API in keymaster_hidl_hal_test am: 727f1ed7 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2588645



Change-Id: Ie6a1e8bd50203f2c41a9ac330214770838e31447
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e9eaa96 727f1ed7

keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp

+8 −5
Original line number Diff line number Diff line
@@ -2617,10 +2617,11 @@ TEST_P(EncryptionOperationsTest, RsaNoPaddingTooLarge) { 
    EVP_PKEY_Ptr pkey(d2i_PUBKEY(nullptr /* alloc new */, &p, exported.size()));

    RSA_Ptr rsa(EVP_PKEY_get1_RSA(pkey.get()));



    size_t modulus_len = BN_num_bytes(rsa->n);

    const BIGNUM* n = RSA_get0_n(rsa.get());

    size_t modulus_len = BN_num_bytes(n);

    ASSERT_EQ(1024U / 8, modulus_len);

    std::unique_ptr<uint8_t[]> modulus_buf(new uint8_t[modulus_len]);

    BN_bn2bin(rsa->n, modulus_buf.get());

    BN_bn2bin(n, modulus_buf.get());



    // The modulus is too big to encrypt.

    string message(reinterpret_cast<const char*>(modulus_buf.get()), modulus_len);
@@ -2632,10 +2633,12 @@ TEST_P(EncryptionOperationsTest, RsaNoPaddingTooLarge) { 
    EXPECT_EQ(ErrorCode::INVALID_ARGUMENT, Finish(message, &result));



    // One smaller than the modulus is okay.

    BN_sub(rsa->n, rsa->n, BN_value_one());

    modulus_len = BN_num_bytes(rsa->n);

    BIGNUM_Ptr n_minus_1(BN_new());

    ASSERT_TRUE(n_minus_1);

    ASSERT_TRUE(BN_sub(n_minus_1.get(), n, BN_value_one()));

    modulus_len = BN_num_bytes(n_minus_1.get());

    ASSERT_EQ(1024U / 8, modulus_len);

    BN_bn2bin(rsa->n, modulus_buf.get());

    BN_bn2bin(n_minus_1.get(), modulus_buf.get());

    message = string(reinterpret_cast<const char*>(modulus_buf.get()), modulus_len);

    EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::ENCRYPT, params));

    EXPECT_EQ(ErrorCode::OK, Finish(message, &result));

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+8 −5
Original line number Diff line number Diff line
@@ -2449,10 +2449,11 @@ TEST_P(EncryptionOperationsTest, RsaNoPaddingTooLarge) { 
    EVP_PKEY_Ptr pkey(d2i_PUBKEY(nullptr /* alloc new */, &p, exported.size()));

    RSA_Ptr rsa(EVP_PKEY_get1_RSA(pkey.get()));



    size_t modulus_len = BN_num_bytes(rsa->n);

    const BIGNUM* n = RSA_get0_n(rsa.get());

    size_t modulus_len = BN_num_bytes(n);

    ASSERT_EQ(2048U / 8, modulus_len);

    std::unique_ptr<uint8_t[]> modulus_buf(new uint8_t[modulus_len]);

    BN_bn2bin(rsa->n, modulus_buf.get());

    BN_bn2bin(n, modulus_buf.get());



    // The modulus is too big to encrypt.

    string message(reinterpret_cast<const char*>(modulus_buf.get()), modulus_len);
@@ -2464,10 +2465,12 @@ TEST_P(EncryptionOperationsTest, RsaNoPaddingTooLarge) { 
    EXPECT_EQ(ErrorCode::INVALID_ARGUMENT, Finish(message, &result));



    // One smaller than the modulus is okay.

    BN_sub(rsa->n, rsa->n, BN_value_one());

    modulus_len = BN_num_bytes(rsa->n);

    BIGNUM_Ptr n_minus_1(BN_new());

    ASSERT_TRUE(n_minus_1);

    ASSERT_TRUE(BN_sub(n_minus_1.get(), n, BN_value_one()));

    modulus_len = BN_num_bytes(n_minus_1.get());

    ASSERT_EQ(2048U / 8, modulus_len);

    BN_bn2bin(rsa->n, modulus_buf.get());

    BN_bn2bin(n_minus_1.get(), modulus_buf.get());

    message = string(reinterpret_cast<const char*>(modulus_buf.get()), modulus_len);

    EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::ENCRYPT, params));

    EXPECT_EQ(ErrorCode::OK, Finish(message, &result));