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

Commit 8823a441 authored by Shawn Willden's avatar Shawn Willden
Browse files

Add support for 3DES algorithm to Keymaster. 

Test: VtsHalKeymasterV4_0TargetTest
Bug: 31675676
Change-Id: I68a67b78979002a38e92454f79715ed516026889
parent d2339fff

keymaster/4.0/support/authorization_set.cpp

+10 −0
Original line number Diff line number Diff line
@@ -441,6 +441,11 @@ AuthorizationSetBuilder& AuthorizationSetBuilder::AesKey(uint32_t key_size) { 
    return Authorization(TAG_KEY_SIZE, key_size);

}



AuthorizationSetBuilder& AuthorizationSetBuilder::TripleDesKey(uint32_t key_size) {

    Authorization(TAG_ALGORITHM, Algorithm::TRIPLE_DES);

    return Authorization(TAG_KEY_SIZE, key_size);

}



AuthorizationSetBuilder& AuthorizationSetBuilder::HmacKey(uint32_t key_size) {

    Authorization(TAG_ALGORITHM, Algorithm::HMAC);

    Authorization(TAG_KEY_SIZE, key_size);
@@ -474,6 +479,11 @@ AuthorizationSetBuilder& AuthorizationSetBuilder::AesEncryptionKey(uint32_t key_ 
    return EncryptionKey();

}



AuthorizationSetBuilder& AuthorizationSetBuilder::TripleDesEncryptionKey(uint32_t key_size) {

    TripleDesKey(key_size);

    return EncryptionKey();

}



AuthorizationSetBuilder& AuthorizationSetBuilder::SigningKey() {

    Authorization(TAG_PURPOSE, KeyPurpose::SIGN);

    return Authorization(TAG_PURPOSE, KeyPurpose::VERIFY);

keymaster/4.0/support/include/keymasterV4_0/authorization_set.h

+2 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ class AuthorizationSetBuilder : public AuthorizationSet { 
    AuthorizationSetBuilder& EcdsaKey(uint32_t key_size);

    AuthorizationSetBuilder& EcdsaKey(EcCurve curve);

    AuthorizationSetBuilder& AesKey(uint32_t key_size);

    AuthorizationSetBuilder& TripleDesKey(uint32_t key_size);

    AuthorizationSetBuilder& HmacKey(uint32_t key_size);



    AuthorizationSetBuilder& RsaSigningKey(uint32_t key_size, uint64_t public_exponent);
@@ -265,6 +266,7 @@ class AuthorizationSetBuilder : public AuthorizationSet { 
    AuthorizationSetBuilder& EcdsaSigningKey(uint32_t key_size);

    AuthorizationSetBuilder& EcdsaSigningKey(EcCurve curve);

    AuthorizationSetBuilder& AesEncryptionKey(uint32_t key_size);

    AuthorizationSetBuilder& TripleDesEncryptionKey(uint32_t key_size);



    AuthorizationSetBuilder& SigningKey();

    AuthorizationSetBuilder& EncryptionKey();

keymaster/4.0/types.hal

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ enum Algorithm : uint32_t { 


    /** Block ciphers algorithms */

    AES = 32,

    TRIPLE_DES = 33,



    /** MAC algorithms */

    HMAC = 128,

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+594 −0

File changed.

Preview size limit exceeded, changes collapsed.