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

Commit 4cf49ed7 authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "DO NOT MERGE SMP: Revert "DO NOT MERGE SMP: Validate remote elliptic... 

Merge "DO NOT MERGE SMP: Revert "DO NOT MERGE SMP: Validate remote elliptic curve points"" into oc-dev
am: 9d34faec

Change-Id: I824ee80b3f0a8331d3f712ff313be1fdd93b77b7
parents 0a7c1591 9d34faec

system/stack/smp/p_256_ecc_pp.cc

+0 −22
Original line number Diff line number Diff line
@@ -245,25 +245,3 @@ void ECC_PointMult_Bin_NAF(Point* q, Point* p, uint32_t* n, 
  multiprecision_mersenns_mult_mod(q->z, q->z, minus_p.x, keyLength);

  multiprecision_mersenns_mult_mod(q->y, q->y, q->z, keyLength);

}
 


bool ECC_ValidatePoint(const Point& pt) {

  const size_t kl = KEY_LENGTH_DWORDS_P256;

  p_256_init_curve(kl);



  // Ensure y^2 = x^3 + a*x + b (mod p); a = -3



  // y^2 mod p

  uint32_t y2_mod[kl] = {0};

  multiprecision_mersenns_squa_mod(y2_mod, (uint32_t*)pt.y, kl);



  // Right hand side calculation

  uint32_t rhs[kl] = {0};

  multiprecision_mersenns_squa_mod(rhs, (uint32_t*)pt.x, kl);

  uint32_t three[kl] = {0};

  three[0] = 3;

  multiprecision_sub_mod(rhs, rhs, three, kl);

  multiprecision_mersenns_mult_mod(rhs, rhs, (uint32_t*)pt.x, kl);

  multiprecision_add_mod(rhs, rhs, curve_p256.b, kl);



  return multiprecision_compare(rhs, y2_mod, kl) == 0;

}

system/stack/smp/p_256_ecc_pp.h

+0 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


#pragma once



#include <cstdbool>

#include "p_256_multprecision.h"



typedef struct {
@@ -56,8 +55,6 @@ typedef struct { 
extern elliptic_curve_t curve;

extern elliptic_curve_t curve_p256;



bool ECC_ValidatePoint(const Point& p);



void ECC_PointMult_Bin_NAF(Point* q, Point* p, uint32_t* n, uint32_t keyLength);



#define ECC_PointMult(q, p, n, keyLength) \

system/stack/smp/smp_act.cc

+0 −12
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include "include/bt_target.h"

#include "stack/btm/btm_int.h"

#include "stack/include/l2c_api.h"

#include "stack/smp/p_256_ecc_pp.h"

#include "stack/smp/smp_int.h"

#include "utils/include/bt_utils.h"
@@ -654,17 +653,6 @@ void smp_process_pairing_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 


  STREAM_TO_ARRAY(p_cb->peer_publ_key.x, p, BT_OCTET32_LEN);

  STREAM_TO_ARRAY(p_cb->peer_publ_key.y, p, BT_OCTET32_LEN);



  Point pt;

  memcpy(pt.x, p_cb->peer_publ_key.x, BT_OCTET32_LEN);

  memcpy(pt.y, p_cb->peer_publ_key.y, BT_OCTET32_LEN);



  if (!ECC_ValidatePoint(pt)) {

    android_errorWriteLog(0x534e4554, "72377774");

    smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &reason);

    return;

  }



  p_cb->flags |= SMP_PAIR_FLAG_HAVE_PEER_PUBL_KEY;



  smp_wait_for_both_public_keys(p_cb, NULL);