Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup unused legacy config flags #14436

Merged
merged 1 commit into from
Jan 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/include/platform/AttributeList.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class AttributeList
int mIndex = -1;
};

public:
AttributeList() = default;
~AttributeList() { mSize = 0; }

Expand Down
1 change: 0 additions & 1 deletion src/include/platform/GeneralFaults.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class GeneralFaults
int mIndex = -1;
};

public:
GeneralFaults() = default;
~GeneralFaults() { mSize = 0; }

Expand Down
54 changes: 0 additions & 54 deletions src/lib/core/CHIPConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,41 +72,6 @@
#include CHIP_PLATFORM_CONFIG_INCLUDE
#endif

// Profile-specific Configuration Headers

/**
* @def CHIP_CONFIG_USE_OPENSSL_ECC
*
* @brief
* Use the OpenSSL implementation of the elliptic curve primitives
* for chip communication.
*
* Note that this option is mutually exclusive with
* #CHIP_CONFIG_USE_MICRO_ECC.
*/
#ifndef CHIP_CONFIG_USE_OPENSSL_ECC
#define CHIP_CONFIG_USE_OPENSSL_ECC 1
#endif // CHIP_CONFIG_USE_OPENSSL_ECC

/**
* @def CHIP_CONFIG_USE_MICRO_ECC
*
* @brief
* Use the Micro ECC implementation of the elliptic curve primitives
* for chip communication.
*
* Note that this option is mutually exclusive with
* #CHIP_CONFIG_USE_OPENSSL_ECC.
*
*/
#ifndef CHIP_CONFIG_USE_MICRO_ECC
#define CHIP_CONFIG_USE_MICRO_ECC 0
#endif // CHIP_CONFIG_USE_MICRO_ECC

#if CHIP_CONFIG_USE_MICRO_ECC && CHIP_CONFIG_USE_OPENSSL_ECC
#error "Please assert one of either CHIP_CONFIG_USE_MICRO_ECC or CHIP_CONFIG_USE_OPENSSL_ECC, but not both."
#endif // CHIP_CONFIG_USE_MICRO_ECC && CHIP_CONFIG_USE_OPENSSL_ECC

/**
* @name chip Elliptic Curve Security Configuration
*
Expand Down Expand Up @@ -328,25 +293,6 @@
#error "Please assert CHIP_CONFIG_SUPPORT_ELLIPTIC_CURVE_SECP256R1 when CHIP_CONFIG_SUPPORT_PASE_CONFIG5 is asserted"
#endif // CHIP_CONFIG_SUPPORT_PASE_CONFIG5 && !CHIP_CONFIG_SUPPORT_ELLIPTIC_CURVE_SECP256R1

/**
* @def CHIP_CONFIG_PASE_MESSAGE_PAYLOAD_ALIGNMENT
*
* @brief
* Align payload on 4-byte boundary for PASE messages.
* Currently, payload alignment is required only when micro-ecc
* library is used and it is compiled with ARM assembly.
* If implementation guarantees that payload is always 4-byte
* aligned this option should stay deasserted to save code size.
*
*/
#ifndef CHIP_CONFIG_PASE_MESSAGE_PAYLOAD_ALIGNMENT
#if CHIP_CONFIG_USE_MICRO_ECC
#define CHIP_CONFIG_PASE_MESSAGE_PAYLOAD_ALIGNMENT 1
#else
#define CHIP_CONFIG_PASE_MESSAGE_PAYLOAD_ALIGNMENT 0
#endif // CHIP_CONFIG_USE_MICRO_ECC
#endif // CHIP_CONFIG_PASE_MESSAGE_PAYLOAD_ALIGNMENT

/**
* @def CHIP_CONFIG_PASE_RATE_LIMITER_TIMEOUT
*
Expand Down
3 changes: 0 additions & 3 deletions src/platform/Ameba/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1

Expand Down
3 changes: 0 additions & 3 deletions src/platform/Darwin/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MBEDTLS 0
Expand Down
3 changes: 0 additions & 3 deletions src/platform/EFR32/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MBEDTLS 0
Expand Down
3 changes: 0 additions & 3 deletions src/platform/ESP32/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1

Expand Down
3 changes: 0 additions & 3 deletions src/platform/Linux/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ using CHIP_CONFIG_PERSISTED_STORAGE_KEY_TYPE = const char *;

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MBEDTLS 0
Expand Down
3 changes: 0 additions & 3 deletions src/platform/P6/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1

Expand Down
3 changes: 0 additions & 3 deletions src/platform/Tizen/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MBEDTLS 0
Expand Down
3 changes: 0 additions & 3 deletions src/platform/android/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ using CHIP_CONFIG_PERSISTED_STORAGE_KEY_TYPE = const char *;

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MBEDTLS 0
Expand Down
4 changes: 0 additions & 4 deletions src/platform/cc13x2_26x2/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@
// ==================== Security Adaptations ====================
#define CHIP_DEVICE_CONFIG_PERSISTED_STORAGE_GLOBAL_EIDC_KEY 2

// This platform uses mbedtls, but these defines don't seem to be used in source
#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 1

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MBEDTLS 1
Expand Down
3 changes: 0 additions & 3 deletions src/platform/mbed/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MBEDTLS 0
Expand Down
3 changes: 0 additions & 3 deletions src/platform/nrfconnect/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MBEDTLS 0
Expand Down
3 changes: 0 additions & 3 deletions src/platform/nxp/k32w/k32w0/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MBEDTLS 0
Expand Down
3 changes: 0 additions & 3 deletions src/platform/qpg/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 1

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MBEDTLS 0
Expand Down
3 changes: 0 additions & 3 deletions src/platform/telink/CHIPPlatformConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@

// ==================== Security Adaptations ====================

#define CHIP_CONFIG_USE_OPENSSL_ECC 0
#define CHIP_CONFIG_USE_MICRO_ECC 0

#define CHIP_CONFIG_HASH_IMPLEMENTATION_OPENSSL 0
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MINCRYPT 1
#define CHIP_CONFIG_HASH_IMPLEMENTATION_MBEDTLS 0
Expand Down