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

Commit 519645d5 authored Oct 14, 2019 by Jakub Pawlowski

Rename "smp" to "security"

SMP is just name of protocol used for one aspect of security management.
Rename the namespace in order to avoid any further confusions.

Test: compliation
Bug: 142341141
Change-Id: Id505fa3cd4b653c8486db2bca5f82233e731ec51

parent 45d54000

system/gd/Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -310,12 +310,12 @@ genrule {
	srcs: [		srcs: [
	"hci/hci_packets.pdl",		"hci/hci_packets.pdl",
	"l2cap/l2cap_packets.pdl",		"l2cap/l2cap_packets.pdl",
	"smp/smp_packets.pdl",		"security/smp_packets.pdl",
	],		],
	out: [		out: [
	"hci/hci_packets.h",		"hci/hci_packets.h",
	"l2cap/l2cap_packets.h",		"l2cap/l2cap_packets.h",
	"smp/smp_packets.h",		"security/smp_packets.h",
	],		],
	}		}

system/gd/smp/Android.bp→system/gd/security/Android.bp

+0 −0

File moved.

system/gd/smp/ecc/multipoint_test.cc→system/gd/security/ecc/multipoint_test.cc

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -18,10 +18,10 @@

	#include <gtest/gtest.h>		#include <gtest/gtest.h>

	#include "smp/ecc/p_256_ecc_pp.h"		#include "security/ecc/p_256_ecc_pp.h"

	namespace bluetooth {		namespace bluetooth {
	namespace smp {		namespace security {
	namespace ecc {		namespace ecc {

	// Test ECC point validation		// Test ECC point validation
	@@ -108,5 +108,5 @@ TEST(SmpEccValidationTest, test_invalid_points) {
	}		}

	} // namespace ecc		} // namespace ecc
	} // namespace smp		} // namespace security
	} // namespace bluetooth		} // namespace bluetooth

system/gd/smp/ecc/multprecision.cc→system/gd/security/ecc/multprecision.cc

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -22,11 +22,11 @@
	*		*
	******************************************************************************/		******************************************************************************/

	#include "smp/ecc/multprecision.h"		#include "security/ecc/multprecision.h"
	#include <string.h>		#include <string.h>

	namespace bluetooth {		namespace bluetooth {
	namespace smp {		namespace security {
	namespace ecc {		namespace ecc {

	#define DWORD_BITS 32		#define DWORD_BITS 32
	@@ -500,5 +500,5 @@ void multiprecision_inv_mod(uint32_t* aminus, uint32_t* u, const uint32_t* modp)
	}		}

	} // namespace ecc		} // namespace ecc
	} // namespace smp		} // namespace security
	} // namespace bluetooth		} // namespace bluetooth
			No newline at end of file

system/gd/smp/ecc/multprecision.h→system/gd/security/ecc/multprecision.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@
	#include <cstdint>		#include <cstdint>

	namespace bluetooth {		namespace bluetooth {
	namespace smp {		namespace security {
	namespace ecc {		namespace ecc {

	#define KEY_LENGTH_DWORDS_P256 8		#define KEY_LENGTH_DWORDS_P256 8
	@@ -52,5 +52,5 @@ void multiprecision_mersenns_squa_mod(uint32_t* c, const uint32_t* a, const uint
	void multiprecision_fast_mod_P256(uint32_t* c, const uint32_t* a, const uint32_t* modp);		void multiprecision_fast_mod_P256(uint32_t* c, const uint32_t* a, const uint32_t* modp);

	} // namespace ecc		} // namespace ecc
	} // namespace smp		} // namespace security
	} // namespace bluetooth		} // namespace bluetooth
			No newline at end of file