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

Commit dd71fd87 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "Crypto: Remove dependencies CHECK and bt_types.h" into main

parents d2e05fec 92db2d44

system/stack/crypto_toolbox/aes_cmac.cc

+2 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
 ******************************************************************************/



#include <base/logging.h>

#include <base/strings/string_number_conversions.h>



#include "check.h"

#include <algorithm>



#include "aes.h"

#include "crypto_toolbox.h"

#include "stack/include/bt_octets.h"
@@ -50,7 +50,6 @@ Octet16 const_Rb{0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 * length of OCTET16_LEN. Result is stored in first argument.

 */

static void xor_128(Octet16* a, const Octet16& b) {

  CHECK(a);

  uint8_t i, *aa = a->data();

  const uint8_t* bb = b.data();

system/stack/crypto_toolbox/crypto_toolbox.cc

+1 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 


#include <algorithm>



#include "aes.h"

#include "stack/include/bt_octets.h"



using base::HexEncode;
@@ -147,8 +146,7 @@ uint32_t g2(const uint8_t* u, const uint8_t* v, const Octet16& x, 


  /* vres = cmac mod 2**32 mod 10**6 */

  uint32_t vres;

  uint8_t* p = cmac.data();

  STREAM_TO_UINT32(vres, p);

  std::copy(cmac.data(), cmac.data() + sizeof(uint32_t), (uint8_t*)&vres);



  vres = vres % 1000000;

  return vres;

system/stack/crypto_toolbox/crypto_toolbox.h

+1 −3
Original line number Diff line number Diff line
@@ -15,11 +15,9 @@ 
 */



#pragma once

#include <base/logging.h>

#include <cstring>



#include "check.h"

#include "stack/include/bt_octets.h"

#include "stack/include/bt_types.h"



namespace crypto_toolbox {