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

Commit 2fa1b1a8 authored by Brian Delwiche's avatar Brian Delwiche Committed by Android (Google) Code Review
Browse files

Merge "[conflict] Merge "Fix timing attack in BTM_BleVerifySignature" into... 

Merge "[conflict] Merge "Fix timing attack in BTM_BleVerifySignature" into tm-dev am: b9bcb27e am: b52dff3f" into udc-dev
parents e9e86c5c 1dfb5e99

system/stack/btm/btm_ble.cc

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "main/shim/btm_api.h"

#include "main/shim/l2c_api.h"

#include "main/shim/shim.h"

#include "openssl/mem.h"

#include "osi/include/allocator.h"

#include "osi/include/properties.h"

#include "stack/btm/btm_dev.h"
@@ -1988,7 +1989,7 @@ bool BTM_BleVerifySignature(const RawAddress& bd_addr, uint8_t* p_orig, 


    crypto_toolbox::aes_cmac(p_rec->ble.keys.pcsrk, p_orig, len,

                             BTM_CMAC_TLEN_SIZE, p_mac);

    if (memcmp(p_mac, p_comp, BTM_CMAC_TLEN_SIZE) == 0) {

    if (CRYPTO_memcmp(p_mac, p_comp, BTM_CMAC_TLEN_SIZE) == 0) {

      btm_ble_increment_sign_ctr(bd_addr, false);

      verified = true;

    }