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

Commit b78679e1 authored by Chia-chi Yeh's avatar Chia-chi Yeh
Browse files

keystore: compute the padding in an intuitive way.

parent 872db948

cmds/keystore/keystore.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -170,16 +170,12 @@ static int8_t encrypt_blob(char *name, AES_KEY *aes_key) 
        return SYSTEM_ERROR;

        return SYSTEM_ERROR;

    }

    }





    length = (blob.length + blob.value - blob.encrypted) % AES_BLOCK_SIZE;

    length = blob.length + blob.value - blob.encrypted;

    if (length) {

    length = (length + AES_BLOCK_SIZE - 1) / AES_BLOCK_SIZE * AES_BLOCK_SIZE;

        length = AES_BLOCK_SIZE - length;

    }





    length += blob.length + blob.value - blob.digested;

    blob.length = htonl(blob.length);

    blob.length = htonl(blob.length);

    MD5(blob.digested, length, blob.digest);

    MD5(blob.digested, length - (blob.digested - blob.encrypted), blob.digest);





    length += blob.digested - blob.encrypted;

    memcpy(vector, blob.vector, AES_BLOCK_SIZE);

    memcpy(vector, blob.vector, AES_BLOCK_SIZE);

    AES_cbc_encrypt(blob.encrypted, blob.encrypted, length, aes_key, vector,

    AES_cbc_encrypt(blob.encrypted, blob.encrypted, length, aes_key, vector,

                    AES_ENCRYPT);

                    AES_ENCRYPT);