diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/include/air-quality-sensor-manager.h b/examples/air-quality-sensor-app/air-quality-sensor-common/include/air-quality-sensor-manager.h index 98ab0375390b7f..93e7bff871c942 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/include/air-quality-sensor-manager.h +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/include/air-quality-sensor-manager.h @@ -16,8 +16,8 @@ class AirQualitySensorManager { public: // Delete copy constructor and assignment operator. - AirQualitySensorManager(const AirQualitySensorManager &) = delete; - AirQualitySensorManager(const AirQualitySensorManager &&) = delete; + AirQualitySensorManager(const AirQualitySensorManager &) = delete; + AirQualitySensorManager(const AirQualitySensorManager &&) = delete; AirQualitySensorManager & operator=(const AirQualitySensorManager &) = delete; static void InitInstance(EndpointId aEndpointId = 1) diff --git a/examples/all-clusters-app/all-clusters-common/include/dishwasher-mode.h b/examples/all-clusters-app/all-clusters-common/include/dishwasher-mode.h index b05b92dcba21e8..604496f886b3c2 100644 --- a/examples/all-clusters-app/all-clusters-common/include/dishwasher-mode.h +++ b/examples/all-clusters-app/all-clusters-common/include/dishwasher-mode.h @@ -41,10 +41,10 @@ class DishwasherModeDelegate : public ModeBase::Delegate using ModeTagStructType = detail::Structs::ModeTagStruct::Type; ModeTagStructType modeTagsNormal[1] = { { .value = to_underlying(ModeTag::kNormal) } }; ModeTagStructType modeTagsHeavy[2] = { { .value = to_underlying(ModeBase::ModeTag::kMax) }, - { .value = to_underlying(ModeTag::kHeavy) } }; + { .value = to_underlying(ModeTag::kHeavy) } }; ModeTagStructType modeTagsLight[3] = { { .value = to_underlying(ModeTag::kLight) }, - { .value = to_underlying(ModeBase::ModeTag::kNight) }, - { .value = to_underlying(ModeBase::ModeTag::kQuiet) } }; + { .value = to_underlying(ModeBase::ModeTag::kNight) }, + { .value = to_underlying(ModeBase::ModeTag::kQuiet) } }; const detail::Structs::ModeOptionStruct::Type kModeOptions[3] = { detail::Structs::ModeOptionStruct::Type{ .label = CharSpan::fromCharString("Normal"), diff --git a/examples/all-clusters-app/all-clusters-common/include/laundry-washer-mode.h b/examples/all-clusters-app/all-clusters-common/include/laundry-washer-mode.h index 4c935a9d43ab61..2f59b0dfd04bab 100644 --- a/examples/all-clusters-app/all-clusters-common/include/laundry-washer-mode.h +++ b/examples/all-clusters-app/all-clusters-common/include/laundry-washer-mode.h @@ -45,7 +45,7 @@ class LaundryWasherModeDelegate : public ModeBase::Delegate { .value = to_underlying(ModeBase::ModeTag::kNight) }, { .value = to_underlying(ModeBase::ModeTag::kQuiet) } }; ModeTagStructType modeTagsHeavy[2] = { { .value = to_underlying(ModeBase::ModeTag::kMax) }, - { .value = to_underlying(ModeTag::kHeavy) } }; + { .value = to_underlying(ModeTag::kHeavy) } }; ModeTagStructType modeTagsWhites[1] = { { .value = to_underlying(ModeTag::kWhites) } }; const detail::Structs::ModeOptionStruct::Type kModeOptions[4] = { diff --git a/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h b/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h index 4a4efd1d4d39dd..4ceddc65e7085e 100644 --- a/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h +++ b/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h @@ -85,8 +85,8 @@ class CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/all-clusters-app/nxp/mw320/include/FreeRTOSConfig.h b/examples/all-clusters-app/nxp/mw320/include/FreeRTOSConfig.h index 20125add0a7236..bfeead9ee4bfc4 100644 --- a/examples/all-clusters-app/nxp/mw320/include/FreeRTOSConfig.h +++ b/examples/all-clusters-app/nxp/mw320/include/FreeRTOSConfig.h @@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /* Memory allocation related definitions. */ #define configSUPPORT_STATIC_ALLOCATION 0 #define configSUPPORT_DYNAMIC_ALLOCATION 1 -#define configTOTAL_HEAP_SIZE ((size_t)(60 * 1024)) +#define configTOTAL_HEAP_SIZE ((size_t) (60 * 1024)) #define configAPPLICATION_ALLOCATED_HEAP 0 /* Hook function related definitions. */ diff --git a/examples/all-clusters-app/openiotsdk/freertos-config/FreeRTOSConfig.h b/examples/all-clusters-app/openiotsdk/freertos-config/FreeRTOSConfig.h index 9efedc9f133712..b05f59c2578e68 100644 --- a/examples/all-clusters-app/openiotsdk/freertos-config/FreeRTOSConfig.h +++ b/examples/all-clusters-app/openiotsdk/freertos-config/FreeRTOSConfig.h @@ -40,12 +40,12 @@ extern uint32_t SystemCoreClock; // Minimal stack size [words] <0-65535> // Stack for idle task and default task stack in words. // Default: 4kB -#define configMINIMAL_STACK_SIZE ((uint16_t)(4 * 1024)) +#define configMINIMAL_STACK_SIZE ((uint16_t) (4 * 1024)) // Total heap size [bytes] <0-0xFFFFFFFF> // Heap memory size in bytes. // Default: 32kB -#define configTOTAL_HEAP_SIZE ((size_t)(32 * 1024)) +#define configTOTAL_HEAP_SIZE ((size_t) (32 * 1024)) // Kernel tick frequency [Hz] <0-0xFFFFFFFF> // Kernel tick rate in Hz. diff --git a/examples/all-clusters-minimal-app/ameba/main/include/CHIPDeviceManager.h b/examples/all-clusters-minimal-app/ameba/main/include/CHIPDeviceManager.h index 4a4efd1d4d39dd..4ceddc65e7085e 100644 --- a/examples/all-clusters-minimal-app/ameba/main/include/CHIPDeviceManager.h +++ b/examples/all-clusters-minimal-app/ameba/main/include/CHIPDeviceManager.h @@ -85,8 +85,8 @@ class CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/chef/ameba/main/include/CHIPDeviceManager.h b/examples/chef/ameba/main/include/CHIPDeviceManager.h index 4a4efd1d4d39dd..4ceddc65e7085e 100644 --- a/examples/chef/ameba/main/include/CHIPDeviceManager.h +++ b/examples/chef/ameba/main/include/CHIPDeviceManager.h @@ -85,8 +85,8 @@ class CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/chip-tool/commands/common/Command.cpp b/examples/chip-tool/commands/common/Command.cpp index 4848fe3e1e7183..5e25abfe692af5 100644 --- a/examples/chip-tool/commands/common/Command.cpp +++ b/examples/chip-tool/commands/common/Command.cpp @@ -61,7 +61,7 @@ bool Command::InitArguments(int argc, char ** argv) } } - VerifyOrExit((size_t)(argc) >= mandatoryArgsCount && (argvExtraArgsCount == 0 || (argvExtraArgsCount && optionalArgsCount)), + VerifyOrExit((size_t) (argc) >= mandatoryArgsCount && (argvExtraArgsCount == 0 || (argvExtraArgsCount && optionalArgsCount)), ChipLogError(chipTool, "InitArgs: Wrong arguments number: %d instead of %u", argc, static_cast(mandatoryArgsCount))); diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp index ed0b06f7c4363a..2b2506c99134aa 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.cpp +++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp @@ -259,7 +259,7 @@ CHIP_ERROR PairingCommand::PairWithMdnsOrBleByIndexWithCode(NodeId remoteId, uin { auto commissioningParams = GetCommissioningParameters(); err = CurrentCommissioner().PairDevice(remoteId, mOnboardingPayload, commissioningParams, - DiscoveryType::kDiscoveryNetworkOnly, MakeOptional(resolutionData)); + DiscoveryType::kDiscoveryNetworkOnly, MakeOptional(resolutionData)); } return err; #else diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h index 40de54e083d2a0..38b56b23e5d9bb 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.h +++ b/examples/chip-tool/commands/pairing/PairingCommand.h @@ -57,8 +57,8 @@ class PairingCommand : public CHIPCommand, CredentialIssuerCommands * credIssuerCmds, chip::Dnssd::DiscoveryFilterType filterType = chip::Dnssd::DiscoveryFilterType::kNone) : CHIPCommand(commandName, credIssuerCmds), - mPairingMode(mode), mNetworkType(networkType), - mFilterType(filterType), mRemoteAddr{ IPAddress::Any, chip::Inet::InterfaceId::Null() }, mComplex_TimeZones(&mTimeZoneList), + mPairingMode(mode), mNetworkType(networkType), mFilterType(filterType), + mRemoteAddr{ IPAddress::Any, chip::Inet::InterfaceId::Null() }, mComplex_TimeZones(&mTimeZoneList), mComplex_DSTOffsets(&mDSTOffsetList), mCurrentFabricRemoveCallback(OnCurrentFabricRemove, this) { AddArgument("node-id", 0, UINT64_MAX, &mNodeId); diff --git a/examples/chip-tool/include/CHIPProjectAppConfig.h b/examples/chip-tool/include/CHIPProjectAppConfig.h index eef6466aa1a510..8c964bf5024bcb 100644 --- a/examples/chip-tool/include/CHIPProjectAppConfig.h +++ b/examples/chip-tool/include/CHIPProjectAppConfig.h @@ -28,7 +28,7 @@ #define CHIP_CONFIG_EVENT_LOGGING_NUM_EXTERNAL_CALLBACKS 2 // Uncomment this for a large Tunnel MTU. -//#define CHIP_CONFIG_TUNNEL_INTERFACE_MTU (9000) +// #define CHIP_CONFIG_TUNNEL_INTERFACE_MTU (9000) // Enable support functions for parsing command-line arguments #define CHIP_CONFIG_ENABLE_ARG_PARSER 1 diff --git a/examples/common/imgui_ui/ui.cpp b/examples/common/imgui_ui/ui.cpp index c0c04ffb4a9efb..a1a631ee05f5ef 100644 --- a/examples/common/imgui_ui/ui.cpp +++ b/examples/common/imgui_ui/ui.cpp @@ -61,7 +61,7 @@ void UiInit(SDL_GLContext * gl_context, SDL_Window ** window) SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); - SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); + SDL_WindowFlags window_flags = (SDL_WindowFlags) (SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); *window = SDL_CreateWindow("Light UI", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1280, 720, window_flags); *gl_context = SDL_GL_CreateContext(*window); SDL_GL_MakeCurrent(*window, *gl_context); diff --git a/examples/common/imgui_ui/windows/light.cpp b/examples/common/imgui_ui/windows/light.cpp index fbfcdda48284a1..3e7a44b6fea550 100644 --- a/examples/common/imgui_ui/windows/light.cpp +++ b/examples/common/imgui_ui/windows/light.cpp @@ -155,11 +155,10 @@ void Light::Render() ImGui::Text("Color Control:"); ImGui::Indent(); const char * mode = // based on ColorMode attribute: spec 3.2.7.9 - (mColorMode == EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION) - ? "Hue/Saturation" - : (mColorMode == EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y) - ? "X/Y" - : (mColorMode == EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE) ? "Temperature/Mireds" : "UNKNOWN"; + (mColorMode == EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION) ? "Hue/Saturation" + : (mColorMode == EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y) ? "X/Y" + : (mColorMode == EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE) ? "Temperature/Mireds" + : "UNKNOWN"; ImGui::Text("Mode: %s", mode); diff --git a/examples/common/screen-framework/Display.cpp b/examples/common/screen-framework/Display.cpp index 71e41f10aaa36e..e122c4c9cbead1 100644 --- a/examples/common/screen-framework/Display.cpp +++ b/examples/common/screen-framework/Display.cpp @@ -118,8 +118,8 @@ esp_err_t InitDisplay() TFT_setRotation(LANDSCAPE); TFT_resetclipwin(); - DisplayWidth = (uint16_t)(1 + tft_dispWin.x2 - tft_dispWin.x1); - DisplayHeight = (uint16_t)(1 + tft_dispWin.y2 - tft_dispWin.y1); + DisplayWidth = (uint16_t) (1 + tft_dispWin.x2 - tft_dispWin.x1); + DisplayHeight = (uint16_t) (1 + tft_dispWin.y2 - tft_dispWin.y1); ESP_LOGI(TAG, "Display initialized (height %u, width %u)", DisplayHeight, DisplayWidth); diff --git a/examples/contact-sensor-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h b/examples/contact-sensor-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h index ea5259b3af043c..5694c591e51362 100644 --- a/examples/contact-sensor-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h +++ b/examples/contact-sensor-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h @@ -84,7 +84,7 @@ /* Memory allocation related definitions. */ #define configSUPPORT_STATIC_ALLOCATION 0 #define configSUPPORT_DYNAMIC_ALLOCATION 1 -#define configTOTAL_HEAP_SIZE ((size_t)(gTotalHeapSize_c)) +#define configTOTAL_HEAP_SIZE ((size_t) (gTotalHeapSize_c)) #define configAPPLICATION_ALLOCATED_HEAP 1 /* Hook function related definitions. */ diff --git a/examples/darwin-framework-tool/commands/common/MTRLogging.h b/examples/darwin-framework-tool/commands/common/MTRLogging.h index 4835e4f159d447..3e120c552a68b5 100644 --- a/examples/darwin-framework-tool/commands/common/MTRLogging.h +++ b/examples/darwin-framework-tool/commands/common/MTRLogging.h @@ -24,7 +24,7 @@ #if DEBUG #define MTR_LOG_DEBUG(format, ...) os_log(OS_LOG_DEFAULT, format, ##__VA_ARGS__) #define MTR_LOG_ERROR(format, ...) os_log(OS_LOG_DEFAULT, format, ##__VA_ARGS__) -#define MTR_LOG_METHOD_ENTRY() \ +#define MTR_LOG_METHOD_ENTRY() \ ({ os_log(OS_LOG_DEFAULT, "[<%@: %p> %@]", NSStringFromClass([self class]), self, NSStringFromSelector(_cmd)); }) #else diff --git a/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h b/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h index abcc56dffbaf9d..aa01ea7f4cb4fb 100644 --- a/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h +++ b/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h @@ -111,7 +111,7 @@ class TestCommandBridge : public CHIPCommandBridge, CHIP_ERROR WaitForMs( const char * _Nullable identity, const chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type & value) { - dispatch_time_t delayTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(value.ms * NSEC_PER_MSEC)); + dispatch_time_t delayTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t) (value.ms * NSEC_PER_MSEC)); dispatch_after(delayTime, mCallbackQueue, ^(void) { NextTest(); }); @@ -310,7 +310,8 @@ class TestCommandBridge : public CHIPCommandBridge, return ConstraintsChecker::CheckConstraintIsHexString(itemName, value, expectHexString); } - template bool CheckConstraintContains(const char * _Nonnull itemName, const NSArray * _Nonnull current, T expected) + template + bool CheckConstraintContains(const char * _Nonnull itemName, const NSArray * _Nonnull current, T expected) { for (id currentElement in current) { if ([currentElement isEqualToNumber:@(expected)]) { @@ -322,7 +323,8 @@ class TestCommandBridge : public CHIPCommandBridge, return false; } - template bool CheckConstraintExcludes(const char * _Nonnull itemName, const NSArray * _Nonnull current, T expected) + template + bool CheckConstraintExcludes(const char * _Nonnull itemName, const NSArray * _Nonnull current, T expected) { for (id currentElement in current) { if ([currentElement isEqualToNumber:@(expected)]) { @@ -388,7 +390,8 @@ class TestCommandBridge : public CHIPCommandBridge, return CheckConstraintNotValue(itemName, current, @(expected)); } - template bool CheckConstraintNotValue(const char * _Nonnull itemName, NSError * _Nullable current, T expected) + template + bool CheckConstraintNotValue(const char * _Nonnull itemName, NSError * _Nullable current, T expected) { NSNumber * currentValue = @(MTRErrorToCHIPErrorCode(current).AsInteger()); return CheckConstraintNotValue(itemName, currentValue, @(expected)); @@ -540,25 +543,29 @@ class TestCommandBridge : public CHIPCommandBridge, return CheckValue(itemName, currentValue, expected); } - template bool CheckValue(const char * _Nonnull itemName, NSNumber * _Nonnull current, T expected) + template + bool CheckValue(const char * _Nonnull itemName, NSNumber * _Nonnull current, T expected) { return CheckValue(itemName, current, @(expected)); } - template bool CheckValue(const char * _Nonnull itemName, id _Nonnull current, T expected) + template + bool CheckValue(const char * _Nonnull itemName, id _Nonnull current, T expected) { NSNumber * currentValue = current; return CheckValue(itemName, currentValue, @(expected)); } - template bool CheckValue(const char * _Nonnull itemName, NSError * _Nullable current, T expected) + template + bool CheckValue(const char * _Nonnull itemName, NSError * _Nullable current, T expected) { NSNumber * currentValue = @(current.code); return CheckValue(itemName, currentValue, @(expected)); } - template bool CheckValue(const char * _Nonnull itemName, T current, U expected) + template + bool CheckValue(const char * _Nonnull itemName, T current, U expected) { return ValueChecker::CheckValue(itemName, current, expected); diff --git a/examples/light-switch-app/ameba/main/include/CHIPDeviceManager.h b/examples/light-switch-app/ameba/main/include/CHIPDeviceManager.h index 4a4efd1d4d39dd..4ceddc65e7085e 100644 --- a/examples/light-switch-app/ameba/main/include/CHIPDeviceManager.h +++ b/examples/light-switch-app/ameba/main/include/CHIPDeviceManager.h @@ -85,8 +85,8 @@ class CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/light-switch-app/infineon/cyw30739/src/LightSwitch.cpp b/examples/light-switch-app/infineon/cyw30739/src/LightSwitch.cpp index e3e178456e94f5..10c68ffc098030 100644 --- a/examples/light-switch-app/infineon/cyw30739/src/LightSwitch.cpp +++ b/examples/light-switch-app/infineon/cyw30739/src/LightSwitch.cpp @@ -82,7 +82,7 @@ void LightSwitch::DimmerChangeBrightness(uint16_t kValue) // add to brightness vluse to change brightness after call dimmer change. sBrightness = kValue; data->Value = - (uint8_t)(sBrightness > CHIP_DEVICE_CONFIG_BRIGHTNESS_MAXIMUM ? CHIP_DEVICE_CONFIG_BRIGHTNESS_MAXIMUM : sBrightness); + (uint8_t) (sBrightness > CHIP_DEVICE_CONFIG_BRIGHTNESS_MAXIMUM ? CHIP_DEVICE_CONFIG_BRIGHTNESS_MAXIMUM : sBrightness); data->IsGroup = BindingHandler::GetInstance().IsGroupBound(); DeviceLayer::PlatformMgr().ScheduleWork(BindingHandler::SwitchWorkerHandler, reinterpret_cast(data)); } diff --git a/examples/lighting-app/ameba/main/include/CHIPDeviceManager.h b/examples/lighting-app/ameba/main/include/CHIPDeviceManager.h index 91e4ce2a2d9f46..b2859af532c5eb 100644 --- a/examples/lighting-app/ameba/main/include/CHIPDeviceManager.h +++ b/examples/lighting-app/ameba/main/include/CHIPDeviceManager.h @@ -84,8 +84,8 @@ class CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/lighting-app/genio/src/ColorFormat.cpp b/examples/lighting-app/genio/src/ColorFormat.cpp index b68b6ca926e009..0c92c9bc0a02e6 100644 --- a/examples/lighting-app/genio/src/ColorFormat.cpp +++ b/examples/lighting-app/genio/src/ColorFormat.cpp @@ -126,9 +126,9 @@ RgbColor_t XYToRgb(uint8_t Level, uint16_t currentX, uint16_t currentY) b = clamp(b, 0, 1); // these rgb values are in the range of 0 to 1, convert to limit of HW specific LED - rgb.r = (uint8_t)(r * 255); - rgb.g = (uint8_t)(g * 255); - rgb.b = (uint8_t)(b * 255); + rgb.r = (uint8_t) (r * 255); + rgb.g = (uint8_t) (g * 255); + rgb.b = (uint8_t) (b * 255); return rgb; } diff --git a/examples/lighting-app/genio/src/DimmableLEDWidget.cpp b/examples/lighting-app/genio/src/DimmableLEDWidget.cpp index b176bbb0fd7a72..2422b7f6065e48 100644 --- a/examples/lighting-app/genio/src/DimmableLEDWidget.cpp +++ b/examples/lighting-app/genio/src/DimmableLEDWidget.cpp @@ -34,11 +34,11 @@ static hal_pwm_channel_t convert_gpio_to_pwm_channel(hal_gpio_pin_t gpio) hal_pwm_channel_t ret = HAL_PWM_MAX; if (gpio >= HAL_GPIO_29 && gpio <= HAL_GPIO_40) { - ret = (hal_pwm_channel_t)(gpio - HAL_GPIO_29); + ret = (hal_pwm_channel_t) (gpio - HAL_GPIO_29); } else if (gpio >= HAL_GPIO_45 && gpio <= HAL_GPIO_52) { - ret = (hal_pwm_channel_t)(gpio - HAL_GPIO_45); + ret = (hal_pwm_channel_t) (gpio - HAL_GPIO_45); } else { diff --git a/examples/lighting-app/genio/src/ZclCallbacks.cpp b/examples/lighting-app/genio/src/ZclCallbacks.cpp index 8ab8d412204a68..9d0a4d97c09e9b 100644 --- a/examples/lighting-app/genio/src/ZclCallbacks.cpp +++ b/examples/lighting-app/genio/src/ZclCallbacks.cpp @@ -99,8 +99,8 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & */ if (attributeId == ColorControl::Attributes::EnhancedCurrentHue::Id) { - hsv.h = (uint8_t)(((*reinterpret_cast(value)) & 0xFF00) >> 8); - hsv.s = (uint8_t)((*reinterpret_cast(value)) & 0xFF); + hsv.h = (uint8_t) (((*reinterpret_cast(value)) & 0xFF00) >> 8); + hsv.s = (uint8_t) ((*reinterpret_cast(value)) & 0xFF); } else if (attributeId == ColorControl::Attributes::CurrentHue::Id) { diff --git a/examples/lighting-app/lighting-common/src/ColorFormat.cpp b/examples/lighting-app/lighting-common/src/ColorFormat.cpp index d30aacd841cc10..bfe1891d6a53de 100644 --- a/examples/lighting-app/lighting-common/src/ColorFormat.cpp +++ b/examples/lighting-app/lighting-common/src/ColorFormat.cpp @@ -122,9 +122,9 @@ RgbColor_t XYToRgb(uint8_t Level, uint16_t currentX, uint16_t currentY) b = clamp(b, 0, 1); // these rgb values are in the range of 0 to 1, convert to limit of HW specific LED - rgb.r = (uint8_t)(r * 255); - rgb.g = (uint8_t)(g * 255); - rgb.b = (uint8_t)(b * 255); + rgb.r = (uint8_t) (r * 255); + rgb.g = (uint8_t) (g * 255); + rgb.b = (uint8_t) (b * 255); return rgb; } diff --git a/examples/lighting-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h b/examples/lighting-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h index 7990935565ce51..d0b7efef0e7090 100644 --- a/examples/lighting-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h +++ b/examples/lighting-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h @@ -73,7 +73,7 @@ /* Memory allocation related definitions. */ #define configSUPPORT_STATIC_ALLOCATION 0 #define configSUPPORT_DYNAMIC_ALLOCATION 1 -#define configTOTAL_HEAP_SIZE ((size_t)(gTotalHeapSize_c)) +#define configTOTAL_HEAP_SIZE ((size_t) (gTotalHeapSize_c)) #define configAPPLICATION_ALLOCATED_HEAP 1 /* Hook function related definitions. */ diff --git a/examples/lighting-app/qpg/src/ZclCallbacks.cpp b/examples/lighting-app/qpg/src/ZclCallbacks.cpp index 6b42b38c7f1b1c..fce10c0d60f1d1 100644 --- a/examples/lighting-app/qpg/src/ZclCallbacks.cpp +++ b/examples/lighting-app/qpg/src/ZclCallbacks.cpp @@ -106,7 +106,7 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & if (attributeId == ColorControl::Attributes::EnhancedCurrentHue::Id) { // We only support 8-bit hue. Assuming hue is linear, normalize 16-bit to 8-bit. - hsv.h = (uint8_t)((*reinterpret_cast(value)) >> 8); + hsv.h = (uint8_t) ((*reinterpret_cast(value)) >> 8); // get saturation from cluster value storage EmberAfStatus status = ColorControl::Attributes::CurrentSaturation::Get(endpoint, &hsv.s); assert(status == EMBER_ZCL_STATUS_SUCCESS); diff --git a/examples/lighting-app/stm32/include/STM32WB5/FreeRTOSConfig.h b/examples/lighting-app/stm32/include/STM32WB5/FreeRTOSConfig.h index 5423994ea0bc12..aeb0ac1b8913da 100644 --- a/examples/lighting-app/stm32/include/STM32WB5/FreeRTOSConfig.h +++ b/examples/lighting-app/stm32/include/STM32WB5/FreeRTOSConfig.h @@ -171,7 +171,7 @@ standard names. */ /* USER CODE BEGIN Defines */ /* Section where parameter definitions can be added (for instance, to override default ones in FreeRTOS.h) */ -//#define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 1 /* required only for Keil but does not hurt otherwise */ +// #define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 1 /* required only for Keil but does not hurt otherwise */ #define configGENERATE_RUN_TIME_STATS 1 #if (configGENERATE_RUN_TIME_STATS == 1) diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp index 21f0257b12a6e2..94f0f9dd571ed1 100644 --- a/examples/lighting-app/telink/src/AppTask.cpp +++ b/examples/lighting-app/telink/src/AppTask.cpp @@ -175,7 +175,7 @@ void AppTask::UpdateClusterState(void) bool isTurnedOn = sAppTask.mPwmRgbRedLed.IsTurnedOn() || sAppTask.mPwmRgbGreenLed.IsTurnedOn() || sAppTask.mPwmRgbBlueLed.IsTurnedOn(); #else - bool isTurnedOn = sAppTask.mPwmRgbBlueLed.IsTurnedOn(); + bool isTurnedOn = sAppTask.mPwmRgbBlueLed.IsTurnedOn(); #endif // write the new on/off value EmberAfStatus status = Clusters::OnOff::Attributes::OnOff::Set(kExampleEndpointId, isTurnedOn); diff --git a/examples/lighting-app/telink/src/ZclCallbacks.cpp b/examples/lighting-app/telink/src/ZclCallbacks.cpp index f25ae759db8150..86e57809b67e11 100644 --- a/examples/lighting-app/telink/src/ZclCallbacks.cpp +++ b/examples/lighting-app/telink/src/ZclCallbacks.cpp @@ -91,8 +91,8 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & { if (attributeId == ColorControl::Attributes::EnhancedCurrentHue::Id) { - hsv.h = (uint8_t)(((*reinterpret_cast(value)) & 0xFF00) >> 8); - hsv.s = (uint8_t)((*reinterpret_cast(value)) & 0xFF); + hsv.h = (uint8_t) (((*reinterpret_cast(value)) & 0xFF00) >> 8); + hsv.s = (uint8_t) ((*reinterpret_cast(value)) & 0xFF); } else if (attributeId == ColorControl::Attributes::CurrentHue::Id) { diff --git a/examples/lock-app/cc32xx/main/include/CHIPDeviceManager.h b/examples/lock-app/cc32xx/main/include/CHIPDeviceManager.h index b3b7db5cd0eba0..abc76e1f2e384d 100644 --- a/examples/lock-app/cc32xx/main/include/CHIPDeviceManager.h +++ b/examples/lock-app/cc32xx/main/include/CHIPDeviceManager.h @@ -67,8 +67,8 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/lock-app/esp32/main/Button.cpp b/examples/lock-app/esp32/main/Button.cpp index 301e62f92d7e08..b80e124523f893 100644 --- a/examples/lock-app/esp32/main/Button.cpp +++ b/examples/lock-app/esp32/main/Button.cpp @@ -18,7 +18,7 @@ #include "Button.h" #include "AppTask.h" -//#include +// #include esp_err_t Button::Init(gpio_num_t gpioNum, uint16_t debouncePeriod) { diff --git a/examples/lock-app/genio/src/AppTask.cpp b/examples/lock-app/genio/src/AppTask.cpp index b06d9535c35c3b..2b331d3cfafd33 100644 --- a/examples/lock-app/genio/src/AppTask.cpp +++ b/examples/lock-app/genio/src/AppTask.cpp @@ -50,7 +50,7 @@ #define APP_TASK_STACK_SIZE (4096) #define APP_TASK_PRIORITY 2 #define APP_EVENT_QUEUE_SIZE 10 -//#define EXAMPLE_VENDOR_ID 0xcafe +// #define EXAMPLE_VENDOR_ID 0xcafe #ifdef portYIELD_FROM_ISR #define OS_YIELD_FROM_ISR(yield) portYIELD_FROM_ISR(yield) diff --git a/examples/lock-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h b/examples/lock-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h index 24779514ef875f..c0e0a81a8fbf42 100644 --- a/examples/lock-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h +++ b/examples/lock-app/nxp/k32w/k32w0/include/FreeRTOSConfig.h @@ -84,7 +84,7 @@ /* Memory allocation related definitions. */ #define configSUPPORT_STATIC_ALLOCATION 0 #define configSUPPORT_DYNAMIC_ALLOCATION 1 -#define configTOTAL_HEAP_SIZE ((size_t)(gTotalHeapSize_c)) +#define configTOTAL_HEAP_SIZE ((size_t) (gTotalHeapSize_c)) #define configAPPLICATION_ALLOCATED_HEAP 1 #define configUSE_IDLE_HOOK 1 diff --git a/examples/lock-app/openiotsdk/freertos-config/FreeRTOSConfig.h b/examples/lock-app/openiotsdk/freertos-config/FreeRTOSConfig.h index 9efedc9f133712..b05f59c2578e68 100644 --- a/examples/lock-app/openiotsdk/freertos-config/FreeRTOSConfig.h +++ b/examples/lock-app/openiotsdk/freertos-config/FreeRTOSConfig.h @@ -40,12 +40,12 @@ extern uint32_t SystemCoreClock; // Minimal stack size [words] <0-65535> // Stack for idle task and default task stack in words. // Default: 4kB -#define configMINIMAL_STACK_SIZE ((uint16_t)(4 * 1024)) +#define configMINIMAL_STACK_SIZE ((uint16_t) (4 * 1024)) // Total heap size [bytes] <0-0xFFFFFFFF> // Heap memory size in bytes. // Default: 32kB -#define configTOTAL_HEAP_SIZE ((size_t)(32 * 1024)) +#define configTOTAL_HEAP_SIZE ((size_t) (32 * 1024)) // Kernel tick frequency [Hz] <0-0xFFFFFFFF> // Kernel tick rate in Hz. diff --git a/examples/minimal-mdns/server.cpp b/examples/minimal-mdns/server.cpp index 7f26571e5ea6b3..c445b397034c25 100644 --- a/examples/minimal-mdns/server.cpp +++ b/examples/minimal-mdns/server.cpp @@ -224,11 +224,11 @@ int main(int argc, char ** args) mdns::Minimal::QueryResponder<16 /* maxRecords */> queryResponder; mdns::Minimal::QNamePart tcpServiceName[] = { Dnssd::kOperationalServiceName, Dnssd::kOperationalProtocol, - Dnssd::kLocalDomain }; + Dnssd::kLocalDomain }; mdns::Minimal::QNamePart tcpServerServiceName[] = { gOptions.instanceName, Dnssd::kOperationalServiceName, Dnssd::kOperationalProtocol, Dnssd::kLocalDomain }; mdns::Minimal::QNamePart udpServiceName[] = { Dnssd::kCommissionableServiceName, Dnssd::kCommissionProtocol, - Dnssd::kLocalDomain }; + Dnssd::kLocalDomain }; mdns::Minimal::QNamePart udpServerServiceName[] = { gOptions.instanceName, Dnssd::kCommissionableServiceName, Dnssd::kCommissionProtocol, Dnssd::kLocalDomain }; diff --git a/examples/ota-requestor-app/ameba/main/include/CHIPDeviceManager.h b/examples/ota-requestor-app/ameba/main/include/CHIPDeviceManager.h index 4a4efd1d4d39dd..4ceddc65e7085e 100644 --- a/examples/ota-requestor-app/ameba/main/include/CHIPDeviceManager.h +++ b/examples/ota-requestor-app/ameba/main/include/CHIPDeviceManager.h @@ -85,8 +85,8 @@ class CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/ota-requestor-app/openiotsdk/freertos-config/FreeRTOSConfig.h b/examples/ota-requestor-app/openiotsdk/freertos-config/FreeRTOSConfig.h index 9efedc9f133712..b05f59c2578e68 100644 --- a/examples/ota-requestor-app/openiotsdk/freertos-config/FreeRTOSConfig.h +++ b/examples/ota-requestor-app/openiotsdk/freertos-config/FreeRTOSConfig.h @@ -40,12 +40,12 @@ extern uint32_t SystemCoreClock; // Minimal stack size [words] <0-65535> // Stack for idle task and default task stack in words. // Default: 4kB -#define configMINIMAL_STACK_SIZE ((uint16_t)(4 * 1024)) +#define configMINIMAL_STACK_SIZE ((uint16_t) (4 * 1024)) // Total heap size [bytes] <0-0xFFFFFFFF> // Heap memory size in bytes. // Default: 32kB -#define configTOTAL_HEAP_SIZE ((size_t)(32 * 1024)) +#define configTOTAL_HEAP_SIZE ((size_t) (32 * 1024)) // Kernel tick frequency [Hz] <0-0xFFFFFFFF> // Kernel tick rate in Hz. diff --git a/examples/platform/ameba/Rpc.cpp b/examples/platform/ameba/Rpc.cpp index 6abdfb5755152f..55312d3a769620 100644 --- a/examples/platform/ameba/Rpc.cpp +++ b/examples/platform/ameba/Rpc.cpp @@ -23,11 +23,11 @@ #include "pw_sys_io_ameba/init.h" #include "sys_api.h" #include "task.h" -//#include "esp_log.h" -//#include "freertos/FreeRTOS.h" -//#include "freertos/event_groups.h" -//#include "freertos/semphr.h" -//#include "freertos/task.h" +// #include "esp_log.h" +// #include "freertos/FreeRTOS.h" +// #include "freertos/event_groups.h" +// #include "freertos/semphr.h" +// #include "freertos/task.h" #include "pw_log/log.h" #include "pw_rpc/server.h" #include "pw_sys_io/sys_io.h" @@ -38,7 +38,7 @@ #endif // defined(PW_RPC_ATTRIBUTE_SERVICE) && PW_RPC_ATTRIBUTE_SERVICE #if defined(PW_RPC_BUTTON_SERVICE) && PW_RPC_BUTTON_SERVICE -//#include "ScreenManager.h" +// #include "ScreenManager.h" #include "pigweed/rpc_services/Button.h" #endif // defined(PW_RPC_BUTTON_SERVICE) && PW_RPC_BUTTON_SERVICE diff --git a/examples/platform/asr/CHIPDeviceManager.h b/examples/platform/asr/CHIPDeviceManager.h index 0f4af78bc756b2..6948f16f0cd03b 100644 --- a/examples/platform/asr/CHIPDeviceManager.h +++ b/examples/platform/asr/CHIPDeviceManager.h @@ -85,8 +85,8 @@ class CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/platform/beken/common/CHIPDeviceManager.h b/examples/platform/beken/common/CHIPDeviceManager.h index 831bf8eb7c002b..3d9caa4ad953bf 100644 --- a/examples/platform/beken/common/CHIPDeviceManager.h +++ b/examples/platform/beken/common/CHIPDeviceManager.h @@ -84,8 +84,8 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/platform/beken/ota/OTAHelper.cpp b/examples/platform/beken/ota/OTAHelper.cpp index 26f2f7f38c628d..8e80b116506e86 100644 --- a/examples/platform/beken/ota/OTAHelper.cpp +++ b/examples/platform/beken/ota/OTAHelper.cpp @@ -92,11 +92,11 @@ extern "C" void BkQueryImageCmdHandler(char * pcWriteBuffer, int xWriteBufferLen { cmd0 = argv[1][0] - 0x30; cmd1 = argv[1][1] - 0x30; - nodeId = (uint32_t)(cmd0 * 10 + cmd1); + nodeId = (uint32_t) (cmd0 * 10 + cmd1); cmd0 = argv[2][0] - 0x30; cmd1 = argv[2][1] - 0x30; - fabricId = (uint32_t)(cmd0 * 10 + cmd1); + fabricId = (uint32_t) (cmd0 * 10 + cmd1); ChipLogProgress(DeviceLayer, "nodeId %lu,fabricId %lu\r\n", nodeId, fabricId); } else @@ -132,7 +132,7 @@ extern "C" void BkNotifyUpdateApplied(char * pcWriteBuffer, int xWriteBufferLen, { cmd0 = argv[1][0] - 0x30; cmd1 = argv[1][1] - 0x30; - version = (uint32_t)(cmd0 * 10 + cmd1); + version = (uint32_t) (cmd0 * 10 + cmd1); ChipLogProgress(DeviceLayer, "version %lu \r\n", version); } diff --git a/examples/platform/bouffalolab/bl602/lwipopts/lwipopts.h b/examples/platform/bouffalolab/bl602/lwipopts/lwipopts.h index 42310d7c55b169..dd304f96d66a15 100644 --- a/examples/platform/bouffalolab/bl602/lwipopts/lwipopts.h +++ b/examples/platform/bouffalolab/bl602/lwipopts/lwipopts.h @@ -220,7 +220,7 @@ a lot of data that needs to be copied, this should be set high. */ ----------------------------------- */ -//#define LWIP_DEBUG 0 +// #define LWIP_DEBUG 0 /* --------------------------------- diff --git a/examples/platform/bouffalolab/bl702/FreeRTOSConfig.h b/examples/platform/bouffalolab/bl702/FreeRTOSConfig.h index aad73b32e656d8..a3a3a78a8b0d2c 100644 --- a/examples/platform/bouffalolab/bl702/FreeRTOSConfig.h +++ b/examples/platform/bouffalolab/bl702/FreeRTOSConfig.h @@ -167,7 +167,7 @@ extern void vAssertCalled(void); #define configASSERT(x) \ if ((x) == 0) \ vAssertCalled() -//#define configASSERT( x ) if( ( x ) == 0 ) portABORT() +// #define configASSERT( x ) if( ( x ) == 0 ) portABORT() /* Overwrite some of the stack sizes allocated to various test and demo tasks. Like all task stack sizes, the value is the number of words, not bytes. */ diff --git a/examples/platform/bouffalolab/bl702/lwipopts/lwipopts.h b/examples/platform/bouffalolab/bl702/lwipopts/lwipopts.h index 4f4d8bb35dad57..0ed28096088524 100644 --- a/examples/platform/bouffalolab/bl702/lwipopts/lwipopts.h +++ b/examples/platform/bouffalolab/bl702/lwipopts/lwipopts.h @@ -232,7 +232,7 @@ a lot of data that needs to be copied, this should be set high. */ ----------------------------------- */ -//#define LWIP_DEBUG 0 +// #define LWIP_DEBUG 0 /* --------------------------------- diff --git a/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h b/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h index 218b8aefe9f3d3..dea83922096149 100644 --- a/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h +++ b/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h @@ -50,7 +50,7 @@ #define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1 -//#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0 +// #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0 #define UART_AS_SERIAL_TRANSPORT 1 #define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1 @@ -71,8 +71,8 @@ #define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_3 -//#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 1 -//#define OPENTHREAD_CONFIG_COAP_API_ENABLE 1 +// #define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 1 +// #define OPENTHREAD_CONFIG_COAP_API_ENABLE 1 #define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 0 #define OPENTHREAD_CONFIG_COAP_API_ENABLE 0 #define OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE 0 diff --git a/examples/platform/cc13x4_26x4/project_include/OpenThreadConfig.h b/examples/platform/cc13x4_26x4/project_include/OpenThreadConfig.h index ca8f9a8a3347fe..65a1dbd30aa457 100644 --- a/examples/platform/cc13x4_26x4/project_include/OpenThreadConfig.h +++ b/examples/platform/cc13x4_26x4/project_include/OpenThreadConfig.h @@ -50,7 +50,7 @@ #define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1 -//#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0 +// #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0 #define UART_AS_SERIAL_TRANSPORT 1 #define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1 @@ -71,8 +71,8 @@ #define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_3 -//#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 1 -//#define OPENTHREAD_CONFIG_COAP_API_ENABLE 1 +// #define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 1 +// #define OPENTHREAD_CONFIG_COAP_API_ENABLE 1 #define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 0 #define OPENTHREAD_CONFIG_COAP_API_ENABLE 0 #define OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE 0 diff --git a/examples/platform/cc32xx/CC32XXDeviceAttestationCreds.cpp b/examples/platform/cc32xx/CC32XXDeviceAttestationCreds.cpp index ed94df6300db7a..0323e3b7ed39b1 100644 --- a/examples/platform/cc32xx/CC32XXDeviceAttestationCreds.cpp +++ b/examples/platform/cc32xx/CC32XXDeviceAttestationCreds.cpp @@ -214,7 +214,7 @@ const uint8_t gDacPrivKey[] = {}; const uint8_t gDacPubKey[] = {}; const uint8_t gDacCert[] = {}; #endif -const uint8_t gPaiCert[] = { +const uint8_t gPaiCert[] = { 0x30, 0x82, 0x01, 0xd4, 0x30, 0x82, 0x01, 0x7a, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x66, 0xd2, 0xa2, 0xc8, 0xa1, 0x41, 0x29, 0xd3, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x30, 0x31, 0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x0f, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x54, 0x65, 0x73, 0x74, 0x20, 0x50, 0x41, 0x41, diff --git a/examples/platform/esp32/common/CHIPDeviceManager.h b/examples/platform/esp32/common/CHIPDeviceManager.h index 9be71931631f91..36b8204ae3e71c 100644 --- a/examples/platform/esp32/common/CHIPDeviceManager.h +++ b/examples/platform/esp32/common/CHIPDeviceManager.h @@ -84,8 +84,8 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/platform/nxp/k32w/k32w0/app/project_include/OpenThreadConfig.h b/examples/platform/nxp/k32w/k32w0/app/project_include/OpenThreadConfig.h index 52cf1d2a738f90..d76a51a6fbb55b 100644 --- a/examples/platform/nxp/k32w/k32w0/app/project_include/OpenThreadConfig.h +++ b/examples/platform/nxp/k32w/k32w0/app/project_include/OpenThreadConfig.h @@ -106,7 +106,7 @@ #define UART_USE_SERIAL_MGR 1 #define UART_USE_SERIAL_MGR_LOG 1 -//#define OPENTHREAD_CONFIG_LOG_LEVEL OT_LOG_LEVEL_DEBG +// #define OPENTHREAD_CONFIG_LOG_LEVEL OT_LOG_LEVEL_DEBG // Use the NXP-supplied default platform configuration for remainder // of OpenThread config options. diff --git a/examples/platform/nxp/k32w/k32w0/app/support/Memconfig.cpp b/examples/platform/nxp/k32w/k32w0/app/support/Memconfig.cpp index 8bcd4551bb300d..e5acf5ea3ceecb 100644 --- a/examples/platform/nxp/k32w/k32w0/app/support/Memconfig.cpp +++ b/examples/platform/nxp/k32w/k32w0/app/support/Memconfig.cpp @@ -54,7 +54,7 @@ typedef struct A_BLOCK_LINK /* The size of the structure placed at the beginning of each allocated memory block must by correctly byte aligned. */ static const size_t xHeapStructSize = - (sizeof(BlockLink_t) + ((size_t)(portBYTE_ALIGNMENT - 1))) & ~((size_t) portBYTE_ALIGNMENT_MASK); + (sizeof(BlockLink_t) + ((size_t) (portBYTE_ALIGNMENT - 1))) & ~((size_t) portBYTE_ALIGNMENT_MASK); /* Gets set to the top bit of an size_t type. When this bit in the xBlockSize member of an BlockLink_t structure is set then the block belongs to the diff --git a/examples/platform/openiotsdk/app/openiotsdk_startup_gcc.cpp b/examples/platform/openiotsdk/app/openiotsdk_startup_gcc.cpp index abe68ff3fc3c09..9add2ca4e53777 100644 --- a/examples/platform/openiotsdk/app/openiotsdk_startup_gcc.cpp +++ b/examples/platform/openiotsdk/app/openiotsdk_startup_gcc.cpp @@ -102,7 +102,7 @@ static void serial_irq_cb(void * p_instance, mdh_serial_irq_type_t event); struct CriticalSection { CriticalSection() { core_util_critical_section_enter(); } - CriticalSection(const CriticalSection &) = delete; + CriticalSection(const CriticalSection &) = delete; CriticalSection & operator=(const CriticalSection &) = delete; ~CriticalSection() { core_util_critical_section_exit(); } }; diff --git a/examples/platform/openiotsdk/tf-m/targets/an552/device/source/device_definition.c b/examples/platform/openiotsdk/tf-m/targets/an552/device/source/device_definition.c old mode 100755 new mode 100644 index 2210868fec02d1..217c09a8ecb1a8 --- a/examples/platform/openiotsdk/tf-m/targets/an552/device/source/device_definition.c +++ b/examples/platform/openiotsdk/tf-m/targets/an552/device/source/device_definition.c @@ -109,8 +109,8 @@ struct uart_cmsdk_dev_t UART5_CMSDK_DEV_NS = { &(UART5_CMSD /* SSE-300 PPC driver structures */ #ifdef PPC_SSE300_MAIN0_S static struct ppc_sse300_dev_cfg_t PPC_SSE300_MAIN0_CFG_S = { .sacfg_base = SSE300_SACFG_BASE_S, - .nsacfg_base = SSE300_NSACFG_BASE_NS, - .ppc_name = PPC_SSE300_MAIN0 }; + .nsacfg_base = SSE300_NSACFG_BASE_NS, + .ppc_name = PPC_SSE300_MAIN0 }; static struct ppc_sse300_dev_data_t PPC_SSE300_MAIN0_DATA_S = { .sacfg_ns_ppc = 0, .sacfg_sp_ppc = 0, .nsacfg_nsp_ppc = 0, .int_bit_mask = 0, .is_initialized = false }; @@ -119,8 +119,8 @@ struct ppc_sse300_dev_t PPC_SSE300_MAIN0_DEV_S = { &PPC_SSE300_MAIN0_CFG_S, &PPC #ifdef PPC_SSE300_MAIN_EXP0_S static struct ppc_sse300_dev_cfg_t PPC_SSE300_MAIN_EXP0_CFG_S = { .sacfg_base = SSE300_SACFG_BASE_S, - .nsacfg_base = SSE300_NSACFG_BASE_NS, - .ppc_name = PPC_SSE300_MAIN_EXP0 }; + .nsacfg_base = SSE300_NSACFG_BASE_NS, + .ppc_name = PPC_SSE300_MAIN_EXP0 }; static struct ppc_sse300_dev_data_t PPC_SSE300_MAIN_EXP0_DATA_S = { .sacfg_ns_ppc = 0, .sacfg_sp_ppc = 0, .nsacfg_nsp_ppc = 0, .int_bit_mask = 0, .is_initialized = false }; @@ -129,8 +129,8 @@ struct ppc_sse300_dev_t PPC_SSE300_MAIN_EXP0_DEV_S = { &PPC_SSE300_MAIN_EXP0_CFG #ifdef PPC_SSE300_MAIN_EXP1_S static struct ppc_sse300_dev_cfg_t PPC_SSE300_MAIN_EXP1_CFG_S = { .sacfg_base = SSE300_SACFG_BASE_S, - .nsacfg_base = SSE300_NSACFG_BASE_NS, - .ppc_name = PPC_SSE300_MAIN_EXP1 }; + .nsacfg_base = SSE300_NSACFG_BASE_NS, + .ppc_name = PPC_SSE300_MAIN_EXP1 }; static struct ppc_sse300_dev_data_t PPC_SSE300_MAIN_EXP1_DATA_S = { .sacfg_ns_ppc = 0, .sacfg_sp_ppc = 0, .nsacfg_nsp_ppc = 0, .int_bit_mask = 0, .is_initialized = false }; @@ -139,8 +139,8 @@ struct ppc_sse300_dev_t PPC_SSE300_MAIN_EXP1_DEV_S = { &PPC_SSE300_MAIN_EXP1_CFG #ifdef PPC_SSE300_MAIN_EXP2_S static struct ppc_sse300_dev_cfg_t PPC_SSE300_MAIN_EXP2_CFG_S = { .sacfg_base = SSE300_SACFG_BASE_S, - .nsacfg_base = SSE300_NSACFG_BASE_NS, - .ppc_name = PPC_SSE300_MAIN_EXP2 }; + .nsacfg_base = SSE300_NSACFG_BASE_NS, + .ppc_name = PPC_SSE300_MAIN_EXP2 }; static struct ppc_sse300_dev_data_t PPC_SSE300_MAIN_EXP2_DATA_S = { .sacfg_ns_ppc = 0, .sacfg_sp_ppc = 0, .nsacfg_nsp_ppc = 0, .int_bit_mask = 0, .is_initialized = false }; @@ -149,8 +149,8 @@ struct ppc_sse300_dev_t PPC_SSE300_MAIN_EXP2_DEV_S = { &PPC_SSE300_MAIN_EXP2_CFG #ifdef PPC_SSE300_MAIN_EXP3_S static struct ppc_sse300_dev_cfg_t PPC_SSE300_MAIN_EXP3_CFG_S = { .sacfg_base = SSE300_SACFG_BASE_S, - .nsacfg_base = SSE300_NSACFG_BASE_NS, - .ppc_name = PPC_SSE300_MAIN_EXP3 }; + .nsacfg_base = SSE300_NSACFG_BASE_NS, + .ppc_name = PPC_SSE300_MAIN_EXP3 }; static struct ppc_sse300_dev_data_t PPC_SSE300_MAIN_EXP3_DATA_S = { .sacfg_ns_ppc = 0, .sacfg_sp_ppc = 0, .nsacfg_nsp_ppc = 0, .int_bit_mask = 0, .is_initialized = false }; @@ -159,8 +159,8 @@ struct ppc_sse300_dev_t PPC_SSE300_MAIN_EXP3_DEV_S = { &PPC_SSE300_MAIN_EXP3_CFG #ifdef PPC_SSE300_PERIPH0_S static struct ppc_sse300_dev_cfg_t PPC_SSE300_PERIPH0_CFG_S = { .sacfg_base = SSE300_SACFG_BASE_S, - .nsacfg_base = SSE300_NSACFG_BASE_NS, - .ppc_name = PPC_SSE300_PERIPH0 }; + .nsacfg_base = SSE300_NSACFG_BASE_NS, + .ppc_name = PPC_SSE300_PERIPH0 }; static struct ppc_sse300_dev_data_t PPC_SSE300_PERIPH0_DATA_S = { .sacfg_ns_ppc = 0, .sacfg_sp_ppc = 0, .nsacfg_nsp_ppc = 0, .int_bit_mask = 0, .is_initialized = false }; @@ -169,8 +169,8 @@ struct ppc_sse300_dev_t PPC_SSE300_PERIPH0_DEV_S = { &PPC_SSE300_PERIPH0_CFG_S, #ifdef PPC_SSE300_PERIPH1_S static struct ppc_sse300_dev_cfg_t PPC_SSE300_PERIPH1_CFG_S = { .sacfg_base = SSE300_SACFG_BASE_S, - .nsacfg_base = SSE300_NSACFG_BASE_NS, - .ppc_name = PPC_SSE300_PERIPH1 }; + .nsacfg_base = SSE300_NSACFG_BASE_NS, + .ppc_name = PPC_SSE300_PERIPH1 }; static struct ppc_sse300_dev_data_t PPC_SSE300_PERIPH1_DATA_S = { .sacfg_ns_ppc = 0, .sacfg_sp_ppc = 0, .nsacfg_nsp_ppc = 0, .int_bit_mask = 0, .is_initialized = false }; @@ -179,8 +179,8 @@ struct ppc_sse300_dev_t PPC_SSE300_PERIPH1_DEV_S = { &PPC_SSE300_PERIPH1_CFG_S, #ifdef PPC_SSE300_PERIPH_EXP0_S static struct ppc_sse300_dev_cfg_t PPC_SSE300_PERIPH_EXP0_CFG_S = { .sacfg_base = SSE300_SACFG_BASE_S, - .nsacfg_base = SSE300_NSACFG_BASE_NS, - .ppc_name = PPC_SSE300_PERIPH_EXP0 }; + .nsacfg_base = SSE300_NSACFG_BASE_NS, + .ppc_name = PPC_SSE300_PERIPH_EXP0 }; static struct ppc_sse300_dev_data_t PPC_SSE300_PERIPH_EXP0_DATA_S = { .sacfg_ns_ppc = 0, .sacfg_sp_ppc = 0, .nsacfg_nsp_ppc = 0, .int_bit_mask = 0, .is_initialized = false }; @@ -189,8 +189,8 @@ struct ppc_sse300_dev_t PPC_SSE300_PERIPH_EXP0_DEV_S = { &PPC_SSE300_PERIPH_EXP0 #ifdef PPC_SSE300_PERIPH_EXP1_S static struct ppc_sse300_dev_cfg_t PPC_SSE300_PERIPH_EXP1_CFG_S = { .sacfg_base = SSE300_SACFG_BASE_S, - .nsacfg_base = SSE300_NSACFG_BASE_NS, - .ppc_name = PPC_SSE300_PERIPH_EXP1 }; + .nsacfg_base = SSE300_NSACFG_BASE_NS, + .ppc_name = PPC_SSE300_PERIPH_EXP1 }; static struct ppc_sse300_dev_data_t PPC_SSE300_PERIPH_EXP1_DATA_S = { .sacfg_ns_ppc = 0, .sacfg_sp_ppc = 0, .nsacfg_nsp_ppc = 0, .int_bit_mask = 0, .is_initialized = false }; @@ -199,8 +199,8 @@ struct ppc_sse300_dev_t PPC_SSE300_PERIPH_EXP1_DEV_S = { &PPC_SSE300_PERIPH_EXP1 #ifdef PPC_SSE300_PERIPH_EXP2_S static struct ppc_sse300_dev_cfg_t PPC_SSE300_PERIPH_EXP2_CFG_S = { .sacfg_base = SSE300_SACFG_BASE_S, - .nsacfg_base = SSE300_NSACFG_BASE_NS, - .ppc_name = PPC_SSE300_PERIPH_EXP2 }; + .nsacfg_base = SSE300_NSACFG_BASE_NS, + .ppc_name = PPC_SSE300_PERIPH_EXP2 }; static struct ppc_sse300_dev_data_t PPC_SSE300_PERIPH_EXP2_DATA_S = { .sacfg_ns_ppc = 0, .sacfg_sp_ppc = 0, .nsacfg_nsp_ppc = 0, .int_bit_mask = 0, .is_initialized = false }; @@ -209,8 +209,8 @@ struct ppc_sse300_dev_t PPC_SSE300_PERIPH_EXP2_DEV_S = { &PPC_SSE300_PERIPH_EXP2 #ifdef PPC_SSE300_PERIPH_EXP3_S static struct ppc_sse300_dev_cfg_t PPC_SSE300_PERIPH_EXP3_CFG_S = { .sacfg_base = SSE300_SACFG_BASE_S, - .nsacfg_base = SSE300_NSACFG_BASE_NS, - .ppc_name = PPC_SSE300_PERIPH_EXP3 }; + .nsacfg_base = SSE300_NSACFG_BASE_NS, + .ppc_name = PPC_SSE300_PERIPH_EXP3 }; static struct ppc_sse300_dev_data_t PPC_SSE300_PERIPH_EXP3_DATA_S = { .sacfg_ns_ppc = 0, .sacfg_sp_ppc = 0, .nsacfg_nsp_ppc = 0, .int_bit_mask = 0, .is_initialized = false }; @@ -242,7 +242,7 @@ static const struct syscounter_armv8_m_cntrl_dev_cfg_t SYSCOUNTER_CNTRL_ARMV8_M_ }; static struct syscounter_armv8_m_cntrl_dev_data_t SYSCOUNTER_CNTRL_ARMV8_M_DEV_DATA_S = { .is_initialized = false }; struct syscounter_armv8_m_cntrl_dev_t SYSCOUNTER_CNTRL_ARMV8_M_DEV_S = { &(SYSCOUNTER_CNTRL_ARMV8_M_DEV_CFG_S), - &(SYSCOUNTER_CNTRL_ARMV8_M_DEV_DATA_S) }; + &(SYSCOUNTER_CNTRL_ARMV8_M_DEV_DATA_S) }; #endif #ifdef SYSCOUNTER_READ_ARMV8_M_S diff --git a/examples/platform/openiotsdk/tf-m/targets/an552/device/source/startup_an552.c b/examples/platform/openiotsdk/tf-m/targets/an552/device/source/startup_an552.c old mode 100755 new mode 100644 index 8d49283e275715..74e9e76ba150d0 --- a/examples/platform/openiotsdk/tf-m/targets/an552/device/source/startup_an552.c +++ b/examples/platform/openiotsdk/tf-m/targets/an552/device/source/startup_an552.c @@ -176,22 +176,22 @@ DEFAULT_IRQ_HANDLER(UART5_Handler) extern const VECTOR_TABLE_Type __VECTOR_TABLE[]; const VECTOR_TABLE_Type __VECTOR_TABLE[] __VECTOR_TABLE_ATTRIBUTE = { - (VECTOR_TABLE_Type)(&__INITIAL_SP), /* Initial Stack Pointer */ - Reset_Handler, /* Reset Handler */ - NMI_Handler, /* -14: NMI Handler */ - HardFault_Handler, /* -13: Hard Fault Handler */ - MemManage_Handler, /* -12: MPU Fault Handler */ - BusFault_Handler, /* -11: Bus Fault Handler */ - UsageFault_Handler, /* -10: Usage Fault Handler */ - SecureFault_Handler, /* -9: Secure Fault Handler */ - 0, /* Reserved */ - 0, /* Reserved */ - 0, /* Reserved */ - SVC_Handler, /* -5: SVCall Handler */ - DebugMon_Handler, /* -4: Debug Monitor Handler */ - 0, /* Reserved */ - PendSV_Handler, /* -2: PendSV Handler */ - SysTick_Handler, /* -1: SysTick Handler */ + (VECTOR_TABLE_Type) (&__INITIAL_SP), /* Initial Stack Pointer */ + Reset_Handler, /* Reset Handler */ + NMI_Handler, /* -14: NMI Handler */ + HardFault_Handler, /* -13: Hard Fault Handler */ + MemManage_Handler, /* -12: MPU Fault Handler */ + BusFault_Handler, /* -11: Bus Fault Handler */ + UsageFault_Handler, /* -10: Usage Fault Handler */ + SecureFault_Handler, /* -9: Secure Fault Handler */ + 0, /* Reserved */ + 0, /* Reserved */ + 0, /* Reserved */ + SVC_Handler, /* -5: SVCall Handler */ + DebugMon_Handler, /* -4: Debug Monitor Handler */ + 0, /* Reserved */ + PendSV_Handler, /* -2: PendSV Handler */ + SysTick_Handler, /* -1: SysTick Handler */ NONSEC_WATCHDOG_RESET_REQ_Handler, /* 0: Non-Secure Watchdog Reset Request Handler */ NONSEC_WATCHDOG_Handler, /* 1: Non-Secure Watchdog Handler */ @@ -340,10 +340,10 @@ void Reset_Handler(void) #if defined(__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) __disable_irq(); #endif - __set_PSP((uint32_t)(&__INITIAL_SP)); + __set_PSP((uint32_t) (&__INITIAL_SP)); - __set_MSPLIM((uint32_t)(&__STACK_LIMIT)); - __set_PSPLIM((uint32_t)(&__STACK_LIMIT)); + __set_MSPLIM((uint32_t) (&__STACK_LIMIT)); + __set_PSPLIM((uint32_t) (&__STACK_LIMIT)); #if defined(__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) __TZ_set_STACKSEAL_S((uint32_t *) (&__STACK_SEAL)); diff --git a/examples/platform/openiotsdk/tf-m/targets/an552/device/source/system_core_init.c b/examples/platform/openiotsdk/tf-m/targets/an552/device/source/system_core_init.c old mode 100755 new mode 100644 index 6e3aae93112895..0127c5fc6d1dce --- a/examples/platform/openiotsdk/tf-m/targets/an552/device/source/system_core_init.c +++ b/examples/platform/openiotsdk/tf-m/targets/an552/device/source/system_core_init.c @@ -56,7 +56,7 @@ void SystemCoreClockUpdate(void) void SystemInit(void) { #if defined(__VTOR_PRESENT) && (__VTOR_PRESENT == 1U) - SCB->VTOR = (uint32_t)(&__VECTOR_TABLE[0]); + SCB->VTOR = (uint32_t) (&__VECTOR_TABLE[0]); #endif #if (defined(__FPU_USED) && (__FPU_USED == 1U)) || (defined(__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U)) diff --git a/examples/platform/openiotsdk/tf-m/targets/an552/target_cfg.c b/examples/platform/openiotsdk/tf-m/targets/an552/target_cfg.c old mode 100755 new mode 100644 index 0358426779cafc..9f6b34f7a31421 --- a/examples/platform/openiotsdk/tf-m/targets/an552/target_cfg.c +++ b/examples/platform/openiotsdk/tf-m/targets/an552/target_cfg.c @@ -122,10 +122,10 @@ enum tfm_plat_err_t system_reset_cfg(void) sysctrl->reset_mask |= ENABLE_CPU0_SYSTEM_RESET_REQUEST; /* Clear SCB_AIRCR_VECTKEY value */ - reg_value &= ~(uint32_t)(SCB_AIRCR_VECTKEY_Msk); + reg_value &= ~(uint32_t) (SCB_AIRCR_VECTKEY_Msk); /* Enable system reset request only to the secure world */ - reg_value |= (uint32_t)(SCB_AIRCR_WRITE_MASK | SCB_AIRCR_SYSRESETREQS_Msk); + reg_value |= (uint32_t) (SCB_AIRCR_WRITE_MASK | SCB_AIRCR_SYSRESETREQS_Msk); SCB->AIRCR = reg_value; diff --git a/examples/platform/silabs/FreeRTOSConfig.h b/examples/platform/silabs/FreeRTOSConfig.h index bce38a6a579039..520c84a2d73b81 100644 --- a/examples/platform/silabs/FreeRTOSConfig.h +++ b/examples/platform/silabs/FreeRTOSConfig.h @@ -232,15 +232,15 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ #ifndef configTOTAL_HEAP_SIZE #ifdef SL_WIFI #ifdef DIC_ENABLE -#define configTOTAL_HEAP_SIZE ((size_t)((68 + EXTRA_HEAP_k) * 1024)) +#define configTOTAL_HEAP_SIZE ((size_t) ((68 + EXTRA_HEAP_k) * 1024)) #else -#define configTOTAL_HEAP_SIZE ((size_t)((42 + EXTRA_HEAP_k) * 1024)) +#define configTOTAL_HEAP_SIZE ((size_t) ((42 + EXTRA_HEAP_k) * 1024)) #endif // DIC #else // SL_WIFI #if SL_CONFIG_OPENTHREAD_LIB == 1 -#define configTOTAL_HEAP_SIZE ((size_t)((40 + EXTRA_HEAP_k) * 1024)) +#define configTOTAL_HEAP_SIZE ((size_t) ((40 + EXTRA_HEAP_k) * 1024)) #else -#define configTOTAL_HEAP_SIZE ((size_t)((38 + EXTRA_HEAP_k) * 1024)) +#define configTOTAL_HEAP_SIZE ((size_t) ((38 + EXTRA_HEAP_k) * 1024)) #endif // SL_CONFIG_OPENTHREAD_LIB #endif // configTOTAL_HEAP_SIZE #endif // configTOTAL_HEAP_SIZE diff --git a/examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_m4.c b/examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_m4.c index 88a9b97f571807..ac24d5c4f61dd4 100644 --- a/examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_m4.c +++ b/examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_m4.c @@ -33,7 +33,7 @@ void sl_button_on_change(uint8_t btn, uint8_t btnAction); uint32_t NVIC_GetIRQEnable(IRQn_Type IRQn) { - return ((NVIC->ICER[((uint32_t)(IRQn) >> 5)] & (1 << ((uint32_t)(IRQn) &0x1F))) ? 1 : 0); + return ((NVIC->ICER[((uint32_t) (IRQn) >> 5)] & (1 << ((uint32_t) (IRQn) &0x1F))) ? 1 : 0); } void rsi_assertion(uint16_t assertion_val, const char * string) diff --git a/examples/platform/silabs/SilabsDeviceDataProvider.h b/examples/platform/silabs/SilabsDeviceDataProvider.h index 8bb04fea7d39f5..f29e6be24d9d72 100644 --- a/examples/platform/silabs/SilabsDeviceDataProvider.h +++ b/examples/platform/silabs/SilabsDeviceDataProvider.h @@ -33,8 +33,8 @@ class SilabsDeviceDataProvider : public CommissionableDataProvider, { public: SilabsDeviceDataProvider() : - CommissionableDataProvider(), Internal::GenericDeviceInstanceInfoProvider( - ConfigurationManagerImpl::GetDefaultInstance()) + CommissionableDataProvider(), + Internal::GenericDeviceInstanceInfoProvider(ConfigurationManagerImpl::GetDefaultInstance()) {} // TODO Remove once Commander supports (doesn't erase) NVM3 for 917 diff --git a/examples/platform/silabs/efr32/rs911x/hal/rsi_board_configuration.h b/examples/platform/silabs/efr32/rs911x/hal/rsi_board_configuration.h index 204e7519d29b5b..e40e1856d7f8f7 100644 --- a/examples/platform/silabs/efr32/rs911x/hal/rsi_board_configuration.h +++ b/examples/platform/silabs/efr32/rs911x/hal/rsi_board_configuration.h @@ -25,7 +25,10 @@ typedef struct } rsi_pin_t; #define PIN(port_id, pin_id) \ - (rsi_pin_t) { .port = gpioPort##port_id, .pin = pin_id } + (rsi_pin_t) \ + { \ + .port = gpioPort##port_id, .pin = pin_id \ + } #if defined(EFR32MG12_BRD4161A) || defined(BRD4161A) || defined(EFR32MG12_BRD4162A) || defined(BRD4162A) || \ defined(EFR32MG12_BRD4163A) || defined(BRD4163A) || defined(EFR32MG12_BRD4164A) || defined(BRD4164A) || \ diff --git a/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_rtc.c b/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_rtc.c index 418b2d900dd8d5..8e407d2c179404 100644 --- a/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_rtc.c +++ b/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_rtc.c @@ -152,7 +152,7 @@ void rsi_rtc_init_timer(void) * An unscaled dividend (dividend = argument + 1). * So we need to send argument substracted by 1 */ - rtcc_init.presc = (RTCC_CntPresc_TypeDef)(CMU_PrescToLog2(SL_SLEEPTIMER_FREQ_DIVIDER - 1)); + rtcc_init.presc = (RTCC_CntPresc_TypeDef) (CMU_PrescToLog2(SL_SLEEPTIMER_FREQ_DIVIDER - 1)); RTCC_Init(&rtcc_init); diff --git a/examples/platform/silabs/efr32/rs911x/hal/sl_board_configuration.h b/examples/platform/silabs/efr32/rs911x/hal/sl_board_configuration.h index 056fb22817d22d..4310bf719f8179 100644 --- a/examples/platform/silabs/efr32/rs911x/hal/sl_board_configuration.h +++ b/examples/platform/silabs/efr32/rs911x/hal/sl_board_configuration.h @@ -25,7 +25,10 @@ typedef struct } sl_pin_t; #define PIN(port_id, pin_id) \ - (sl_pin_t) { .port = gpioPort##port_id, .pin = pin_id } + (sl_pin_t) \ + { \ + .port = gpioPort##port_id, .pin = pin_id \ + } #define PACKET_PENDING_INT_PRI 3 #if defined(EFR32MG12_BRD4161A) || defined(BRD4161A) || defined(EFR32MG12_BRD4162A) || defined(BRD4162A) || \ diff --git a/examples/platform/silabs/efr32/wf200/efr_spi.c b/examples/platform/silabs/efr32/wf200/efr_spi.c index f01069f80d6f28..ab5a4e64ab73c1 100644 --- a/examples/platform/silabs/efr32/wf200/efr_spi.c +++ b/examples/platform/silabs/efr32/wf200/efr_spi.c @@ -247,7 +247,7 @@ sl_status_t sl_wfx_host_spi_transfer_no_cs_assert(sl_wfx_host_bus_transfer_type_ { for (uint8_t * buffer_ptr = header; header_length > 0; --header_length, ++buffer_ptr) { - MY_USART->TXDATA = (uint32_t)(*buffer_ptr); + MY_USART->TXDATA = (uint32_t) (*buffer_ptr); while (!(MY_USART->STATUS & USART_STATUS_TXC)) { diff --git a/examples/platform/silabs/efr32/wf200/host_if.cpp b/examples/platform/silabs/efr32/wf200/host_if.cpp index a8fd053e0c77c7..3240c2642a3080 100644 --- a/examples/platform/silabs/efr32/wf200/host_if.cpp +++ b/examples/platform/silabs/efr32/wf200/host_if.cpp @@ -289,7 +289,7 @@ static void sl_wfx_scan_result_callback(sl_wfx_scan_result_ind_body_t * scan_res struct scan_result_holder * ap; SILABS_LOG("# %2d %2d %03d %02X:%02X:%02X:%02X:%02X:%02X %s", scan_count, scan_result->channel, - ((int16_t)(scan_result->rcpi - 220) / 2), scan_result->mac[0], scan_result->mac[1], scan_result->mac[2], + ((int16_t) (scan_result->rcpi - 220) / 2), scan_result->mac[0], scan_result->mac[1], scan_result->mac[2], scan_result->mac[3], scan_result->mac[4], scan_result->mac[5], scan_result->ssid_def.ssid); /*Report one AP information*/ SILABS_LOG("\r\n"); diff --git a/examples/platform/silabs/heap_4_silabs.c b/examples/platform/silabs/heap_4_silabs.c index 03dddf4322519d..a19bff034362fb 100644 --- a/examples/platform/silabs/heap_4_silabs.c +++ b/examples/platform/silabs/heap_4_silabs.c @@ -66,7 +66,7 @@ task.h is included from an application file. */ #endif /* Block sizes must not get too small. */ -#define heapMINIMUM_BLOCK_SIZE ((size_t)(xHeapStructSize << 1)) +#define heapMINIMUM_BLOCK_SIZE ((size_t) (xHeapStructSize << 1)) /* Assumes 8bit bytes! */ #define heapBITS_PER_BYTE ((size_t) 8) @@ -109,7 +109,7 @@ static void prvHeapInit(void); /* The size of the structure placed at the beginning of each allocated memory * block must by correctly byte aligned. */ static const size_t xHeapStructSize = - (sizeof(BlockLink_t) + ((size_t)(portBYTE_ALIGNMENT - 1))) & ~((size_t) portBYTE_ALIGNMENT_MASK); + (sizeof(BlockLink_t) + ((size_t) (portBYTE_ALIGNMENT - 1))) & ~((size_t) portBYTE_ALIGNMENT_MASK); /* Create a couple of list links to mark the start and end of the list. */ static BlockLink_t xStart, *pxEnd = NULL; diff --git a/examples/platform/stm32/common/STM32WB5MM-DK/Inc/app_common.h b/examples/platform/stm32/common/STM32WB5MM-DK/Inc/app_common.h index 63b2af6ae8a23b..e87f70699a14e5 100644 --- a/examples/platform/stm32/common/STM32WB5MM-DK/Inc/app_common.h +++ b/examples/platform/stm32/common/STM32WB5MM-DK/Inc/app_common.h @@ -117,7 +117,7 @@ extern "C" { #define BITN(w, n) (((w)[(n) / 32] >> ((n) % 32)) & 1) #define BITNSET(w, n, b) \ - M_BEGIN(w)[(n) / 32] |= ((U32)(b)) << ((n) % 32); \ + M_BEGIN(w)[(n) / 32] |= ((U32) (b)) << ((n) % 32); \ M_END /* -------------------------------- * diff --git a/examples/platform/stm32/common/STM32WB5MM-DK/Inc/app_conf.h b/examples/platform/stm32/common/STM32WB5MM-DK/Inc/app_conf.h index fe6e3b2aa16a29..f439fd72f7393f 100644 --- a/examples/platform/stm32/common/STM32WB5MM-DK/Inc/app_conf.h +++ b/examples/platform/stm32/common/STM32WB5MM-DK/Inc/app_conf.h @@ -436,7 +436,7 @@ extern "C" { #endif /* CFG_FULL_LOW_POWER */ /* FOR DEBUGGING ONLY ! */ -//#define CFG_LPM_SUPPORTED 1 +// #define CFG_LPM_SUPPORTED 1 /****************************************************************************** * Timer Server diff --git a/examples/platform/stm32/common/STM32WB5MM-DK/STM32_WPAN/App/app_ble.c b/examples/platform/stm32/common/STM32WB5MM-DK/STM32_WPAN/App/app_ble.c index 65b870a9ba1e5e..4200191a38a0e9 100644 --- a/examples/platform/stm32/common/STM32WB5MM-DK/STM32_WPAN/App/app_ble.c +++ b/examples/platform/stm32/common/STM32WB5MM-DK/STM32_WPAN/App/app_ble.c @@ -206,9 +206,9 @@ const osThreadAttr_t HciUserEvtProcess_attr = { .name = CFG_HCI_USER_EVT_P PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static TL_CmdPacket_t BleCmdBuffer; static const uint8_t M_bd_addr[BD_ADDR_SIZE_LOCAL] = { - (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000000000FF)), (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00000000FF00) >> 8), - (uint8_t)((CFG_ADV_BD_ADDRESS & 0x000000FF0000) >> 16), (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000FF000000) >> 24), - (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00FF00000000) >> 32), (uint8_t)((CFG_ADV_BD_ADDRESS & 0xFF0000000000) >> 40) + (uint8_t) ((CFG_ADV_BD_ADDRESS & 0x0000000000FF)), (uint8_t) ((CFG_ADV_BD_ADDRESS & 0x00000000FF00) >> 8), + (uint8_t) ((CFG_ADV_BD_ADDRESS & 0x000000FF0000) >> 16), (uint8_t) ((CFG_ADV_BD_ADDRESS & 0x0000FF000000) >> 24), + (uint8_t) ((CFG_ADV_BD_ADDRESS & 0x00FF00000000) >> 32), (uint8_t) ((CFG_ADV_BD_ADDRESS & 0xFF0000000000) >> 40) }; static uint8_t bd_addr_udn[BD_ADDR_SIZE_LOCAL]; @@ -750,13 +750,13 @@ const uint8_t * BleGetBdAddress(void) * Note: In order to use the Public Address in a final product, a dedicated * 24bits company ID (OUI) shall be bought. */ - bd_addr_udn[0] = (uint8_t)(udn & 0x000000FF); - bd_addr_udn[1] = (uint8_t)((udn & 0x0000FF00) >> 8); + bd_addr_udn[0] = (uint8_t) (udn & 0x000000FF); + bd_addr_udn[1] = (uint8_t) ((udn & 0x0000FF00) >> 8); bd_addr_udn[2] = (uint8_t) device_id; - bd_addr_udn[3] = (uint8_t)(company_id & 0x000000FF); + bd_addr_udn[3] = (uint8_t) (company_id & 0x000000FF); ; - bd_addr_udn[4] = (uint8_t)((company_id & 0x0000FF00) >> 8); - bd_addr_udn[5] = (uint8_t)((company_id & 0x00FF0000) >> 16); + bd_addr_udn[4] = (uint8_t) ((company_id & 0x0000FF00) >> 8); + bd_addr_udn[5] = (uint8_t) ((company_id & 0x00FF0000) >> 16); bd_addr = (const uint8_t *) bd_addr_udn; } diff --git a/examples/platform/stm32/common/STM32WB5MM-DK/Src/app_entry.cpp b/examples/platform/stm32/common/STM32WB5MM-DK/Src/app_entry.cpp index 4d828c6cd4ffee..f631165467e749 100644 --- a/examples/platform/stm32/common/STM32WB5MM-DK/Src/app_entry.cpp +++ b/examples/platform/stm32/common/STM32WB5MM-DK/Src/app_entry.cpp @@ -336,7 +336,7 @@ static void APPE_SysUserEvtRx(void * pPayload) break; case SHCI_SUB_EVT_ERROR_NOTIF: - APPE_SysEvtError((SCHI_SystemErrCode_t)(p_sys_event->payload[0])); + APPE_SysEvtError((SCHI_SystemErrCode_t) (p_sys_event->payload[0])); break; default: diff --git a/examples/platform/stm32/common/STM32WB5MM-DK/Src/flash_wb.c b/examples/platform/stm32/common/STM32WB5MM-DK/Src/flash_wb.c index d1e0f613b70b4b..4c24d6f71c9103 100644 --- a/examples/platform/stm32/common/STM32WB5MM-DK/Src/flash_wb.c +++ b/examples/platform/stm32/common/STM32WB5MM-DK/Src/flash_wb.c @@ -104,7 +104,7 @@ NVM_StatusTypeDef NM_Dump(void) err = FD_EraseSectors((NVM_MATTER_ADDR_INIT_SECURE - FLASH_START) / (NVM_SIZE_FLASH / NB_SECTOR), NB_SECTOR); if (err == 0) { - err = FD_WriteData(NVM_MATTER_ADDR_INIT_SECURE, (uint64_t *) ram_nvm, (uint32_t)(NVM_SIZE_FLASH / sizeof(uint64_t))); + err = FD_WriteData(NVM_MATTER_ADDR_INIT_SECURE, (uint64_t *) ram_nvm, (uint32_t) (NVM_SIZE_FLASH / sizeof(uint64_t))); if (err != 0) { err = NVM_WRITE_FAILED; diff --git a/examples/platform/stm32/common/STM32WB5MM-DK/Src/freertos_port.c b/examples/platform/stm32/common/STM32WB5MM-DK/Src/freertos_port.c index ab2043c9b9139f..26553c52183805 100644 --- a/examples/platform/stm32/common/STM32WB5MM-DK/Src/freertos_port.c +++ b/examples/platform/stm32/common/STM32WB5MM-DK/Src/freertos_port.c @@ -242,7 +242,7 @@ static void LpTimerStart(uint32_t time_to_sleep) { /* The result always fits in uint32_t and is always less than 0xFFFF0000 */ time = time_to_sleep * 1000000000000ULL; - time = (uint64_t)(time / (CFG_TS_TICK_VAL_PS * configTICK_RATE_HZ)); + time = (uint64_t) (time / (CFG_TS_TICK_VAL_PS * configTICK_RATE_HZ)); } HW_TS_Start(LpTimerContext.LpTimerFreeRTOS_Id, (uint32_t) time); @@ -289,7 +289,7 @@ static uint32_t LpGetElapsedTime(void) LpTimeLeftOnExit = HW_TS_RTC_ReadLeftTicksToCount(); /* This cannot overflow. Max result is ~ 1.6e13 */ - time_ps = (uint64_t)((CFG_TS_TICK_VAL_PS) * (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit)); + time_ps = (uint64_t) ((CFG_TS_TICK_VAL_PS) * (uint64_t) (LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit)); /* time_ps can be less than 1 RTOS tick in following situations * a) MCU didn't go to STOP2 due to wake-up unrelated to Timer Server or woke up from STOP2 very shortly after. @@ -305,8 +305,8 @@ static uint32_t LpGetElapsedTime(void) else { /* Convert pS time into OS ticks */ - val_ticks = time_ps * configTICK_RATE_HZ; /* This cannot overflow. Max result is ~ 1.6e16 */ - val_ticks = (uint64_t)(val_ticks / (1e12)); /* The result always fits in uint32_t */ + val_ticks = time_ps * configTICK_RATE_HZ; /* This cannot overflow. Max result is ~ 1.6e16 */ + val_ticks = (uint64_t) (val_ticks / (1e12)); /* The result always fits in uint32_t */ } /** diff --git a/examples/platform/stm32/common/STM32WB5MM-DK/Src/hw_timerserver.c b/examples/platform/stm32/common/STM32WB5MM-DK/Src/hw_timerserver.c index 7409e7f8910319..503e31cd697257 100644 --- a/examples/platform/stm32/common/STM32WB5MM-DK/Src/hw_timerserver.c +++ b/examples/platform/stm32/common/STM32WB5MM-DK/Src/hw_timerserver.c @@ -108,15 +108,15 @@ static uint32_t ReadRtcSsrValue(void) uint32_t first_read; uint32_t second_read; - first_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + first_read = (uint32_t) (READ_BIT(RTC->SSR, RTC_SSR_SS)); - second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + second_read = (uint32_t) (READ_BIT(RTC->SSR, RTC_SSR_SS)); while (first_read != second_read) { first_read = second_read; - second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + second_read = (uint32_t) (READ_BIT(RTC->SSR, RTC_SSR_SS)); } return second_read; @@ -605,11 +605,12 @@ void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef * hrtc) /** * Readout the user config */ - WakeupTimerDivider = (4 - ((uint32_t)(READ_BIT(RTC->CR, RTC_CR_WUCKSEL)))); + WakeupTimerDivider = (4 - ((uint32_t) (READ_BIT(RTC->CR, RTC_CR_WUCKSEL)))); - AsynchPrescalerUserConfig = (uint8_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_A) >> (uint32_t) POSITION_VAL(RTC_PRER_PREDIV_A)) + 1; + AsynchPrescalerUserConfig = + (uint8_t) (READ_BIT(RTC->PRER, RTC_PRER_PREDIV_A) >> (uint32_t) POSITION_VAL(RTC_PRER_PREDIV_A)) + 1; - SynchPrescalerUserConfig = (uint16_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_S)) + 1; + SynchPrescalerUserConfig = (uint16_t) (READ_BIT(RTC->PRER, RTC_PRER_PREDIV_S)) + 1; /** * Margin is taken to avoid wrong calculation when the wrap around is there and some @@ -868,7 +869,7 @@ uint16_t HW_TS_RTC_ReadLeftTicksToCount(void) if ((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) { - auro_reload_value = (uint32_t)(READ_BIT(RTC->WUTR, RTC_WUTR_WUT)); + auro_reload_value = (uint32_t) (READ_BIT(RTC->WUTR, RTC_WUTR_WUT)); elapsed_time_value = ReturnTimeElapsed(); diff --git a/examples/platform/stm32/common/STM32WB5MM-DK/Src/stm32wbxx_hal_timebase_tim.c b/examples/platform/stm32/common/STM32WB5MM-DK/Src/stm32wbxx_hal_timebase_tim.c index c2f795f4dd0c43..cfbb27e11adbe7 100644 --- a/examples/platform/stm32/common/STM32WB5MM-DK/Src/stm32wbxx_hal_timebase_tim.c +++ b/examples/platform/stm32/common/STM32WB5MM-DK/Src/stm32wbxx_hal_timebase_tim.c @@ -99,7 +99,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Compute TIM17 clock */ uwTimclock = HAL_RCC_GetPCLK2Freq(); /* Compute the prescaler value to have TIM17 counter clock equal to 1MHz */ - uwPrescalerValue = (uint32_t)((uwTimclock / 1000000U) - 1U); + uwPrescalerValue = (uint32_t) ((uwTimclock / 1000000U) - 1U); /* Initialize TIM17 */ htim17.Instance = TIM17; diff --git a/examples/platform/stm32/common/STM32WB5MM-DK/Src/syscalls.c b/examples/platform/stm32/common/STM32WB5MM-DK/Src/syscalls.c index 5e62d7dc9c33ff..204ad867c68020 100644 --- a/examples/platform/stm32/common/STM32WB5MM-DK/Src/syscalls.c +++ b/examples/platform/stm32/common/STM32WB5MM-DK/Src/syscalls.c @@ -32,7 +32,7 @@ #include /* Variables */ -//#undef errno +// #undef errno extern int errno; extern int __io_putchar(int ch) __attribute__((weak)); extern int __io_getchar(void) __attribute__((weak)); diff --git a/examples/platform/stm32/config_files/STM32WB5/FreeRTOSConfig.h b/examples/platform/stm32/config_files/STM32WB5/FreeRTOSConfig.h index 5423994ea0bc12..aeb0ac1b8913da 100644 --- a/examples/platform/stm32/config_files/STM32WB5/FreeRTOSConfig.h +++ b/examples/platform/stm32/config_files/STM32WB5/FreeRTOSConfig.h @@ -171,7 +171,7 @@ standard names. */ /* USER CODE BEGIN Defines */ /* Section where parameter definitions can be added (for instance, to override default ones in FreeRTOS.h) */ -//#define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 1 /* required only for Keil but does not hurt otherwise */ +// #define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 1 /* required only for Keil but does not hurt otherwise */ #define configGENERATE_RUN_TIME_STATS 1 #if (configGENERATE_RUN_TIME_STATS == 1) diff --git a/examples/platform/stm32/config_files/STM32WB5/matter_config.h b/examples/platform/stm32/config_files/STM32WB5/matter_config.h index 3ab112ea03b75a..e89e44b64fda3b 100644 --- a/examples/platform/stm32/config_files/STM32WB5/matter_config.h +++ b/examples/platform/stm32/config_files/STM32WB5/matter_config.h @@ -22,9 +22,9 @@ #include #include -//#if CHIP_HAVE_CONFIG_H -//#include -//#endif // CHIP_HAVE_CONFIG_H +// #if CHIP_HAVE_CONFIG_H +// #include +// #endif // CHIP_HAVE_CONFIG_H #ifdef __cplusplus extern "C" { @@ -130,7 +130,7 @@ extern "C" { #define MBEDTLS_ERROR_C 1 -//#include "check_crypto_config.h" +// #include "check_crypto_config.h" #include "mbedtls/check_config.h" #include "mbedtls/config_psa.h" diff --git a/examples/platform/telink/util/src/ColorFormat.cpp b/examples/platform/telink/util/src/ColorFormat.cpp index b68b6ca926e009..0c92c9bc0a02e6 100644 --- a/examples/platform/telink/util/src/ColorFormat.cpp +++ b/examples/platform/telink/util/src/ColorFormat.cpp @@ -126,9 +126,9 @@ RgbColor_t XYToRgb(uint8_t Level, uint16_t currentX, uint16_t currentY) b = clamp(b, 0, 1); // these rgb values are in the range of 0 to 1, convert to limit of HW specific LED - rgb.r = (uint8_t)(r * 255); - rgb.g = (uint8_t)(g * 255); - rgb.b = (uint8_t)(b * 255); + rgb.r = (uint8_t) (r * 255); + rgb.g = (uint8_t) (g * 255); + rgb.b = (uint8_t) (b * 255); return rgb; } diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h index 01703fe335b6af..da1214d2995f6e 100644 --- a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h +++ b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h @@ -106,8 +106,8 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/pump-app/cc13x4_26x4/main/include/CHIPDeviceManager.h b/examples/pump-app/cc13x4_26x4/main/include/CHIPDeviceManager.h index 01703fe335b6af..da1214d2995f6e 100644 --- a/examples/pump-app/cc13x4_26x4/main/include/CHIPDeviceManager.h +++ b/examples/pump-app/cc13x4_26x4/main/include/CHIPDeviceManager.h @@ -106,8 +106,8 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks class DLL_EXPORT CHIPDeviceManager { public: - CHIPDeviceManager(const CHIPDeviceManager &) = delete; - CHIPDeviceManager(const CHIPDeviceManager &&) = delete; + CHIPDeviceManager(const CHIPDeviceManager &) = delete; + CHIPDeviceManager(const CHIPDeviceManager &&) = delete; CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete; static CHIPDeviceManager & GetInstance() diff --git a/examples/refrigerator-app/asr/src/AppTask.cpp b/examples/refrigerator-app/asr/src/AppTask.cpp index fb54a1f1c59503..7c1f82f73021d5 100644 --- a/examples/refrigerator-app/asr/src/AppTask.cpp +++ b/examples/refrigerator-app/asr/src/AppTask.cpp @@ -70,7 +70,7 @@ constexpr const uint8_t kTagFreezer const app::Clusters::Descriptor::Structs::SemanticTagStruct::Type refrigeratorTagList[] = { { .namespaceID = kNamespaceRefrigerator, .tag = kTagRefrigerator } }; const app::Clusters::Descriptor::Structs::SemanticTagStruct::Type freezerTagList[] = { { .namespaceID = kNamespaceRefrigerator, - .tag = kTagFreezer } }; + .tag = kTagFreezer } }; } // namespace void NetWorkCommissioningInstInit() diff --git a/examples/refrigerator-app/linux/main.cpp b/examples/refrigerator-app/linux/main.cpp index 820dbfbaa5b079..b8c57b9bb278af 100644 --- a/examples/refrigerator-app/linux/main.cpp +++ b/examples/refrigerator-app/linux/main.cpp @@ -40,7 +40,7 @@ constexpr const uint8_t kTagFreezer const Clusters::Descriptor::Structs::SemanticTagStruct::Type refrigeratorTagList[] = { { .namespaceID = kNamespaceRefrigerator, .tag = kTagRefrigerator } }; const Clusters::Descriptor::Structs::SemanticTagStruct::Type freezerTagList[] = { { .namespaceID = kNamespaceRefrigerator, - .tag = kTagFreezer } }; + .tag = kTagFreezer } }; } // namespace void ApplicationInit() diff --git a/examples/shell/cc13x4_26x4/include/CHIPProjectConfig.h b/examples/shell/cc13x4_26x4/include/CHIPProjectConfig.h index d362c297d07f14..dcbc5873a98605 100644 --- a/examples/shell/cc13x4_26x4/include/CHIPProjectConfig.h +++ b/examples/shell/cc13x4_26x4/include/CHIPProjectConfig.h @@ -71,7 +71,7 @@ * Enables synchronizing the device's real time clock with a remote CHIP Time service * using the CHIP Time Sync protocol. */ -//#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1 +// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1 /** * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE diff --git a/examples/shell/genio/src/main.cpp b/examples/shell/genio/src/main.cpp index 5d8262a590e9f4..7190fd232a0969 100644 --- a/examples/shell/genio/src/main.cpp +++ b/examples/shell/genio/src/main.cpp @@ -20,7 +20,7 @@ #include #include #include -//#include +// #include #include diff --git a/examples/shell/nxp/k32w/k32w0/include/FreeRTOSConfig.h b/examples/shell/nxp/k32w/k32w0/include/FreeRTOSConfig.h index f25e96df522d13..e9e79054721218 100644 --- a/examples/shell/nxp/k32w/k32w0/include/FreeRTOSConfig.h +++ b/examples/shell/nxp/k32w/k32w0/include/FreeRTOSConfig.h @@ -72,7 +72,7 @@ /* Memory allocation related definitions. */ #define configSUPPORT_STATIC_ALLOCATION 0 #define configSUPPORT_DYNAMIC_ALLOCATION 1 -#define configTOTAL_HEAP_SIZE ((size_t)(gTotalHeapSize_c)) +#define configTOTAL_HEAP_SIZE ((size_t) (gTotalHeapSize_c)) #define configAPPLICATION_ALLOCATED_HEAP 1 /* Hook function related definitions. */ diff --git a/examples/shell/openiotsdk/freertos-config/FreeRTOSConfig.h b/examples/shell/openiotsdk/freertos-config/FreeRTOSConfig.h index dfdc0ab14f06e0..7221ddf80b3f54 100644 --- a/examples/shell/openiotsdk/freertos-config/FreeRTOSConfig.h +++ b/examples/shell/openiotsdk/freertos-config/FreeRTOSConfig.h @@ -40,7 +40,7 @@ extern uint32_t SystemCoreClock; // Minimal stack size [words] <0-65535> // Stack for idle task and default task stack in words. // Default: 128 -#define configMINIMAL_STACK_SIZE ((uint16_t)(4 * 1024)) +#define configMINIMAL_STACK_SIZE ((uint16_t) (4 * 1024)) // Total heap size [bytes] <0-0xFFFFFFFF> // Heap memory size in bytes. diff --git a/examples/thermostat/silabs/src/ThermostatUI.cpp b/examples/thermostat/silabs/src/ThermostatUI.cpp index 26e15181585839..94a602ef6550bb 100644 --- a/examples/thermostat/silabs/src/ThermostatUI.cpp +++ b/examples/thermostat/silabs/src/ThermostatUI.cpp @@ -181,8 +181,8 @@ void ThermostatUI::DrawCurrentTemp(GLIB_Context_t * glibContext, int8_t temp, bo } // Print Current temp - tempArray[0] = (uint8_t)((temp / 10)); - tempArray[1] = (uint8_t)((temp % 10)); + tempArray[0] = (uint8_t) ((temp / 10)); + tempArray[1] = (uint8_t) ((temp % 10)); for (uint8_t ch = 0; ch < 2; ch++) { diff --git a/examples/tv-app/android/java/AppPlatformShellCommands-JNI.cpp b/examples/tv-app/android/java/AppPlatformShellCommands-JNI.cpp index ac54746b0aa8e8..2b85aa15eda4ac 100644 --- a/examples/tv-app/android/java/AppPlatformShellCommands-JNI.cpp +++ b/examples/tv-app/android/java/AppPlatformShellCommands-JNI.cpp @@ -367,7 +367,7 @@ JNI_METHOD(jstring, OnExecuteCommand)(JNIEnv * env, jobject, jobjectArray string // Fill in argv for (int i = 0; i < argc; i++) { - jstring string = (jstring)(env->GetObjectArrayElement(stringArray, i)); + jstring string = (jstring) (env->GetObjectArrayElement(stringArray, i)); argv[i] = (char *) env->GetStringUTFChars(string, 0); } @@ -378,7 +378,7 @@ JNI_METHOD(jstring, OnExecuteCommand)(JNIEnv * env, jobject, jobjectArray string for (int i = 0; i < argc; i++) { ChipLogProgress(DeviceLayer, " Value=%s ", argv[i]); - jstring string = (jstring)(env->GetObjectArrayElement(stringArray, i)); + jstring string = (jstring) (env->GetObjectArrayElement(stringArray, i)); env->ReleaseStringUTFChars(string, argv[i]); } diff --git a/examples/tv-app/android/java/JNIDACProvider.cpp b/examples/tv-app/android/java/JNIDACProvider.cpp index 2c4da223a5dbd3..3d8ea4fca5f371 100644 --- a/examples/tv-app/android/java/JNIDACProvider.cpp +++ b/examples/tv-app/android/java/JNIDACProvider.cpp @@ -110,7 +110,7 @@ CHIP_ERROR JNIDACProvider::GetJavaByteByMethod(jmethodID method, const ByteSpan VerifyOrReturnLogError(method != nullptr, CHIP_ERROR_INCORRECT_STATE); VerifyOrReturnLogError(env != nullptr, CHIP_JNI_ERROR_NO_ENV); - jbyteArray in_buffer_jbyteArray = env->NewByteArray((jsize)(in_buffer.size())); + jbyteArray in_buffer_jbyteArray = env->NewByteArray((jsize) (in_buffer.size())); env->SetByteArrayRegion(in_buffer_jbyteArray, 0, (int) in_buffer.size(), reinterpret_cast(in_buffer.data())); jbyteArray outArray = (jbyteArray) env->CallObjectMethod(mJNIDACProviderObject, method, in_buffer_jbyteArray); diff --git a/examples/tv-app/openiotsdk/freertos-config/FreeRTOSConfig.h b/examples/tv-app/openiotsdk/freertos-config/FreeRTOSConfig.h index 9efedc9f133712..b05f59c2578e68 100644 --- a/examples/tv-app/openiotsdk/freertos-config/FreeRTOSConfig.h +++ b/examples/tv-app/openiotsdk/freertos-config/FreeRTOSConfig.h @@ -40,12 +40,12 @@ extern uint32_t SystemCoreClock; // Minimal stack size [words] <0-65535> // Stack for idle task and default task stack in words. // Default: 4kB -#define configMINIMAL_STACK_SIZE ((uint16_t)(4 * 1024)) +#define configMINIMAL_STACK_SIZE ((uint16_t) (4 * 1024)) // Total heap size [bytes] <0-0xFFFFFFFF> // Heap memory size in bytes. // Default: 32kB -#define configTOTAL_HEAP_SIZE ((size_t)(32 * 1024)) +#define configTOTAL_HEAP_SIZE ((size_t) (32 * 1024)) // Kernel tick frequency [Hz] <0-0xFFFFFFFF> // Kernel tick rate in Hz. diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/JNIDACProvider.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/JNIDACProvider.cpp index 2c4da223a5dbd3..3d8ea4fca5f371 100644 --- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/JNIDACProvider.cpp +++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/JNIDACProvider.cpp @@ -110,7 +110,7 @@ CHIP_ERROR JNIDACProvider::GetJavaByteByMethod(jmethodID method, const ByteSpan VerifyOrReturnLogError(method != nullptr, CHIP_ERROR_INCORRECT_STATE); VerifyOrReturnLogError(env != nullptr, CHIP_JNI_ERROR_NO_ENV); - jbyteArray in_buffer_jbyteArray = env->NewByteArray((jsize)(in_buffer.size())); + jbyteArray in_buffer_jbyteArray = env->NewByteArray((jsize) (in_buffer.size())); env->SetByteArrayRegion(in_buffer_jbyteArray, 0, (int) in_buffer.size(), reinterpret_cast(in_buffer.data())); jbyteArray outArray = (jbyteArray) env->CallObjectMethod(mJNIDACProviderObject, method, in_buffer_jbyteArray); diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingApp.h b/examples/tv-casting-app/tv-casting-common/core/CastingApp.h index e66283c3fb1c9d..25312daaa4cecf 100644 --- a/examples/tv-casting-app/tv-casting-common/core/CastingApp.h +++ b/examples/tv-casting-app/tv-casting-common/core/CastingApp.h @@ -71,7 +71,7 @@ class CastingApp CastingApp(); static CastingApp * _castingApp; - CastingApp(CastingApp & other) = delete; + CastingApp(CastingApp & other) = delete; void operator=(const CastingApp &) = delete; /** diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.h b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.h index 1c2d3fe1c71033..2fd156267e4d24 100644 --- a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.h +++ b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.h @@ -86,7 +86,7 @@ class CastingPlayerDiscovery static CastingPlayerDiscovery * _castingPlayerDiscovery; CastingPlayerDiscovery(CastingPlayerDiscovery & other) = delete; - void operator=(const CastingPlayerDiscovery &) = delete; + void operator=(const CastingPlayerDiscovery &) = delete; chip::Controller::CommissionableNodeController mCommissionableNodeController; CastingPlayerDiscoveryState mState = DISCOVERY_NOT_READY; diff --git a/examples/tv-casting-app/tv-casting-common/include/CastingServer.h b/examples/tv-casting-app/tv-casting-common/include/CastingServer.h index f6078dd1a855f1..bf85e98f0d83c2 100644 --- a/examples/tv-casting-app/tv-casting-common/include/CastingServer.h +++ b/examples/tv-casting-app/tv-casting-common/include/CastingServer.h @@ -50,7 +50,7 @@ inline constexpr chip::System::Clock::Seconds16 kCommissioningWindowTimeout = ch class CastingServer : public AppDelegate { public: - CastingServer(CastingServer & other) = delete; + CastingServer(CastingServer & other) = delete; void operator=(const CastingServer &) = delete; static CastingServer * GetInstance(); diff --git a/examples/window-app/silabs/src/LcdPainter.cpp b/examples/window-app/silabs/src/LcdPainter.cpp index e1a8041f075c79..d41f22ca095bc7 100644 --- a/examples/window-app/silabs/src/LcdPainter.cpp +++ b/examples/window-app/silabs/src/LcdPainter.cpp @@ -141,12 +141,12 @@ uint8_t IconPainter::Color(uint32_t x, uint32_t y) uint8_t VerticalShadePainter::Color(uint32_t x, uint32_t y) { - return (y % 2) && y < (uint32_t)(LCD_FRAME_SIZE + mLift); + return (y % 2) && y < (uint32_t) (LCD_FRAME_SIZE + mLift); } uint8_t HorizontalShadePainter::Color(uint32_t x, uint32_t y) { - return (x % 2) && x < (uint32_t)(LCD_FRAME_SIZE + mLift); + return (x % 2) && x < (uint32_t) (LCD_FRAME_SIZE + mLift); } VerticalBlindPainter::VerticalBlindPainter(uint16_t lift, uint16_t tilt) : PixelPainter(lift, tilt) diff --git a/src/access/AccessControl.cpp b/src/access/AccessControl.cpp index 0fbda8803968f7..88d7d34cb81109 100644 --- a/src/access/AccessControl.cpp +++ b/src/access/AccessControl.cpp @@ -330,7 +330,9 @@ CHIP_ERROR AccessControl::Check(const SubjectDescriptor & subjectDescriptor, con { #if CHIP_CONFIG_ACCESS_CONTROL_POLICY_LOGGING_VERBOSITY > 0 ChipLogProgress(DataManagement, "AccessControl: %s (delegate)", - (result == CHIP_NO_ERROR) ? "allowed" : (result == CHIP_ERROR_ACCESS_DENIED) ? "denied" : "error"); + (result == CHIP_NO_ERROR) ? "allowed" + : (result == CHIP_ERROR_ACCESS_DENIED) ? "denied" + : "error"); #else if (result != CHIP_NO_ERROR) { diff --git a/src/access/AccessControl.h b/src/access/AccessControl.h index 95675845f7f704..6186c33d44597a 100644 --- a/src/access/AccessControl.h +++ b/src/access/AccessControl.h @@ -71,7 +71,7 @@ class AccessControl public: Delegate() = default; - Delegate(const Delegate &) = delete; + Delegate(const Delegate &) = delete; Delegate & operator=(const Delegate &) = delete; virtual ~Delegate() = default; @@ -118,7 +118,7 @@ class AccessControl return *this; } - Entry(const Entry &) = delete; + Entry(const Entry &) = delete; Entry & operator=(const Entry &) = delete; ~Entry() { mDelegate->Release(); } @@ -245,7 +245,7 @@ class AccessControl public: Delegate() = default; - Delegate(const Delegate &) = delete; + Delegate(const Delegate &) = delete; Delegate & operator=(const Delegate &) = delete; virtual ~Delegate() = default; @@ -257,7 +257,7 @@ class AccessControl EntryIterator() = default; - EntryIterator(const EntryIterator &) = delete; + EntryIterator(const EntryIterator &) = delete; EntryIterator & operator=(const EntryIterator &) = delete; ~EntryIterator() { mDelegate->Release(); } @@ -327,7 +327,7 @@ class AccessControl public: Delegate() = default; - Delegate(const Delegate &) = delete; + Delegate(const Delegate &) = delete; Delegate & operator=(const Delegate &) = delete; virtual ~Delegate() = default; @@ -400,7 +400,7 @@ class AccessControl AccessControl() = default; - AccessControl(const AccessControl &) = delete; + AccessControl(const AccessControl &) = delete; AccessControl & operator=(const AccessControl &) = delete; ~AccessControl() diff --git a/src/access/tests/TestAccessControl.cpp b/src/access/tests/TestAccessControl.cpp index 40e883b0666015..5775d535b713f6 100644 --- a/src/access/tests/TestAccessControl.cpp +++ b/src/access/tests/TestAccessControl.cpp @@ -779,8 +779,8 @@ constexpr EntryData entryData1[] = { .authMode = AuthMode::kGroup, .subjects = { kGroup2 }, .targets = { { .flags = Target::kCluster | Target::kEndpoint, .cluster = kLevelControlCluster, .endpoint = 1 }, - { .flags = Target::kCluster, .cluster = kOnOffCluster }, - { .flags = Target::kEndpoint, .endpoint = 2 } }, + { .flags = Target::kCluster, .cluster = kOnOffCluster }, + { .flags = Target::kEndpoint, .endpoint = 2 } }, }, { .fabricIndex = 1, diff --git a/src/app/ClusterStateCache.h b/src/app/ClusterStateCache.h index 9bd1cb38dab242..9955dee0104edc 100644 --- a/src/app/ClusterStateCache.h +++ b/src/app/ClusterStateCache.h @@ -75,10 +75,10 @@ class ClusterStateCache : protected ReadClient::Callback Callback() = default; // Callbacks are not expected to be copyable or movable. - Callback(const Callback &) = delete; - Callback(Callback &&) = delete; + Callback(const Callback &) = delete; + Callback(Callback &&) = delete; Callback & operator=(const Callback &) = delete; - Callback & operator=(Callback &&) = delete; + Callback & operator=(Callback &&) = delete; /* * Called anytime an attribute value has changed in the cache @@ -112,10 +112,10 @@ class ClusterStateCache : protected ReadClient::Callback mHighestReceivedEventNumber = highestReceivedEventNumber; } - ClusterStateCache(const ClusterStateCache &) = delete; - ClusterStateCache(ClusterStateCache &&) = delete; + ClusterStateCache(const ClusterStateCache &) = delete; + ClusterStateCache(ClusterStateCache &&) = delete; ClusterStateCache & operator=(const ClusterStateCache &) = delete; - ClusterStateCache & operator=(ClusterStateCache &&) = delete; + ClusterStateCache & operator=(ClusterStateCache &&) = delete; void SetHighestReceivedEventNumber(EventNumber highestReceivedEventNumber) { diff --git a/src/app/ConcreteClusterPath.h b/src/app/ConcreteClusterPath.h index 52d646cc8815aa..6865fdb29a14c6 100644 --- a/src/app/ConcreteClusterPath.h +++ b/src/app/ConcreteClusterPath.h @@ -33,7 +33,7 @@ struct ConcreteClusterPath ConcreteClusterPath() {} - ConcreteClusterPath(const ConcreteClusterPath & aOther) = default; + ConcreteClusterPath(const ConcreteClusterPath & aOther) = default; ConcreteClusterPath & operator=(const ConcreteClusterPath & aOther) = default; bool IsValidConcreteClusterPath() const { return !(mEndpointId == kInvalidEndpointId || mClusterId == kInvalidClusterId); } diff --git a/src/app/ConcreteEventPath.h b/src/app/ConcreteEventPath.h index 3909b8429725d6..4403ef8181badf 100644 --- a/src/app/ConcreteEventPath.h +++ b/src/app/ConcreteEventPath.h @@ -35,7 +35,7 @@ struct ConcreteEventPath : public ConcreteClusterPath ConcreteEventPath() {} - ConcreteEventPath(const ConcreteEventPath & aOther) = default; + ConcreteEventPath(const ConcreteEventPath & aOther) = default; ConcreteEventPath & operator=(const ConcreteEventPath & aOther) = default; bool operator==(const ConcreteEventPath & aOther) const diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp index d1476c61035c38..541b0902ce90c9 100644 --- a/src/app/InteractionModelEngine.cpp +++ b/src/app/InteractionModelEngine.cpp @@ -643,7 +643,7 @@ Protocols::InteractionModel::Status InteractionModelEngine::OnReadInitialRequest { auto subjectDescriptor = apExchangeContext->GetSessionHandle()->AsSecureSession()->GetSubjectDescriptor(); err = ParseAttributePaths(subjectDescriptor, attributePathListParser, hasValidAttributePath, - requestedAttributePathCount); + requestedAttributePathCount); if (err != CHIP_NO_ERROR) { return Status::InvalidAction; diff --git a/src/app/MessageDef/MessageDefHelper.cpp b/src/app/MessageDef/MessageDefHelper.cpp index 64d1f20ac0b3d8..cffadddff6aa5a 100644 --- a/src/app/MessageDef/MessageDefHelper.cpp +++ b/src/app/MessageDef/MessageDefHelper.cpp @@ -56,7 +56,7 @@ void PrettyPrintIMBlankLine() if (sizeof(gLineBuffer) > gCurLineBufferSize) { size_t sizeLeft = sizeof(gLineBuffer) - gCurLineBufferSize; - size_t ret = (size_t)(snprintf(gLineBuffer + gCurLineBufferSize, sizeLeft, "\t")); + size_t ret = (size_t) (snprintf(gLineBuffer + gCurLineBufferSize, sizeLeft, "\t")); if (ret > 0) { gCurLineBufferSize += std::min(ret, sizeLeft); @@ -78,7 +78,7 @@ void PrettyPrintIM(bool aIsNewLine, const char * aFmt, ...) if (sizeof(gLineBuffer) > gCurLineBufferSize) { size_t sizeLeft = sizeof(gLineBuffer) - gCurLineBufferSize; - size_t ret = (size_t)(vsnprintf(gLineBuffer + gCurLineBufferSize, sizeLeft, aFmt, args)); + size_t ret = (size_t) (vsnprintf(gLineBuffer + gCurLineBufferSize, sizeLeft, aFmt, args)); if (ret > 0) { gCurLineBufferSize += std::min(ret, sizeLeft); diff --git a/src/app/ReadClient.h b/src/app/ReadClient.h index 8892b65236a5c0..2ecf84454f3e9d 100644 --- a/src/app/ReadClient.h +++ b/src/app/ReadClient.h @@ -76,10 +76,10 @@ class ReadClient : public Messaging::ExchangeDelegate Callback() = default; // Callbacks are not expected to be copyable or movable. - Callback(const Callback &) = delete; - Callback(Callback &&) = delete; + Callback(const Callback &) = delete; + Callback(Callback &&) = delete; Callback & operator=(const Callback &) = delete; - Callback & operator=(Callback &&) = delete; + Callback & operator=(Callback &&) = delete; virtual ~Callback() = default; diff --git a/src/app/clusters/bindings/BindingManager.cpp b/src/app/clusters/bindings/BindingManager.cpp index a84466cd17b90d..7243fdcfb3b744 100644 --- a/src/app/clusters/bindings/BindingManager.cpp +++ b/src/app/clusters/bindings/BindingManager.cpp @@ -48,9 +48,7 @@ BindingFabricTableDelegate gFabricTableDelegate; } // namespace -namespace { - -} // namespace +namespace {} // namespace namespace chip { diff --git a/src/app/clusters/operational-state-server/operational-state-server.h b/src/app/clusters/operational-state-server/operational-state-server.h index 0978f613723533..2e0875d8c904da 100644 --- a/src/app/clusters/operational-state-server/operational-state-server.h +++ b/src/app/clusters/operational-state-server/operational-state-server.h @@ -36,7 +36,7 @@ class Uncopyable ~Uncopyable() = default; private: - Uncopyable(const Uncopyable &) = delete; + Uncopyable(const Uncopyable &) = delete; Uncopyable & operator=(const Uncopyable &) = delete; }; diff --git a/src/app/clusters/resource-monitoring-server/resource-monitoring-server.h b/src/app/clusters/resource-monitoring-server/resource-monitoring-server.h index 80c6da82d37431..da17d36f0d2c3d 100644 --- a/src/app/clusters/resource-monitoring-server/resource-monitoring-server.h +++ b/src/app/clusters/resource-monitoring-server/resource-monitoring-server.h @@ -62,10 +62,10 @@ class Instance : public CommandHandlerInterface, public AttributeAccessInterface ~Instance() override; // Not copyable or movable - Instance(const Instance &) = delete; + Instance(const Instance &) = delete; Instance & operator=(const Instance &) = delete; Instance(Instance &&) = delete; - Instance & operator=(Instance &&) = delete; + Instance & operator=(Instance &&) = delete; /** * Initialise the Resource Monitoring cluster. diff --git a/src/app/dynamic_server/DynamicDispatcher.cpp b/src/app/dynamic_server/DynamicDispatcher.cpp index 05521627364d31..16edebd854e09e 100644 --- a/src/app/dynamic_server/DynamicDispatcher.cpp +++ b/src/app/dynamic_server/DynamicDispatcher.cpp @@ -350,8 +350,8 @@ bool emberAfEndpointIndexIsEnabled(uint16_t index) namespace { const CommandId acceptedCommands[] = { Clusters::OtaSoftwareUpdateProvider::Commands::QueryImage::Id, - Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Id, - Clusters::OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Id, kInvalidCommandId }; + Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Id, + Clusters::OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Id, kInvalidCommandId }; const CommandId generatedCommands[] = { Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::Id, Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::Id, kInvalidCommandId }; const EmberAfCluster otaProviderCluster{ diff --git a/src/app/server/Server.h b/src/app/server/Server.h index 2d9a78c58737b1..7c77c9122b0f33 100644 --- a/src/app/server/Server.h +++ b/src/app/server/Server.h @@ -96,7 +96,7 @@ struct ServerInitParams ServerInitParams() = default; // Not copyable - ServerInitParams(const ServerInitParams &) = delete; + ServerInitParams(const ServerInitParams &) = delete; ServerInitParams & operator=(const ServerInitParams &) = delete; // Application delegate to handle some commissioning lifecycle events @@ -178,7 +178,7 @@ struct CommonCaseDeviceServerInitParams : public ServerInitParams CommonCaseDeviceServerInitParams() = default; // Not copyable - CommonCaseDeviceServerInitParams(const CommonCaseDeviceServerInitParams &) = delete; + CommonCaseDeviceServerInitParams(const CommonCaseDeviceServerInitParams &) = delete; CommonCaseDeviceServerInitParams & operator=(const CommonCaseDeviceServerInitParams &) = delete; /** diff --git a/src/app/tests/TestBufferedReadCallback.cpp b/src/app/tests/TestBufferedReadCallback.cpp index 3504a778e9e8ed..363a81b00f4c84 100644 --- a/src/app/tests/TestBufferedReadCallback.cpp +++ b/src/app/tests/TestBufferedReadCallback.cpp @@ -488,7 +488,7 @@ void DataSeriesGenerator::Generate() path.mAttributeId = Clusters::UnitTesting::Attributes::ListInt8u::Id; path.mListOp = ConcreteDataAttributePath::ListOperation::AppendItem; - NL_TEST_ASSERT(gSuite, DataModel::Encode(writer, TLV::AnonymousTag(), (uint8_t)(i)) == CHIP_NO_ERROR); + NL_TEST_ASSERT(gSuite, DataModel::Encode(writer, TLV::AnonymousTag(), (uint8_t) (i)) == CHIP_NO_ERROR); writer.Finalize(&handle); reader.Init(std::move(handle)); diff --git a/src/app/tests/TestCommissionManager.cpp b/src/app/tests/TestCommissionManager.cpp index 73cf9423ef0838..a12ec42ec3c49a 100644 --- a/src/app/tests/TestCommissionManager.cpp +++ b/src/app/tests/TestCommissionManager.cpp @@ -137,7 +137,7 @@ void CheckCommissioningWindowManagerBasicWindowOpenCloseTask(intptr_t context) CommissioningWindowManager & commissionMgr = Server::GetInstance().GetCommissioningWindowManager(); CHIP_ERROR err = commissionMgr.OpenBasicCommissioningWindow(commissionMgr.MaxCommissioningTimeout(), - CommissioningWindowAdvertisement::kDnssdOnly); + CommissioningWindowAdvertisement::kDnssdOnly); NL_TEST_ASSERT(suite, err == CHIP_NO_ERROR); NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen()); NL_TEST_ASSERT(suite, diff --git a/src/app/tests/TestSimpleSubscriptionResumptionStorage.cpp b/src/app/tests/TestSimpleSubscriptionResumptionStorage.cpp index 5497fff30e2dd2..8725acd755afd9 100644 --- a/src/app/tests/TestSimpleSubscriptionResumptionStorage.cpp +++ b/src/app/tests/TestSimpleSubscriptionResumptionStorage.cpp @@ -125,7 +125,7 @@ void TestSubscriptionMaxCount(nlTestSuite * inSuite, void * inContext) // First set a large MaxCount before Init uint16_t countMaxToSave = 2 * CHIP_IM_MAX_NUM_SUBSCRIPTIONS; CHIP_ERROR err = storage.SyncSetKeyValue(chip::DefaultStorageKeyAllocator::SubscriptionResumptionMaxCount().KeyName(), - &countMaxToSave, sizeof(uint16_t)); + &countMaxToSave, sizeof(uint16_t)); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); // Then write something beyond CHIP_IM_MAX_NUM_SUBSCRIPTIONS diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp index 58730f19cb05d5..824df9835646f1 100644 --- a/src/app/util/attribute-storage.cpp +++ b/src/app/util/attribute-storage.cpp @@ -374,8 +374,8 @@ EmberAfStatus emAfClusterPreAttributeChangedCallback(const app::ConcreteAttribut EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; // Casting and calling a function pointer on the same line results in ignoring the return // of the call on gcc-arm-none-eabi-9-2019-q4-major - EmberAfClusterPreAttributeChangedCallback f = (EmberAfClusterPreAttributeChangedCallback)( - emberAfFindClusterFunction(cluster, CLUSTER_MASK_PRE_ATTRIBUTE_CHANGED_FUNCTION)); + EmberAfClusterPreAttributeChangedCallback f = (EmberAfClusterPreAttributeChangedCallback) (emberAfFindClusterFunction( + cluster, CLUSTER_MASK_PRE_ATTRIBUTE_CHANGED_FUNCTION)); if (f != nullptr) { status = f(attributePath, attributeType, size, value); diff --git a/src/app/util/attribute-storage.h b/src/app/util/attribute-storage.h index 16003affa26a95..f9aac9ee4491f5 100644 --- a/src/app/util/attribute-storage.h +++ b/src/app/util/attribute-storage.h @@ -17,7 +17,7 @@ #pragma once -//#include PLATFORM_HEADER +// #include PLATFORM_HEADER #include #include #include diff --git a/src/app/util/attribute-table.cpp b/src/app/util/attribute-table.cpp index a97dbbc6985645..a4829d5d98719d 100644 --- a/src/app/util/attribute-table.cpp +++ b/src/app/util/attribute-table.cpp @@ -314,7 +314,7 @@ EmberAfStatus emAfReadAttribute(EndpointId endpoint, ClusterId cluster, Attribut record.clusterId = cluster; record.attributeId = attributeID; status = emAfReadOrWriteAttribute(&record, &metadata, dataPtr, readLength, - false); // write? + false); // write? if (status == EMBER_ZCL_STATUS_SUCCESS) { diff --git a/src/app/util/mock/attribute-storage.cpp b/src/app/util/mock/attribute-storage.cpp index 98a905615d9a4e..19c774fa40b0a8 100644 --- a/src/app/util/mock/attribute-storage.cpp +++ b/src/app/util/mock/attribute-storage.cpp @@ -63,7 +63,7 @@ EndpointId endpoints[] = { kMockEndpoint1, kMockEndpoint2, kMockEndpoint3 }; uint16_t clusterIndex[] = { 0, 2, 5 }; uint8_t clusterCount[] = { 2, 3, 4 }; ClusterId clusters[] = { MockClusterId(1), MockClusterId(2), MockClusterId(1), MockClusterId(2), MockClusterId(3), - MockClusterId(1), MockClusterId(2), MockClusterId(3), MockClusterId(4) }; + MockClusterId(1), MockClusterId(2), MockClusterId(3), MockClusterId(4) }; uint16_t attributeIndex[] = { 0, 2, 5, 7, 11, 16, 19, 25, 27 }; uint16_t attributeCount[] = { 2, 3, 2, 4, 5, 3, 6, 2, 2 }; uint16_t eventIndex[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2 }; diff --git a/src/app/util/types_stub.h b/src/app/util/types_stub.h index 8544c2c6a07f27..96834abf279a10 100644 --- a/src/app/util/types_stub.h +++ b/src/app/util/types_stub.h @@ -211,16 +211,16 @@ typedef struct /** * @brief Returns the low byte of the 16-bit value \c n as an \c uint8_t. */ -#define EMBER_LOW_BYTE(n) ((uint8_t)((n) &0xFF)) +#define EMBER_LOW_BYTE(n) ((uint8_t) ((n) &0xFF)) /** * @brief Returns the high byte of the 16-bit value \c n as an \c uint8_t. */ -#define EMBER_HIGH_BYTE(n) ((uint8_t)(EMBER_LOW_BYTE((n) >> 8))) +#define EMBER_HIGH_BYTE(n) ((uint8_t) (EMBER_LOW_BYTE((n) >> 8))) /** * @brief Returns the low byte of the 32-bit value \c n as an \c uint8_t. */ -#define EMBER_BYTE_0(n) ((uint8_t)((n) &0xFF)) +#define EMBER_BYTE_0(n) ((uint8_t) ((n) &0xFF)) /** * @brief Returns the second byte of the 32-bit value \c n as an \c uint8_t. diff --git a/src/ble/BLEEndPoint.cpp b/src/ble/BLEEndPoint.cpp index 2f59291efcd4cd..8d68c68ec0b0d8 100644 --- a/src/ble/BLEEndPoint.cpp +++ b/src/ble/BLEEndPoint.cpp @@ -1375,10 +1375,10 @@ CHIP_ERROR BLEEndPoint::Receive(PacketBufferHandle && data) #endif // If we have a message received callback, and end point is not closing... if (mBleTransport != nullptr && mState != kState_Closing) - { - // Pass received message up the stack. - mBleTransport->OnEndPointMessageReceived(this, std::move(full_packet)); - } + { + // Pass received message up the stack. + mBleTransport->OnEndPointMessageReceived(this, std::move(full_packet)); + } } exit: diff --git a/src/controller/CHIPDeviceControllerFactory.h b/src/controller/CHIPDeviceControllerFactory.h index ad1376eca9d301..6b4aa77fdc00c8 100644 --- a/src/controller/CHIPDeviceControllerFactory.h +++ b/src/controller/CHIPDeviceControllerFactory.h @@ -169,7 +169,7 @@ class DeviceControllerFactory ~DeviceControllerFactory(); DeviceControllerFactory(DeviceControllerFactory const &) = delete; - void operator=(DeviceControllerFactory const &) = delete; + void operator=(DeviceControllerFactory const &) = delete; // // Some clients do not prefer a complete shutdown of the stack being initiated if diff --git a/src/controller/CurrentFabricRemover.cpp b/src/controller/CurrentFabricRemover.cpp index 805504cb3708e1..be89731b24d6ba 100644 --- a/src/controller/CurrentFabricRemover.cpp +++ b/src/controller/CurrentFabricRemover.cpp @@ -106,7 +106,7 @@ void CurrentFabricRemover::OnSuccessReadCurrentFabricIndex(void * context, Fabri self->mFabricIndex = fabricIndex; self->mNextStep = Step::kSendRemoveFabric; CHIP_ERROR err = self->mController->GetConnectedDevice(self->mRemoteNodeId, &self->mOnDeviceConnectedCallback, - &self->mOnDeviceConnectionFailureCallback); + &self->mOnDeviceConnectionFailureCallback); if (err != CHIP_NO_ERROR) { FinishRemoveCurrentFabric(context, err); diff --git a/src/controller/java/AndroidClusterExceptions.h b/src/controller/java/AndroidClusterExceptions.h index e0bdd07bab51e1..716076d1d81bdf 100644 --- a/src/controller/java/AndroidClusterExceptions.h +++ b/src/controller/java/AndroidClusterExceptions.h @@ -24,8 +24,8 @@ namespace chip { class AndroidClusterExceptions { public: - AndroidClusterExceptions(const AndroidClusterExceptions &) = delete; - AndroidClusterExceptions(const AndroidClusterExceptions &&) = delete; + AndroidClusterExceptions(const AndroidClusterExceptions &) = delete; + AndroidClusterExceptions(const AndroidClusterExceptions &&) = delete; AndroidClusterExceptions & operator=(const AndroidClusterExceptions &) = delete; static AndroidClusterExceptions & GetInstance() diff --git a/src/controller/java/AndroidControllerExceptions.h b/src/controller/java/AndroidControllerExceptions.h index 02ed39d4bbb447..c3fb6369eb3a44 100644 --- a/src/controller/java/AndroidControllerExceptions.h +++ b/src/controller/java/AndroidControllerExceptions.h @@ -24,8 +24,8 @@ namespace chip { class AndroidControllerExceptions { public: - AndroidControllerExceptions(const AndroidControllerExceptions &) = delete; - AndroidControllerExceptions(const AndroidControllerExceptions &&) = delete; + AndroidControllerExceptions(const AndroidControllerExceptions &) = delete; + AndroidControllerExceptions(const AndroidControllerExceptions &&) = delete; AndroidControllerExceptions & operator=(const AndroidControllerExceptions &) = delete; static AndroidControllerExceptions & GetInstance() diff --git a/src/controller/java/AndroidOperationalCredentialsIssuer.cpp b/src/controller/java/AndroidOperationalCredentialsIssuer.cpp index ddbf9052cd3f12..063ba5dfb6cdc3 100644 --- a/src/controller/java/AndroidOperationalCredentialsIssuer.cpp +++ b/src/controller/java/AndroidOperationalCredentialsIssuer.cpp @@ -307,7 +307,7 @@ CHIP_ERROR AndroidOperationalCredentialsIssuer::LocalGenerateNOCChain(const Byte jmethodID method; CHIP_ERROR err = CHIP_NO_ERROR; err = JniReferences::GetInstance().FindMethod(JniReferences::GetInstance().GetEnvForCurrentThread(), mJavaObjectRef, - "onOpCSRGenerationComplete", "([B)V", &method); + "onOpCSRGenerationComplete", "([B)V", &method); if (err != CHIP_NO_ERROR) { ChipLogError(Controller, "Error invoking onOpCSRGenerationComplete: %" CHIP_ERROR_FORMAT, err.Format()); diff --git a/src/controller/python/chip/native/CommonStackInit.cpp b/src/controller/python/chip/native/CommonStackInit.cpp index eb62dd90c0131b..2f12495e132a64 100644 --- a/src/controller/python/chip/native/CommonStackInit.cpp +++ b/src/controller/python/chip/native/CommonStackInit.cpp @@ -57,7 +57,7 @@ void pychip_CauseCrash() { uint8_t * ptr = nullptr; // NOLINTNEXTLINE(clang-analyzer-core.NullDereference): Intentionally trying to cause crash. - *ptr = 0; + *ptr = 0; } PyChipError pychip_CommonStackInit(const PyCommonStackInitParams * aParams) diff --git a/src/credentials/CHIPCertToX509.cpp b/src/credentials/CHIPCertToX509.cpp index 6342e90c0a7b99..85e75147458d62 100644 --- a/src/credentials/CHIPCertToX509.cpp +++ b/src/credentials/CHIPCertToX509.cpp @@ -469,7 +469,10 @@ static CHIP_ERROR DecodeConvertECDSASignature(TLVReader & reader, ASN1Writer & w // signatureValue BIT STRING // Per RFC3279, the ECDSA signature value is encoded in DER encapsulated in the signatureValue BIT STRING. - ASN1_START_BIT_STRING_ENCAPSULATED { ReturnErrorOnFailure(ConvertECDSASignatureRawToDER(certData.mSignature, writer)); } + ASN1_START_BIT_STRING_ENCAPSULATED + { + ReturnErrorOnFailure(ConvertECDSASignatureRawToDER(certData.mSignature, writer)); + } ASN1_END_ENCAPSULATED; exit: @@ -569,7 +572,10 @@ static CHIP_ERROR DecodeConvertCert(TLVReader & reader, ASN1Writer & writer, Chi // signatureAlgorithm AlgorithmIdentifier // AlgorithmIdentifier ::= SEQUENCE - ASN1_START_SEQUENCE { ASN1_ENCODE_OBJECT_ID(static_cast(certData.mSigAlgoOID)); } + ASN1_START_SEQUENCE + { + ASN1_ENCODE_OBJECT_ID(static_cast(certData.mSigAlgoOID)); + } ASN1_END_SEQUENCE; // signatureValue BIT STRING diff --git a/src/credentials/CertificationDeclaration.cpp b/src/credentials/CertificationDeclaration.cpp index 6b48bcfb8783bf..45b4831f43fb4f 100644 --- a/src/credentials/CertificationDeclaration.cpp +++ b/src/credentials/CertificationDeclaration.cpp @@ -470,7 +470,10 @@ CHIP_ERROR EncodeSignerInfo(const ByteSpan & signerKeyId, const P256ECDSASignatu ASN1_END_SEQUENCE; // signatureAlgorithm OBJECT IDENTIFIER ecdsa-with-SHA256 (1.2.840.10045.4.3.2) - ASN1_START_SEQUENCE { ASN1_ENCODE_OBJECT_ID(kOID_SigAlgo_ECDSAWithSHA256); } + ASN1_START_SEQUENCE + { + ASN1_ENCODE_OBJECT_ID(kOID_SigAlgo_ECDSAWithSHA256); + } ASN1_END_SEQUENCE; uint8_t asn1SignatureBuf[kMax_ECDSA_Signature_Length_Der]; diff --git a/src/credentials/DeviceAttestationCredsProvider.h b/src/credentials/DeviceAttestationCredsProvider.h index adfcc3323e4deb..a6735dcece15b2 100644 --- a/src/credentials/DeviceAttestationCredsProvider.h +++ b/src/credentials/DeviceAttestationCredsProvider.h @@ -29,7 +29,7 @@ class DeviceAttestationCredentialsProvider virtual ~DeviceAttestationCredentialsProvider() = default; // Not copyable - DeviceAttestationCredentialsProvider(const DeviceAttestationCredentialsProvider &) = delete; + DeviceAttestationCredentialsProvider(const DeviceAttestationCredentialsProvider &) = delete; DeviceAttestationCredentialsProvider & operator=(const DeviceAttestationCredentialsProvider &) = delete; /** diff --git a/src/credentials/FabricTable.h b/src/credentials/FabricTable.h index 608cc60edad079..688a6d6a612bc7 100644 --- a/src/credentials/FabricTable.h +++ b/src/credentials/FabricTable.h @@ -75,7 +75,7 @@ class DLL_EXPORT FabricInfo ~FabricInfo() { Reset(); } // Non-copyable - FabricInfo(FabricInfo const &) = delete; + FabricInfo(FabricInfo const &) = delete; void operator=(FabricInfo const &) = delete; // Returns a span into our internal storage. @@ -274,7 +274,7 @@ class ConstFabricIterator Advance(); } } - ConstFabricIterator(const ConstFabricIterator &) = default; + ConstFabricIterator(const ConstFabricIterator &) = default; ConstFabricIterator & operator=(const ConstFabricIterator &) = default; ConstFabricIterator & operator++() { return Advance(); } @@ -401,7 +401,7 @@ class DLL_EXPORT FabricTable ~FabricTable() = default; // Non-copyable - FabricTable(FabricTable const &) = delete; + FabricTable(FabricTable const &) = delete; void operator=(FabricTable const &) = delete; enum class AdvertiseIdentity : uint8_t diff --git a/src/credentials/GenerateChipX509Cert.cpp b/src/credentials/GenerateChipX509Cert.cpp index 7eb0a158f5c49d..86c7decf50e863 100644 --- a/src/credentials/GenerateChipX509Cert.cpp +++ b/src/credentials/GenerateChipX509Cert.cpp @@ -142,7 +142,10 @@ CHIP_ERROR EncodeKeyUsageExtension(uint16_t keyUsageBits, ASN1Writer & writer) // KeyUsage extension MUST be marked as critical. ASN1_ENCODE_BOOLEAN(true); - ASN1_START_OCTET_STRING_ENCAPSULATED { ASN1_ENCODE_BIT_STRING(keyUsageBits); } + ASN1_START_OCTET_STRING_ENCAPSULATED + { + ASN1_ENCODE_BIT_STRING(keyUsageBits); + } ASN1_END_ENCAPSULATED; } ASN1_END_SEQUENCE; @@ -348,7 +351,10 @@ CHIP_ERROR EncodeTBSCert(const X509CertRequestParams & requestParams, const Cryp ReturnErrorOnFailure(writer.PutInteger(requestParams.SerialNumber)); - ASN1_START_SEQUENCE { ASN1_ENCODE_OBJECT_ID(kOID_SigAlgo_ECDSAWithSHA256); } + ASN1_START_SEQUENCE + { + ASN1_ENCODE_OBJECT_ID(kOID_SigAlgo_ECDSAWithSHA256); + } ASN1_END_SEQUENCE; // issuer Name @@ -389,7 +395,10 @@ CHIP_ERROR NewChipX509Cert(const X509CertRequestParams & requestParams, const Cr { ReturnErrorOnFailure(EncodeTBSCert(requestParams, subjectPubkey, issuerKeypair.Pubkey(), writer)); - ASN1_START_SEQUENCE { ASN1_ENCODE_OBJECT_ID(kOID_SigAlgo_ECDSAWithSHA256); } + ASN1_START_SEQUENCE + { + ASN1_ENCODE_OBJECT_ID(kOID_SigAlgo_ECDSAWithSHA256); + } ASN1_END_SEQUENCE; ReturnErrorOnFailure(EncodeChipECDSASignature(signature, writer)); diff --git a/src/credentials/GroupDataProvider.h b/src/credentials/GroupDataProvider.h index 7d0665ce2fd6ce..71e55e0e550cd3 100644 --- a/src/credentials/GroupDataProvider.h +++ b/src/credentials/GroupDataProvider.h @@ -202,7 +202,7 @@ class GroupDataProvider virtual ~GroupDataProvider() = default; // Not copyable - GroupDataProvider(const GroupDataProvider &) = delete; + GroupDataProvider(const GroupDataProvider &) = delete; GroupDataProvider & operator=(const GroupDataProvider &) = delete; uint16_t GetMaxGroupsPerFabric() const { return mMaxGroupsPerFabric; } diff --git a/src/credentials/OperationalCertificateStore.h b/src/credentials/OperationalCertificateStore.h index 04ae4761c2c74e..6baa97139de9cd 100644 --- a/src/credentials/OperationalCertificateStore.h +++ b/src/credentials/OperationalCertificateStore.h @@ -281,7 +281,7 @@ class OpCertStoreTransaction // Non-copyable OpCertStoreTransaction(OpCertStoreTransaction const &) = delete; - void operator=(OpCertStoreTransaction const &) = delete; + void operator=(OpCertStoreTransaction const &) = delete; OperationalCertificateStore * operator->() { return &mStore; } diff --git a/src/credentials/PersistentStorageOpCertStore.h b/src/credentials/PersistentStorageOpCertStore.h index 41ddc096f861e3..f435c039341708 100644 --- a/src/credentials/PersistentStorageOpCertStore.h +++ b/src/credentials/PersistentStorageOpCertStore.h @@ -44,7 +44,7 @@ class PersistentStorageOpCertStore final : public OperationalCertificateStore // Non-copyable PersistentStorageOpCertStore(PersistentStorageOpCertStore const &) = delete; - void operator=(PersistentStorageOpCertStore const &) = delete; + void operator=(PersistentStorageOpCertStore const &) = delete; /** * @brief Initialize the certificate store to map to a given storage delegate. diff --git a/src/credentials/TestOnlyLocalCertificateAuthority.h b/src/credentials/TestOnlyLocalCertificateAuthority.h index 7ef7837dd24146..fb731f9fc98b2e 100644 --- a/src/credentials/TestOnlyLocalCertificateAuthority.h +++ b/src/credentials/TestOnlyLocalCertificateAuthority.h @@ -52,7 +52,7 @@ class TestOnlyLocalCertificateAuthority // Non-copyable TestOnlyLocalCertificateAuthority(TestOnlyLocalCertificateAuthority const &) = delete; - void operator=(TestOnlyLocalCertificateAuthority const &) = delete; + void operator=(TestOnlyLocalCertificateAuthority const &) = delete; TestOnlyLocalCertificateAuthority & Init() { diff --git a/src/credentials/attestation_verifier/DeviceAttestationVerifier.h b/src/credentials/attestation_verifier/DeviceAttestationVerifier.h index 0f32a91b206cdd..9465d934207d1d 100644 --- a/src/credentials/attestation_verifier/DeviceAttestationVerifier.h +++ b/src/credentials/attestation_verifier/DeviceAttestationVerifier.h @@ -126,7 +126,7 @@ class AttestationTrustStore virtual ~AttestationTrustStore() = default; // Not copyable - AttestationTrustStore(const AttestationTrustStore &) = delete; + AttestationTrustStore(const AttestationTrustStore &) = delete; AttestationTrustStore & operator=(const AttestationTrustStore &) = delete; /** @@ -164,7 +164,7 @@ class WellKnownKeysTrustStore virtual ~WellKnownKeysTrustStore() = default; // Not copyable - WellKnownKeysTrustStore(const WellKnownKeysTrustStore &) = delete; + WellKnownKeysTrustStore(const WellKnownKeysTrustStore &) = delete; WellKnownKeysTrustStore & operator=(const WellKnownKeysTrustStore &) = delete; /** @@ -266,7 +266,7 @@ class DeviceAttestationVerifier virtual ~DeviceAttestationVerifier() = default; // Not copyable - DeviceAttestationVerifier(const DeviceAttestationVerifier &) = delete; + DeviceAttestationVerifier(const DeviceAttestationVerifier &) = delete; DeviceAttestationVerifier & operator=(const DeviceAttestationVerifier &) = delete; struct AttestationInfo diff --git a/src/credentials/tests/CHIPCert_unit_test_vectors.cpp b/src/credentials/tests/CHIPCert_unit_test_vectors.cpp index 034079ec935ae1..44ee897120ae35 100644 --- a/src/credentials/tests/CHIPCert_unit_test_vectors.cpp +++ b/src/credentials/tests/CHIPCert_unit_test_vectors.cpp @@ -215,93 +215,93 @@ unsigned int UnitTest_NodeB1_crt_len = 265; // ======== Begin Generated Keys ======== unsigned char UnitTest_RootA_pem[] = { 0x04, 0x5b, 0xdd, 0x96, 0x58, 0x03, 0x5f, 0x6c, 0x26, 0x69, 0xe9, 0x27, 0xf0, 0xc1, - 0xab, 0xa0, 0x79, 0xd3, 0x23, 0x44, 0x83, 0xc1, 0x82, 0x39, 0x78, 0x4b, 0x1a, 0x0d, - 0x05, 0x7f, 0x62, 0xce, 0x72, 0x8c, 0xae, 0x3b, 0x9f, 0xef, 0x49, 0x18, 0xf0, 0xe8, - 0xe8, 0x3b, 0x6e, 0x98, 0x71, 0x81, 0x79, 0xb7, 0x8f, 0x66, 0x3a, 0x49, 0x0f, 0x7c, - 0x32, 0x0e, 0x5d, 0x8b, 0x7c, 0x76, 0x55, 0x6a, 0x2e, 0x88, 0x57, 0xb5, 0xf3, 0xa8, - 0xfa, 0xc4, 0x25, 0x86, 0x05, 0x18, 0x6c, 0xb7, 0xb7, 0xbf, 0x1f, 0x19, 0x06, 0x5d, - 0xd9, 0x65, 0x98, 0x65, 0xa7, 0x06, 0x0d, 0xeb, 0x94, 0xb5, 0x7b, 0x6d, 0xd5 }; + 0xab, 0xa0, 0x79, 0xd3, 0x23, 0x44, 0x83, 0xc1, 0x82, 0x39, 0x78, 0x4b, 0x1a, 0x0d, + 0x05, 0x7f, 0x62, 0xce, 0x72, 0x8c, 0xae, 0x3b, 0x9f, 0xef, 0x49, 0x18, 0xf0, 0xe8, + 0xe8, 0x3b, 0x6e, 0x98, 0x71, 0x81, 0x79, 0xb7, 0x8f, 0x66, 0x3a, 0x49, 0x0f, 0x7c, + 0x32, 0x0e, 0x5d, 0x8b, 0x7c, 0x76, 0x55, 0x6a, 0x2e, 0x88, 0x57, 0xb5, 0xf3, 0xa8, + 0xfa, 0xc4, 0x25, 0x86, 0x05, 0x18, 0x6c, 0xb7, 0xb7, 0xbf, 0x1f, 0x19, 0x06, 0x5d, + 0xd9, 0x65, 0x98, 0x65, 0xa7, 0x06, 0x0d, 0xeb, 0x94, 0xb5, 0x7b, 0x6d, 0xd5 }; unsigned int UnitTest_RootA_pem_len = 97; unsigned char UnitTest_RootB_pem[] = { 0x04, 0x66, 0x90, 0x7a, 0xd6, 0x68, 0xee, 0x8a, 0xc8, 0xbf, 0x9e, 0x98, 0xba, 0xdb, - 0x15, 0x47, 0x18, 0x4e, 0x82, 0x6e, 0x5a, 0x22, 0x41, 0x96, 0x27, 0xe8, 0x5f, 0xc7, - 0x47, 0xaf, 0x74, 0xe4, 0x47, 0x44, 0x46, 0x9a, 0x63, 0xed, 0x21, 0x5f, 0x66, 0x85, - 0x2d, 0x0d, 0xfc, 0x23, 0x07, 0x83, 0x74, 0x8c, 0x9e, 0x98, 0x80, 0xe5, 0xcc, 0xd9, - 0x79, 0xd0, 0x67, 0x27, 0xeb, 0x45, 0xb3, 0x81, 0x55, 0x93, 0xca, 0xfd, 0x1f, 0xac, - 0x51, 0x2f, 0xa8, 0x7c, 0xc5, 0x97, 0x42, 0xbb, 0x1f, 0x0f, 0xfa, 0xe1, 0xbf, 0xd4, - 0x49, 0xfd, 0xbc, 0xa8, 0x81, 0x44, 0x01, 0x4d, 0x4d, 0xed, 0x1e, 0x0d, 0x0d }; + 0x15, 0x47, 0x18, 0x4e, 0x82, 0x6e, 0x5a, 0x22, 0x41, 0x96, 0x27, 0xe8, 0x5f, 0xc7, + 0x47, 0xaf, 0x74, 0xe4, 0x47, 0x44, 0x46, 0x9a, 0x63, 0xed, 0x21, 0x5f, 0x66, 0x85, + 0x2d, 0x0d, 0xfc, 0x23, 0x07, 0x83, 0x74, 0x8c, 0x9e, 0x98, 0x80, 0xe5, 0xcc, 0xd9, + 0x79, 0xd0, 0x67, 0x27, 0xeb, 0x45, 0xb3, 0x81, 0x55, 0x93, 0xca, 0xfd, 0x1f, 0xac, + 0x51, 0x2f, 0xa8, 0x7c, 0xc5, 0x97, 0x42, 0xbb, 0x1f, 0x0f, 0xfa, 0xe1, 0xbf, 0xd4, + 0x49, 0xfd, 0xbc, 0xa8, 0x81, 0x44, 0x01, 0x4d, 0x4d, 0xed, 0x1e, 0x0d, 0x0d }; unsigned int UnitTest_RootB_pem_len = 97; unsigned char UnitTest_IA_A1_pem[] = { 0x04, 0x0b, 0x93, 0x13, 0x6f, 0xca, 0x1b, 0xc7, 0x38, 0x64, 0x5e, 0xc0, 0x80, 0x9e, - 0xaa, 0x07, 0xa7, 0x89, 0x99, 0x6b, 0x55, 0xfc, 0x65, 0xaa, 0xb1, 0x0c, 0x9f, 0xf9, - 0xa7, 0x6f, 0x07, 0x15, 0x78, 0xcf, 0x2f, 0xbd, 0xf4, 0xdc, 0x06, 0x82, 0xbb, 0x17, - 0xdb, 0xc9, 0x1e, 0x36, 0xa7, 0x2e, 0xa4, 0xc7, 0x44, 0xfe, 0xef, 0xf5, 0x34, 0xc3, - 0x44, 0x76, 0xda, 0xb4, 0xdb, 0xa2, 0xba, 0x03, 0xef, 0x57, 0x82, 0x57, 0x03, 0x46, - 0x65, 0x17, 0xa6, 0x97, 0xa7, 0x9e, 0x07, 0xb6, 0xe2, 0xdd, 0x74, 0xf5, 0x47, 0x02, - 0xb0, 0xb1, 0x9f, 0x5c, 0x38, 0x39, 0x9f, 0x7d, 0x45, 0xed, 0x21, 0xa2, 0x55 }; + 0xaa, 0x07, 0xa7, 0x89, 0x99, 0x6b, 0x55, 0xfc, 0x65, 0xaa, 0xb1, 0x0c, 0x9f, 0xf9, + 0xa7, 0x6f, 0x07, 0x15, 0x78, 0xcf, 0x2f, 0xbd, 0xf4, 0xdc, 0x06, 0x82, 0xbb, 0x17, + 0xdb, 0xc9, 0x1e, 0x36, 0xa7, 0x2e, 0xa4, 0xc7, 0x44, 0xfe, 0xef, 0xf5, 0x34, 0xc3, + 0x44, 0x76, 0xda, 0xb4, 0xdb, 0xa2, 0xba, 0x03, 0xef, 0x57, 0x82, 0x57, 0x03, 0x46, + 0x65, 0x17, 0xa6, 0x97, 0xa7, 0x9e, 0x07, 0xb6, 0xe2, 0xdd, 0x74, 0xf5, 0x47, 0x02, + 0xb0, 0xb1, 0x9f, 0x5c, 0x38, 0x39, 0x9f, 0x7d, 0x45, 0xed, 0x21, 0xa2, 0x55 }; unsigned int UnitTest_IA_A1_pem_len = 97; unsigned char UnitTest_IA_A2_pem[] = { 0x04, 0x56, 0x42, 0x98, 0x5c, 0x75, 0x68, 0x8c, 0x7e, 0xc3, 0x39, 0x8b, 0xf4, 0x1f, - 0xce, 0xa4, 0xb9, 0x8a, 0x3e, 0xd0, 0xa5, 0x8d, 0x14, 0x95, 0xb8, 0xf5, 0x39, 0x57, - 0x6d, 0x8c, 0xae, 0x3b, 0x7f, 0xa3, 0xb5, 0x27, 0xa7, 0xb4, 0x67, 0xa3, 0xd9, 0xbf, - 0x32, 0xd0, 0xae, 0xd4, 0x91, 0x6b, 0x35, 0xc4, 0x40, 0x9e, 0x48, 0x55, 0x5c, 0xa1, - 0x82, 0x2c, 0xec, 0x79, 0xfe, 0x65, 0xf9, 0x89, 0xdc, 0xff, 0x33, 0x15, 0x8f, 0xfa, - 0x10, 0x35, 0x4b, 0xac, 0xcc, 0x5f, 0xc3, 0x3c, 0x85, 0x43, 0x70, 0x92, 0x2f, 0xb5, - 0xd8, 0xd9, 0xea, 0x06, 0x7b, 0xa3, 0x14, 0xe9, 0xba, 0xbb, 0x4b, 0xd1, 0x4a }; + 0xce, 0xa4, 0xb9, 0x8a, 0x3e, 0xd0, 0xa5, 0x8d, 0x14, 0x95, 0xb8, 0xf5, 0x39, 0x57, + 0x6d, 0x8c, 0xae, 0x3b, 0x7f, 0xa3, 0xb5, 0x27, 0xa7, 0xb4, 0x67, 0xa3, 0xd9, 0xbf, + 0x32, 0xd0, 0xae, 0xd4, 0x91, 0x6b, 0x35, 0xc4, 0x40, 0x9e, 0x48, 0x55, 0x5c, 0xa1, + 0x82, 0x2c, 0xec, 0x79, 0xfe, 0x65, 0xf9, 0x89, 0xdc, 0xff, 0x33, 0x15, 0x8f, 0xfa, + 0x10, 0x35, 0x4b, 0xac, 0xcc, 0x5f, 0xc3, 0x3c, 0x85, 0x43, 0x70, 0x92, 0x2f, 0xb5, + 0xd8, 0xd9, 0xea, 0x06, 0x7b, 0xa3, 0x14, 0xe9, 0xba, 0xbb, 0x4b, 0xd1, 0x4a }; unsigned int UnitTest_IA_A2_pem_len = 97; unsigned char UnitTest_IA_B1_pem[] = { 0x04, 0x1e, 0x41, 0xba, 0xee, 0xbb, 0x08, 0x16, 0x58, 0xd4, 0x91, 0x78, 0x7c, 0x1b, - 0x1b, 0xea, 0x24, 0xb4, 0xc4, 0x14, 0x2f, 0x47, 0x86, 0xc3, 0x76, 0x13, 0xfb, 0xdb, - 0xdc, 0x1c, 0x65, 0xa9, 0xd0, 0xd2, 0x39, 0x7b, 0x2c, 0xa0, 0xa8, 0xfe, 0x2e, 0xee, - 0xcd, 0x35, 0xc0, 0xd6, 0x26, 0x9c, 0xc8, 0x34, 0x95, 0x44, 0xc8, 0xee, 0xf3, 0xe6, - 0x61, 0x39, 0xda, 0xc4, 0x84, 0x21, 0xbe, 0x1e, 0x89, 0xcd, 0x09, 0x80, 0x89, 0x25, - 0x72, 0x11, 0xfa, 0x6c, 0x5d, 0x81, 0x2c, 0xbc, 0x0e, 0xa7, 0x00, 0xa8, 0xb2, 0x40, - 0x56, 0x77, 0x97, 0xdc, 0xe5, 0xca, 0x56, 0xa2, 0xa4, 0x5a, 0x2b, 0xe6, 0xf3 }; + 0x1b, 0xea, 0x24, 0xb4, 0xc4, 0x14, 0x2f, 0x47, 0x86, 0xc3, 0x76, 0x13, 0xfb, 0xdb, + 0xdc, 0x1c, 0x65, 0xa9, 0xd0, 0xd2, 0x39, 0x7b, 0x2c, 0xa0, 0xa8, 0xfe, 0x2e, 0xee, + 0xcd, 0x35, 0xc0, 0xd6, 0x26, 0x9c, 0xc8, 0x34, 0x95, 0x44, 0xc8, 0xee, 0xf3, 0xe6, + 0x61, 0x39, 0xda, 0xc4, 0x84, 0x21, 0xbe, 0x1e, 0x89, 0xcd, 0x09, 0x80, 0x89, 0x25, + 0x72, 0x11, 0xfa, 0x6c, 0x5d, 0x81, 0x2c, 0xbc, 0x0e, 0xa7, 0x00, 0xa8, 0xb2, 0x40, + 0x56, 0x77, 0x97, 0xdc, 0xe5, 0xca, 0x56, 0xa2, 0xa4, 0x5a, 0x2b, 0xe6, 0xf3 }; unsigned int UnitTest_IA_B1_pem_len = 97; unsigned char UnitTest_NodeA1_pem[] = { 0x04, 0x38, 0x9b, 0x9e, 0xc4, 0x9e, 0x84, 0x48, 0xc0, 0x8f, 0x34, 0x14, 0x9c, 0x3e, - 0xa9, 0x47, 0xd1, 0x49, 0xe2, 0xbb, 0xf5, 0x93, 0x93, 0x47, 0x5f, 0xa9, 0x16, 0x71, - 0x3a, 0xc7, 0x81, 0xd2, 0x73, 0xf8, 0xb5, 0x29, 0xb2, 0x8f, 0xbe, 0xba, 0x1e, 0x3a, - 0x27, 0xd1, 0x42, 0x67, 0xd4, 0x0c, 0x5e, 0xa7, 0x25, 0x4b, 0x62, 0x57, 0x7d, 0x00, - 0x30, 0x30, 0x27, 0xd8, 0xa8, 0x4f, 0xa1, 0x11, 0xa0, 0xe7, 0x8e, 0xa5, 0x02, 0xbd, - 0xc4, 0x75, 0x3c, 0x0b, 0x87, 0x68, 0xd4, 0x3b, 0x68, 0x17, 0x40, 0xca, 0x29, 0xc4, - 0x41, 0x63, 0xaa, 0xb8, 0x3a, 0x26, 0xfa, 0xa3, 0xf1, 0x4a, 0x11, 0x30, 0xff }; + 0xa9, 0x47, 0xd1, 0x49, 0xe2, 0xbb, 0xf5, 0x93, 0x93, 0x47, 0x5f, 0xa9, 0x16, 0x71, + 0x3a, 0xc7, 0x81, 0xd2, 0x73, 0xf8, 0xb5, 0x29, 0xb2, 0x8f, 0xbe, 0xba, 0x1e, 0x3a, + 0x27, 0xd1, 0x42, 0x67, 0xd4, 0x0c, 0x5e, 0xa7, 0x25, 0x4b, 0x62, 0x57, 0x7d, 0x00, + 0x30, 0x30, 0x27, 0xd8, 0xa8, 0x4f, 0xa1, 0x11, 0xa0, 0xe7, 0x8e, 0xa5, 0x02, 0xbd, + 0xc4, 0x75, 0x3c, 0x0b, 0x87, 0x68, 0xd4, 0x3b, 0x68, 0x17, 0x40, 0xca, 0x29, 0xc4, + 0x41, 0x63, 0xaa, 0xb8, 0x3a, 0x26, 0xfa, 0xa3, 0xf1, 0x4a, 0x11, 0x30, 0xff }; unsigned int UnitTest_NodeA1_pem_len = 97; unsigned char UnitTest_NodeA2_pem[] = { 0x04, 0x5c, 0x1b, 0x09, 0xfc, 0x88, 0xf6, 0x2b, 0x91, 0xfa, 0xcb, 0x86, 0xef, 0x7d, - 0x79, 0x21, 0x09, 0x47, 0x06, 0xc9, 0xd9, 0x09, 0x8a, 0x2b, 0xa9, 0x39, 0x2b, 0xfc, - 0x2f, 0x57, 0x95, 0x96, 0xf2, 0xda, 0x1b, 0x79, 0x62, 0x52, 0xa9, 0xc6, 0xe4, 0x29, - 0xc6, 0x42, 0xe7, 0x21, 0xb4, 0x99, 0x24, 0x0f, 0x35, 0x04, 0xac, 0xcb, 0x84, 0x97, - 0x3a, 0xb7, 0xba, 0x80, 0xc9, 0xb8, 0x3f, 0x19, 0xc0, 0xfe, 0xd4, 0xd8, 0x1d, 0x30, - 0x3f, 0xb3, 0x04, 0x3a, 0xea, 0x3f, 0x8c, 0x80, 0xf8, 0x00, 0xb9, 0xd3, 0x60, 0x9f, - 0x22, 0x2f, 0xed, 0x19, 0xef, 0x82, 0x6b, 0x0d, 0xcd, 0xfa, 0x7d, 0x69, 0xe1 }; + 0x79, 0x21, 0x09, 0x47, 0x06, 0xc9, 0xd9, 0x09, 0x8a, 0x2b, 0xa9, 0x39, 0x2b, 0xfc, + 0x2f, 0x57, 0x95, 0x96, 0xf2, 0xda, 0x1b, 0x79, 0x62, 0x52, 0xa9, 0xc6, 0xe4, 0x29, + 0xc6, 0x42, 0xe7, 0x21, 0xb4, 0x99, 0x24, 0x0f, 0x35, 0x04, 0xac, 0xcb, 0x84, 0x97, + 0x3a, 0xb7, 0xba, 0x80, 0xc9, 0xb8, 0x3f, 0x19, 0xc0, 0xfe, 0xd4, 0xd8, 0x1d, 0x30, + 0x3f, 0xb3, 0x04, 0x3a, 0xea, 0x3f, 0x8c, 0x80, 0xf8, 0x00, 0xb9, 0xd3, 0x60, 0x9f, + 0x22, 0x2f, 0xed, 0x19, 0xef, 0x82, 0x6b, 0x0d, 0xcd, 0xfa, 0x7d, 0x69, 0xe1 }; unsigned int UnitTest_NodeA2_pem_len = 97; unsigned char UnitTest_NodeA3_pem[] = { 0x04, 0xdc, 0x86, 0xdf, 0x41, 0xfd, 0x7f, 0x64, 0x7b, 0x06, 0xf4, 0xc1, 0xaf, 0x96, - 0x97, 0xe8, 0x51, 0x85, 0x5b, 0x33, 0x6a, 0xeb, 0x04, 0x2b, 0x38, 0xf0, 0x2b, 0xec, - 0x46, 0x19, 0x1a, 0x92, 0x7a, 0xe8, 0x56, 0xec, 0xb3, 0x1e, 0x94, 0x81, 0x2e, 0x88, - 0xf0, 0xc3, 0xff, 0x25, 0xa0, 0x05, 0xfd, 0xcf, 0x65, 0xf7, 0xc2, 0x45, 0xbd, 0x5d, - 0xdc, 0xc0, 0xa7, 0x6d, 0x32, 0xac, 0xc0, 0xf0, 0xe2, 0xae, 0x05, 0x75, 0x7b, 0x88, - 0xeb, 0x87, 0x3b, 0x60, 0x68, 0x85, 0x60, 0xa4, 0xf8, 0x8b, 0xd1, 0x1c, 0x83, 0xa7, - 0xb9, 0x16, 0x34, 0x0a, 0xc2, 0xb1, 0xf8, 0x6f, 0x9f, 0xd9, 0x81, 0x3f, 0x82 }; + 0x97, 0xe8, 0x51, 0x85, 0x5b, 0x33, 0x6a, 0xeb, 0x04, 0x2b, 0x38, 0xf0, 0x2b, 0xec, + 0x46, 0x19, 0x1a, 0x92, 0x7a, 0xe8, 0x56, 0xec, 0xb3, 0x1e, 0x94, 0x81, 0x2e, 0x88, + 0xf0, 0xc3, 0xff, 0x25, 0xa0, 0x05, 0xfd, 0xcf, 0x65, 0xf7, 0xc2, 0x45, 0xbd, 0x5d, + 0xdc, 0xc0, 0xa7, 0x6d, 0x32, 0xac, 0xc0, 0xf0, 0xe2, 0xae, 0x05, 0x75, 0x7b, 0x88, + 0xeb, 0x87, 0x3b, 0x60, 0x68, 0x85, 0x60, 0xa4, 0xf8, 0x8b, 0xd1, 0x1c, 0x83, 0xa7, + 0xb9, 0x16, 0x34, 0x0a, 0xc2, 0xb1, 0xf8, 0x6f, 0x9f, 0xd9, 0x81, 0x3f, 0x82 }; unsigned int UnitTest_NodeA3_pem_len = 97; unsigned char UnitTest_NodeA4_pem[] = { 0x04, 0xe3, 0x64, 0xa0, 0xf1, 0xb0, 0x00, 0xfd, 0xb1, 0x0b, 0x10, 0x0d, 0xd3, 0xd3, - 0xa6, 0x89, 0x10, 0xb6, 0x01, 0xa1, 0xcf, 0xe7, 0x5d, 0xa2, 0x3b, 0x70, 0xc8, 0xa0, - 0x06, 0xe2, 0xbb, 0x0e, 0x6e, 0x34, 0x36, 0x9e, 0xce, 0xa2, 0x30, 0xc0, 0x55, 0xa8, - 0xfa, 0x6b, 0x83, 0x9f, 0x79, 0x41, 0x82, 0xbf, 0x4a, 0x85, 0xaf, 0x74, 0x0f, 0xc7, - 0xd4, 0x56, 0xa7, 0xdd, 0x3e, 0xc8, 0xca, 0x80, 0x2b, 0xd9, 0x21, 0x3c, 0x75, 0xad, - 0x13, 0xc3, 0xf5, 0xb8, 0x91, 0xed, 0x02, 0x41, 0x73, 0xd0, 0x77, 0x93, 0xdc, 0xab, - 0x41, 0xa2, 0x26, 0x8d, 0x94, 0xd9, 0x0c, 0xe5, 0x65, 0x08, 0xea, 0xfb, 0xdf }; + 0xa6, 0x89, 0x10, 0xb6, 0x01, 0xa1, 0xcf, 0xe7, 0x5d, 0xa2, 0x3b, 0x70, 0xc8, 0xa0, + 0x06, 0xe2, 0xbb, 0x0e, 0x6e, 0x34, 0x36, 0x9e, 0xce, 0xa2, 0x30, 0xc0, 0x55, 0xa8, + 0xfa, 0x6b, 0x83, 0x9f, 0x79, 0x41, 0x82, 0xbf, 0x4a, 0x85, 0xaf, 0x74, 0x0f, 0xc7, + 0xd4, 0x56, 0xa7, 0xdd, 0x3e, 0xc8, 0xca, 0x80, 0x2b, 0xd9, 0x21, 0x3c, 0x75, 0xad, + 0x13, 0xc3, 0xf5, 0xb8, 0x91, 0xed, 0x02, 0x41, 0x73, 0xd0, 0x77, 0x93, 0xdc, 0xab, + 0x41, 0xa2, 0x26, 0x8d, 0x94, 0xd9, 0x0c, 0xe5, 0x65, 0x08, 0xea, 0xfb, 0xdf }; unsigned int UnitTest_NodeA4_pem_len = 97; unsigned char UnitTest_NodeB1_pem[] = { 0x04, 0xd9, 0xd1, 0x5c, 0x74, 0xa0, 0x9c, 0x12, 0xff, 0xbd, 0x20, 0x54, 0xe9, 0xba, - 0xe5, 0xda, 0xaf, 0x5e, 0xb8, 0x0e, 0xc9, 0xd9, 0x96, 0x86, 0xfa, 0xdc, 0xb3, 0xbe, - 0xe4, 0x42, 0xa1, 0x19, 0x7a, 0xa1, 0xbf, 0x08, 0xc4, 0x90, 0x62, 0xff, 0x80, 0x6c, - 0xb8, 0xd1, 0xf3, 0xba, 0x4d, 0xd6, 0xe5, 0xe4, 0x6b, 0xab, 0x3c, 0x9d, 0x27, 0x39, - 0x73, 0xf5, 0xf8, 0xaf, 0x4c, 0x27, 0x0c, 0xf8, 0xd8, 0xc9, 0xfa, 0x18, 0x2e, 0x62, - 0xb5, 0xd0, 0x0d, 0xbd, 0x79, 0x50, 0x94, 0x1f, 0x49, 0xfb, 0x67, 0xfd, 0x74, 0x1f, - 0xa1, 0x3b, 0x65, 0xb2, 0xac, 0x47, 0xd8, 0x5e, 0x6f, 0x0c, 0x56, 0xfb, 0x49 }; + 0xe5, 0xda, 0xaf, 0x5e, 0xb8, 0x0e, 0xc9, 0xd9, 0x96, 0x86, 0xfa, 0xdc, 0xb3, 0xbe, + 0xe4, 0x42, 0xa1, 0x19, 0x7a, 0xa1, 0xbf, 0x08, 0xc4, 0x90, 0x62, 0xff, 0x80, 0x6c, + 0xb8, 0xd1, 0xf3, 0xba, 0x4d, 0xd6, 0xe5, 0xe4, 0x6b, 0xab, 0x3c, 0x9d, 0x27, 0x39, + 0x73, 0xf5, 0xf8, 0xaf, 0x4c, 0x27, 0x0c, 0xf8, 0xd8, 0xc9, 0xfa, 0x18, 0x2e, 0x62, + 0xb5, 0xd0, 0x0d, 0xbd, 0x79, 0x50, 0x94, 0x1f, 0x49, 0xfb, 0x67, 0xfd, 0x74, 0x1f, + 0xa1, 0x3b, 0x65, 0xb2, 0xac, 0x47, 0xd8, 0x5e, 0x6f, 0x0c, 0x56, 0xfb, 0x49 }; unsigned int UnitTest_NodeB1_pem_len = 97; // ======== End Generated Keys ======== diff --git a/src/credentials/tests/TestDeviceAttestationCredentials.cpp b/src/credentials/tests/TestDeviceAttestationCredentials.cpp index 7ad7d6cd30ad9e..c24b0468d90f5e 100644 --- a/src/credentials/tests/TestDeviceAttestationCredentials.cpp +++ b/src/credentials/tests/TestDeviceAttestationCredentials.cpp @@ -185,8 +185,8 @@ static void TestDACVerifierExample_AttestationInfoVerification(nlTestSuite * inS 0xda, 0x53, 0x63, 0x83, 0x74, 0xa0, 0x16, 0x71, 0xcf, 0x3d, 0x7d, 0xb8, 0xcc, 0x17, 0x0b, 0x38, 0x03, 0x45, 0xe6, 0x0b, 0xc8, 0x6f, 0xdf, 0x45, 0x9e }; uint8_t attestationNonceTestVector[] = { 0xe0, 0x42, 0x1b, 0x91, 0xc6, 0xfd, 0xcd, 0xb4, 0x0e, 0x2a, 0x4d, - 0x2c, 0xf3, 0x1d, 0xb2, 0xb4, 0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a, - 0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2 }; + 0x2c, 0xf3, 0x1d, 0xb2, 0xb4, 0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a, + 0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2 }; // Make sure default verifier exists and is not implemented on at least one method DeviceAttestationVerifier * default_verifier = GetDeviceAttestationVerifier(); @@ -310,16 +310,16 @@ static void TestDACVerifierExample_NocsrInformationVerification(nlTestSuite * in 0x72, 0x76, 0x65, 0x64, 0x33, 0x5f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x18, }; constexpr uint8_t attestationChallengeTestVector[] = { 0x7a, 0x49, 0x53, 0x05, 0xd0, 0x77, 0x79, 0xa4, - 0x94, 0xdd, 0x39, 0xa0, 0x85, 0x1b, 0x66, 0x0d }; + 0x94, 0xdd, 0x39, 0xa0, 0x85, 0x1b, 0x66, 0x0d }; constexpr uint8_t csrNonceTestVector[] = { 0x81, 0x4a, 0x4d, 0x4c, 0x1c, 0x4a, 0x8e, 0xbb, 0xea, 0xdb, 0x0a, - 0xe2, 0x82, 0xf9, 0x91, 0xeb, 0x13, 0xac, 0x5f, 0x9f, 0xce, 0x94, - 0x30, 0x93, 0x19, 0xaa, 0x94, 0x09, 0x6c, 0x8c, 0xd4, 0xb8 }; + 0xe2, 0x82, 0xf9, 0x91, 0xeb, 0x13, 0xac, 0x5f, 0x9f, 0xce, 0x94, + 0x30, 0x93, 0x19, 0xaa, 0x94, 0x09, 0x6c, 0x8c, 0xd4, 0xb8 }; constexpr uint8_t attestationSignatureTestVector[] = { 0x87, 0x8e, 0x46, 0xcf, 0xfa, 0x83, 0xc8, 0x32, 0x96, 0xeb, 0x27, - 0x2e, 0xbc, 0x37, 0x1c, 0x1f, 0xef, 0xee, 0x6d, 0x69, 0x54, 0xf3, - 0x78, 0x9f, 0xd3, 0xd2, 0x27, 0xe1, 0x64, 0x13, 0xd3, 0xd4, 0x75, - 0xa6, 0x2f, 0xd0, 0x12, 0xb9, 0x19, 0xd9, 0x95, 0x8b, 0xc7, 0x3d, - 0x7c, 0x63, 0xb3, 0xcc, 0x1e, 0xf2, 0xb6, 0x2c, 0x18, 0xe0, 0xcc, - 0x10, 0x2e, 0xd1, 0xba, 0x4d, 0xac, 0x85, 0xfe, 0xea }; + 0x2e, 0xbc, 0x37, 0x1c, 0x1f, 0xef, 0xee, 0x6d, 0x69, 0x54, 0xf3, + 0x78, 0x9f, 0xd3, 0xd2, 0x27, 0xe1, 0x64, 0x13, 0xd3, 0xd4, 0x75, + 0xa6, 0x2f, 0xd0, 0x12, 0xb9, 0x19, 0xd9, 0x95, 0x8b, 0xc7, 0x3d, + 0x7c, 0x63, 0xb3, 0xcc, 0x1e, 0xf2, 0xb6, 0x2c, 0x18, 0xe0, 0xcc, + 0x10, 0x2e, 0xd1, 0xba, 0x4d, 0xac, 0x85, 0xfe, 0xea }; constexpr uint8_t wrongAttestationSignatureTestVector[] = { /* added 1 to first index */ 0x88, 0x8e, 0x46, 0xcf, 0xfa, 0x83, 0xc8, 0x32, 0x96, 0xeb, 0x27, 0x2e, 0xbc, 0x37, 0x1c, 0x1f, diff --git a/src/credentials/tests/TestGroupDataProvider.cpp b/src/credentials/tests/TestGroupDataProvider.cpp index 1a56e7bf3f8b94..2f57e3fdb89cc4 100644 --- a/src/credentials/tests/TestGroupDataProvider.cpp +++ b/src/credentials/tests/TestGroupDataProvider.cpp @@ -1119,8 +1119,8 @@ void TestGroupDecryption(nlTestSuite * apSuite, void * apContext) const uint8_t kMessage[kMessageLength] = { 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9 }; const uint8_t nonce[13] = { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x18, 0x1a, 0x1b, 0x1c }; const uint8_t aad[40] = { 0x0a, 0x1a, 0x2a, 0x3a, 0x4a, 0x5a, 0x6a, 0x7a, 0x8a, 0x9a, 0x0b, 0x1b, 0x2b, 0x3b, - 0x4b, 0x5b, 0x6b, 0x7b, 0x8b, 0x9b, 0x0c, 0x1c, 0x2c, 0x3c, 0x4c, 0x5c, 0x6c, 0x7c, - 0x8c, 0x9c, 0x0d, 0x1d, 0x2d, 0x3d, 0x4d, 0x5d, 0x6d, 0x7d, 0x8d, 0x9d }; + 0x4b, 0x5b, 0x6b, 0x7b, 0x8b, 0x9b, 0x0c, 0x1c, 0x2c, 0x3c, 0x4c, 0x5c, 0x6c, 0x7c, + 0x8c, 0x9c, 0x0d, 0x1d, 0x2d, 0x3d, 0x4d, 0x5d, 0x6d, 0x7d, 0x8d, 0x9d }; uint8_t mic[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; diff --git a/src/crypto/CHIPCryptoPAL.h b/src/crypto/CHIPCryptoPAL.h index 5b661f189f2964..6f6bc6edf1984c 100644 --- a/src/crypto/CHIPCryptoPAL.h +++ b/src/crypto/CHIPCryptoPAL.h @@ -580,8 +580,8 @@ class Aes128KeyHandle Aes128KeyHandle(const Aes128KeyHandle &) = delete; Aes128KeyHandle(Aes128KeyHandle &&) = delete; - void operator=(const Aes128KeyHandle &) = delete; - void operator=(Aes128KeyHandle &&) = delete; + void operator=(const Aes128KeyHandle &) = delete; + void operator=(Aes128KeyHandle &&) = delete; /** * @brief Get internal context cast to the desired key representation diff --git a/src/crypto/CHIPCryptoPALOpenSSL.cpp b/src/crypto/CHIPCryptoPALOpenSSL.cpp index 317c2c9eeefda4..1854bebfb94ca4 100644 --- a/src/crypto/CHIPCryptoPALOpenSSL.cpp +++ b/src/crypto/CHIPCryptoPALOpenSSL.cpp @@ -198,7 +198,7 @@ CHIP_ERROR AES_CCM_encrypt(const uint8_t * plaintext, size_t plaintext_length, c VerifyOrExit(tag_length == CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES, error = CHIP_ERROR_INVALID_ARGUMENT); #else VerifyOrExit(tag_length == 8 || tag_length == 12 || tag_length == CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES, - error = CHIP_ERROR_INVALID_ARGUMENT); + error = CHIP_ERROR_INVALID_ARGUMENT); #endif // CHIP_CRYPTO_BORINGSSL #if CHIP_CRYPTO_BORINGSSL @@ -251,7 +251,7 @@ CHIP_ERROR AES_CCM_encrypt(const uint8_t * plaintext, size_t plaintext_length, c // Encrypt VerifyOrExit(CanCastTo(plaintext_length), error = CHIP_ERROR_INVALID_ARGUMENT); result = EVP_EncryptUpdate(context, Uint8::to_uchar(ciphertext), &bytesWritten, Uint8::to_const_uchar(plaintext), - static_cast(plaintext_length)); + static_cast(plaintext_length)); VerifyOrExit(result == 1, error = CHIP_ERROR_INTERNAL); VerifyOrExit((ciphertext_was_null && bytesWritten == 0) || (bytesWritten >= 0), error = CHIP_ERROR_INTERNAL); ciphertext_length = static_cast(bytesWritten); @@ -328,7 +328,7 @@ CHIP_ERROR AES_CCM_decrypt(const uint8_t * ciphertext, size_t ciphertext_length, VerifyOrExit(tag_length == CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES, error = CHIP_ERROR_INVALID_ARGUMENT); #else VerifyOrExit(tag_length == 8 || tag_length == 12 || tag_length == CHIP_CRYPTO_AEAD_MIC_LENGTH_BYTES, - error = CHIP_ERROR_INVALID_ARGUMENT); + error = CHIP_ERROR_INVALID_ARGUMENT); #endif // CHIP_CRYPTO_BORINGSSL VerifyOrExit(nonce != nullptr, error = CHIP_ERROR_INVALID_ARGUMENT); VerifyOrExit(nonce_length > 0, error = CHIP_ERROR_INVALID_ARGUMENT); @@ -362,7 +362,7 @@ CHIP_ERROR AES_CCM_decrypt(const uint8_t * ciphertext, size_t ciphertext_length, // we're writing the tag, not reading. VerifyOrExit(CanCastTo(tag_length), error = CHIP_ERROR_INVALID_ARGUMENT); result = EVP_CIPHER_CTX_ctrl(context, EVP_CTRL_CCM_SET_TAG, static_cast(tag_length), - const_cast(static_cast(tag))); + const_cast(static_cast(tag))); VerifyOrExit(result == 1, error = CHIP_ERROR_INTERNAL); // Pass in key + nonce @@ -388,7 +388,7 @@ CHIP_ERROR AES_CCM_decrypt(const uint8_t * ciphertext, size_t ciphertext_length, // Pass in ciphertext. We wont get anything if validation fails. VerifyOrExit(CanCastTo(ciphertext_length), error = CHIP_ERROR_INVALID_ARGUMENT); result = EVP_DecryptUpdate(context, Uint8::to_uchar(plaintext), &bytesOutput, Uint8::to_const_uchar(ciphertext), - static_cast(ciphertext_length)); + static_cast(ciphertext_length)); if (plaintext_was_null) { VerifyOrExit(bytesOutput <= static_cast(sizeof(placeholder_plaintext)), error = CHIP_ERROR_INTERNAL); diff --git a/src/crypto/PersistentStorageOperationalKeystore.h b/src/crypto/PersistentStorageOperationalKeystore.h index 1a6c08c4f8fb6e..e69983461a7432 100644 --- a/src/crypto/PersistentStorageOperationalKeystore.h +++ b/src/crypto/PersistentStorageOperationalKeystore.h @@ -44,7 +44,7 @@ class PersistentStorageOperationalKeystore : public Crypto::OperationalKeystore // Non-copyable PersistentStorageOperationalKeystore(PersistentStorageOperationalKeystore const &) = delete; - void operator=(PersistentStorageOperationalKeystore const &) = delete; + void operator=(PersistentStorageOperationalKeystore const &) = delete; /** * @brief Initialize the Operational Keystore to map to a given storage delegate. diff --git a/src/crypto/tests/AES_CCM_128_test_vectors.h b/src/crypto/tests/AES_CCM_128_test_vectors.h index 52911f5f4ff502..77b6e2ce365f42 100644 --- a/src/crypto/tests/AES_CCM_128_test_vectors.h +++ b/src/crypto/tests/AES_CCM_128_test_vectors.h @@ -50,7 +50,7 @@ struct ccm_128_test_vector static const uint8_t chiptest_dac9e1195a0d_pt_1[] = { 0xee }; static const uint8_t chiptest_dac9e1195a0d_aad_2[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_3[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_4[] = { 0x75, 0xc7, 0xc1, 0x23, 0xb3, 0x9b, 0x8a, 0x7e }; static const uint8_t chiptest_dac9e1195a0d_ct_5[] = { 0x74 }; static const uint8_t chiptest_dac9e1195a0d_tag_6[] = { 0x32, 0xf0, 0xc8, 0xf7, 0xdc, 0x07, 0x7c, 0xb8 }; @@ -71,7 +71,7 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_7 = { static const uint8_t chiptest_dac9e1195a0d_pt_8[] = { 0xee }; static const uint8_t chiptest_dac9e1195a0d_aad_9[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_10[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_11[] = { 0x75, 0xc7, 0xc1, 0x23, 0xb3, 0x9b, 0x8a, 0x7e }; static const uint8_t chiptest_dac9e1195a0d_ct_12[] = { 0x74 }; static const uint8_t chiptest_dac9e1195a0d_tag_13[] = { 0xc0, 0x1c, 0x51, 0x81, 0x8d, 0x2a, 0x93, 0x57, 0xb4, 0x69, 0x2b, 0x24 }; @@ -92,11 +92,11 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_14 = { static const uint8_t chiptest_dac9e1195a0d_pt_15[] = { 0xee }; static const uint8_t chiptest_dac9e1195a0d_aad_16[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_17[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_18[] = { 0x75, 0xc7, 0xc1, 0x23, 0xb3, 0x9b, 0x8a, 0x7e }; static const uint8_t chiptest_dac9e1195a0d_ct_19[] = { 0x74 }; static const uint8_t chiptest_dac9e1195a0d_tag_20[] = { 0x35, 0x5e, 0x27, 0x43, 0xb6, 0x79, 0x36, 0x94, - 0xca, 0x78, 0xd6, 0xd9, 0xc8, 0xdc, 0x14, 0x6c }; + 0xca, 0x78, 0xd6, 0xd9, 0xc8, 0xdc, 0x14, 0x6c }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_21 = { .pt = chiptest_dac9e1195a0d_pt_15, .pt_len = 1, .aad = chiptest_dac9e1195a0d_aad_16, @@ -114,7 +114,7 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_21 = { static const uint8_t chiptest_dac9e1195a0d_pt_22[] = { 0xcd }; static const uint8_t chiptest_dac9e1195a0d_aad_23[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_24[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_25[] = { 0x56, 0x59, 0x39, 0x7e, 0x06, 0x02, 0x8b, 0x14, 0x9d, 0x0b, 0x2b, 0x2b }; static const uint8_t chiptest_dac9e1195a0d_ct_26[] = { 0xf5 }; static const uint8_t chiptest_dac9e1195a0d_tag_27[] = { 0x24, 0x70, 0x9e, 0xaf, 0x87, 0x95, 0x80, 0xe8 }; @@ -135,7 +135,7 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_28 = { static const uint8_t chiptest_dac9e1195a0d_pt_29[] = { 0xcd }; static const uint8_t chiptest_dac9e1195a0d_aad_30[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_31[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_32[] = { 0x56, 0x59, 0x39, 0x7e, 0x06, 0x02, 0x8b, 0x14, 0x9d, 0x0b, 0x2b, 0x2b }; static const uint8_t chiptest_dac9e1195a0d_ct_33[] = { 0xf5 }; static const uint8_t chiptest_dac9e1195a0d_tag_34[] = { 0x9a, 0x23, 0xec, 0x3e, 0xac, 0xef, 0x72, 0xc2, 0x2c, 0x6a, 0x37, 0x08 }; @@ -156,11 +156,11 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_35 = { static const uint8_t chiptest_dac9e1195a0d_pt_36[] = { 0xcd }; static const uint8_t chiptest_dac9e1195a0d_aad_37[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_38[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_39[] = { 0x56, 0x59, 0x39, 0x7e, 0x06, 0x02, 0x8b, 0x14, 0x9d, 0x0b, 0x2b, 0x2b }; static const uint8_t chiptest_dac9e1195a0d_ct_40[] = { 0xf5 }; static const uint8_t chiptest_dac9e1195a0d_tag_41[] = { 0x9f, 0x5c, 0xd7, 0x4a, 0x83, 0x60, 0xc7, 0x76, - 0xe7, 0x16, 0x7d, 0xe2, 0xdb, 0xef, 0xac, 0x98 }; + 0xe7, 0x16, 0x7d, 0xe2, 0xdb, 0xef, 0xac, 0x98 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_42 = { .pt = chiptest_dac9e1195a0d_pt_36, .pt_len = 1, .aad = chiptest_dac9e1195a0d_aad_37, @@ -177,9 +177,9 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_42 = { .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_43[] = { 0xf4 }; static const uint8_t chiptest_dac9e1195a0d_aad_44[] = { 0xb3, 0x3f, 0xa8, 0xae, 0x4b, 0xc6, 0xea, 0xe4, - 0x5f, 0x28, 0x61, 0x9a, 0xc8, 0xd3, 0xae, 0x79 }; + 0x5f, 0x28, 0x61, 0x9a, 0xc8, 0xd3, 0xae, 0x79 }; static const uint8_t chiptest_dac9e1195a0d_key_45[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_46[] = { 0x6d, 0x4c, 0x91, 0x17, 0x0d, 0xc6, 0x21, 0x7e }; static const uint8_t chiptest_dac9e1195a0d_ct_47[] = { 0x7f }; static const uint8_t chiptest_dac9e1195a0d_tag_48[] = { 0xc6, 0x3e, 0x43, 0xfc, 0x80, 0x03, 0x60, 0xf5 }; @@ -199,9 +199,9 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_49 = { .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_50[] = { 0xf4 }; static const uint8_t chiptest_dac9e1195a0d_aad_51[] = { 0xb3, 0x3f, 0xa8, 0xae, 0x4b, 0xc6, 0xea, 0xe4, - 0x5f, 0x28, 0x61, 0x9a, 0xc8, 0xd3, 0xae, 0x79 }; + 0x5f, 0x28, 0x61, 0x9a, 0xc8, 0xd3, 0xae, 0x79 }; static const uint8_t chiptest_dac9e1195a0d_key_52[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_53[] = { 0x6d, 0x4c, 0x91, 0x17, 0x0d, 0xc6, 0x21, 0x7e }; static const uint8_t chiptest_dac9e1195a0d_ct_54[] = { 0x7f }; static const uint8_t chiptest_dac9e1195a0d_tag_55[] = { 0xcf, 0x3d, 0x2c, 0xe6, 0x3c, 0xf3, 0x38, 0x07, 0x67, 0x36, 0xd1, 0x1c }; @@ -221,13 +221,13 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_56 = { .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_57[] = { 0xf4 }; static const uint8_t chiptest_dac9e1195a0d_aad_58[] = { 0xb3, 0x3f, 0xa8, 0xae, 0x4b, 0xc6, 0xea, 0xe4, - 0x5f, 0x28, 0x61, 0x9a, 0xc8, 0xd3, 0xae, 0x79 }; + 0x5f, 0x28, 0x61, 0x9a, 0xc8, 0xd3, 0xae, 0x79 }; static const uint8_t chiptest_dac9e1195a0d_key_59[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_60[] = { 0x6d, 0x4c, 0x91, 0x17, 0x0d, 0xc6, 0x21, 0x7e }; static const uint8_t chiptest_dac9e1195a0d_ct_61[] = { 0x7f }; static const uint8_t chiptest_dac9e1195a0d_tag_62[] = { 0x08, 0x85, 0x6b, 0x4a, 0x5d, 0x73, 0x56, 0xc4, - 0xf0, 0x46, 0x3e, 0xa9, 0x0e, 0x3c, 0x36, 0x77 }; + 0xf0, 0x46, 0x3e, 0xa9, 0x0e, 0x3c, 0x36, 0x77 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_63 = { .pt = chiptest_dac9e1195a0d_pt_57, .pt_len = 1, .aad = chiptest_dac9e1195a0d_aad_58, @@ -244,9 +244,9 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_63 = { .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_64[] = { 0x38 }; static const uint8_t chiptest_dac9e1195a0d_aad_65[] = { 0xf4, 0xc7, 0xa8, 0x88, 0x22, 0x1e, 0xef, 0xf4, - 0xc8, 0x15, 0x51, 0xdc, 0x15, 0xd4, 0x10, 0xfb }; + 0xc8, 0x15, 0x51, 0xdc, 0x15, 0xd4, 0x10, 0xfb }; static const uint8_t chiptest_dac9e1195a0d_key_66[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_67[] = { 0x7f, 0xf3, 0x44, 0xc6, 0xb3, 0x64, 0xc4, 0x4e, 0x4f, 0xe0, 0xaa, 0xa7 }; static const uint8_t chiptest_dac9e1195a0d_ct_68[] = { 0x55 }; static const uint8_t chiptest_dac9e1195a0d_tag_69[] = { 0x4b, 0xae, 0xdd, 0xe7, 0xe8, 0xc1, 0x48, 0xed }; @@ -266,9 +266,9 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_70 = { .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_71[] = { 0x38 }; static const uint8_t chiptest_dac9e1195a0d_aad_72[] = { 0xf4, 0xc7, 0xa8, 0x88, 0x22, 0x1e, 0xef, 0xf4, - 0xc8, 0x15, 0x51, 0xdc, 0x15, 0xd4, 0x10, 0xfb }; + 0xc8, 0x15, 0x51, 0xdc, 0x15, 0xd4, 0x10, 0xfb }; static const uint8_t chiptest_dac9e1195a0d_key_73[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_74[] = { 0x7f, 0xf3, 0x44, 0xc6, 0xb3, 0x64, 0xc4, 0x4e, 0x4f, 0xe0, 0xaa, 0xa7 }; static const uint8_t chiptest_dac9e1195a0d_ct_75[] = { 0x55 }; static const uint8_t chiptest_dac9e1195a0d_tag_76[] = { 0xdd, 0x3a, 0x04, 0xbc, 0xe4, 0x50, 0xa7, 0xe9, 0x84, 0x26, 0xd2, 0x5c }; @@ -288,13 +288,13 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_77 = { .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_78[] = { 0x38 }; static const uint8_t chiptest_dac9e1195a0d_aad_79[] = { 0xf4, 0xc7, 0xa8, 0x88, 0x22, 0x1e, 0xef, 0xf4, - 0xc8, 0x15, 0x51, 0xdc, 0x15, 0xd4, 0x10, 0xfb }; + 0xc8, 0x15, 0x51, 0xdc, 0x15, 0xd4, 0x10, 0xfb }; static const uint8_t chiptest_dac9e1195a0d_key_80[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_81[] = { 0x7f, 0xf3, 0x44, 0xc6, 0xb3, 0x64, 0xc4, 0x4e, 0x4f, 0xe0, 0xaa, 0xa7 }; static const uint8_t chiptest_dac9e1195a0d_ct_82[] = { 0x55 }; static const uint8_t chiptest_dac9e1195a0d_tag_83[] = { 0x20, 0xc7, 0xb9, 0x71, 0xfb, 0xf3, 0x6f, 0x9c, - 0x44, 0x24, 0x78, 0x12, 0xd3, 0x99, 0xb1, 0x45 }; + 0x44, 0x24, 0x78, 0x12, 0xd3, 0x99, 0xb1, 0x45 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_84 = { .pt = chiptest_dac9e1195a0d_pt_78, .pt_len = 1, .aad = chiptest_dac9e1195a0d_aad_79, @@ -310,13 +310,13 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_84 = { .tcId = 12, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_85[] = { 0x86, 0x74, 0x64, 0xe5, 0x0b, 0xd4, 0x0d, 0x90, - 0xe1, 0x17, 0xa3, 0x2d, 0x4b, 0xd4, 0xe1, 0xe6 }; + 0xe1, 0x17, 0xa3, 0x2d, 0x4b, 0xd4, 0xe1, 0xe6 }; static const uint8_t chiptest_dac9e1195a0d_aad_86[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_87[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_88[] = { 0xf2, 0xf0, 0x11, 0x4f, 0xe7, 0x9a, 0x24, 0xfb }; static const uint8_t chiptest_dac9e1195a0d_ct_89[] = { 0x17, 0x8d, 0xfc, 0xe4, 0xe8, 0x7b, 0xeb, 0x87, - 0x63, 0xe3, 0xdd, 0xc8, 0x68, 0xfa, 0x73, 0x88 }; + 0x63, 0xe3, 0xdd, 0xc8, 0x68, 0xfa, 0x73, 0x88 }; static const uint8_t chiptest_dac9e1195a0d_tag_90[] = { 0x7f, 0x10, 0xcf, 0x6c, 0x9b, 0x22, 0xb3, 0x96 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_91 = { .pt = chiptest_dac9e1195a0d_pt_85, .pt_len = 16, @@ -333,38 +333,38 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_91 = { .tcId = 13, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_92[] = { 0x86, 0x74, 0x64, 0xe5, 0x0b, 0xd4, 0x0d, 0x90, - 0xe1, 0x17, 0xa3, 0x2d, 0x4b, 0xd4, 0xe1, 0xe6 }; + 0xe1, 0x17, 0xa3, 0x2d, 0x4b, 0xd4, 0xe1, 0xe6 }; static const uint8_t chiptest_dac9e1195a0d_aad_93[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_94[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_95[] = { 0xf2, 0xf0, 0x11, 0x4f, 0xe7, 0x9a, 0x24, 0xfb }; static const uint8_t chiptest_dac9e1195a0d_ct_96[] = { 0x17, 0x8d, 0xfc, 0xe4, 0xe8, 0x7b, 0xeb, 0x87, - 0x63, 0xe3, 0xdd, 0xc8, 0x68, 0xfa, 0x73, 0x88 }; + 0x63, 0xe3, 0xdd, 0xc8, 0x68, 0xfa, 0x73, 0x88 }; static const uint8_t chiptest_dac9e1195a0d_tag_97[] = { 0x6f, 0x4c, 0x9a, 0x68, 0x32, 0x37, 0x33, 0x1d, 0x6a, 0x98, 0x74, 0xbc }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_98 = { .pt = chiptest_dac9e1195a0d_pt_92, - .pt_len = 16, - .aad = chiptest_dac9e1195a0d_aad_93, - .aad_len = 0, - .key = chiptest_dac9e1195a0d_key_94, - .key_len = 16, - .nonce = chiptest_dac9e1195a0d_nonce_95, - .nonce_len = 8, - .ct = chiptest_dac9e1195a0d_ct_96, - .ct_len = 16, - .tag = chiptest_dac9e1195a0d_tag_97, - .tag_len = 12, - .tcId = 14, - .result = CHIP_NO_ERROR }; + .pt_len = 16, + .aad = chiptest_dac9e1195a0d_aad_93, + .aad_len = 0, + .key = chiptest_dac9e1195a0d_key_94, + .key_len = 16, + .nonce = chiptest_dac9e1195a0d_nonce_95, + .nonce_len = 8, + .ct = chiptest_dac9e1195a0d_ct_96, + .ct_len = 16, + .tag = chiptest_dac9e1195a0d_tag_97, + .tag_len = 12, + .tcId = 14, + .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_99[] = { 0x86, 0x74, 0x64, 0xe5, 0x0b, 0xd4, 0x0d, 0x90, - 0xe1, 0x17, 0xa3, 0x2d, 0x4b, 0xd4, 0xe1, 0xe6 }; + 0xe1, 0x17, 0xa3, 0x2d, 0x4b, 0xd4, 0xe1, 0xe6 }; static const uint8_t chiptest_dac9e1195a0d_aad_100[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_101[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_102[] = { 0xf2, 0xf0, 0x11, 0x4f, 0xe7, 0x9a, 0x24, 0xfb }; static const uint8_t chiptest_dac9e1195a0d_ct_103[] = { 0x17, 0x8d, 0xfc, 0xe4, 0xe8, 0x7b, 0xeb, 0x87, - 0x63, 0xe3, 0xdd, 0xc8, 0x68, 0xfa, 0x73, 0x88 }; + 0x63, 0xe3, 0xdd, 0xc8, 0x68, 0xfa, 0x73, 0x88 }; static const uint8_t chiptest_dac9e1195a0d_tag_104[] = { 0x7e, 0x04, 0x2a, 0x69, 0xd0, 0x1b, 0x87, 0x26, - 0xac, 0xe1, 0x31, 0xde, 0x34, 0x22, 0xc6, 0xae }; + 0xac, 0xe1, 0x31, 0xde, 0x34, 0x22, 0xc6, 0xae }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_105 = { .pt = chiptest_dac9e1195a0d_pt_99, .pt_len = 16, .aad = chiptest_dac9e1195a0d_aad_100, @@ -380,13 +380,13 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_105 = .tcId = 14, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_106[] = { 0xab, 0xf9, 0x8a, 0x73, 0x5c, 0xd5, 0x47, 0x8b, - 0x9d, 0x6d, 0x3d, 0xdf, 0x02, 0x56, 0x5a, 0xe0 }; + 0x9d, 0x6d, 0x3d, 0xdf, 0x02, 0x56, 0x5a, 0xe0 }; static const uint8_t chiptest_dac9e1195a0d_aad_107[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_108[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_109[] = { 0xc7, 0xcf, 0x09, 0xa8, 0xe2, 0x3b, 0xaa, 0xc1, 0xb6, 0x95, 0xc0, 0x42 }; static const uint8_t chiptest_dac9e1195a0d_ct_110[] = { 0xf8, 0x86, 0xc0, 0x74, 0xae, 0x03, 0xe9, 0x02, - 0xf3, 0x3d, 0x0c, 0x91, 0x9e, 0xd7, 0xb5, 0xee }; + 0xf3, 0x3d, 0x0c, 0x91, 0x9e, 0xd7, 0xb5, 0xee }; static const uint8_t chiptest_dac9e1195a0d_tag_111[] = { 0x44, 0x45, 0x35, 0xc9, 0x73, 0xc9, 0x2b, 0xbb }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_112 = { .pt = chiptest_dac9e1195a0d_pt_106, .pt_len = 16, @@ -403,13 +403,13 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_112 = .tcId = 15, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_113[] = { 0xab, 0xf9, 0x8a, 0x73, 0x5c, 0xd5, 0x47, 0x8b, - 0x9d, 0x6d, 0x3d, 0xdf, 0x02, 0x56, 0x5a, 0xe0 }; + 0x9d, 0x6d, 0x3d, 0xdf, 0x02, 0x56, 0x5a, 0xe0 }; static const uint8_t chiptest_dac9e1195a0d_aad_114[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_115[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_116[] = { 0xc7, 0xcf, 0x09, 0xa8, 0xe2, 0x3b, 0xaa, 0xc1, 0xb6, 0x95, 0xc0, 0x42 }; static const uint8_t chiptest_dac9e1195a0d_ct_117[] = { 0xf8, 0x86, 0xc0, 0x74, 0xae, 0x03, 0xe9, 0x02, - 0xf3, 0x3d, 0x0c, 0x91, 0x9e, 0xd7, 0xb5, 0xee }; + 0xf3, 0x3d, 0x0c, 0x91, 0x9e, 0xd7, 0xb5, 0xee }; static const uint8_t chiptest_dac9e1195a0d_tag_118[] = { 0xc9, 0xa7, 0x79, 0xa1, 0xaa, 0x43, 0x0c, 0x7a, 0x4a, 0x43, 0x2f, 0x49 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_119 = { .pt = chiptest_dac9e1195a0d_pt_113, .pt_len = 16, @@ -426,15 +426,15 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_119 = .tcId = 16, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_120[] = { 0xab, 0xf9, 0x8a, 0x73, 0x5c, 0xd5, 0x47, 0x8b, - 0x9d, 0x6d, 0x3d, 0xdf, 0x02, 0x56, 0x5a, 0xe0 }; + 0x9d, 0x6d, 0x3d, 0xdf, 0x02, 0x56, 0x5a, 0xe0 }; static const uint8_t chiptest_dac9e1195a0d_aad_121[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_122[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_123[] = { 0xc7, 0xcf, 0x09, 0xa8, 0xe2, 0x3b, 0xaa, 0xc1, 0xb6, 0x95, 0xc0, 0x42 }; static const uint8_t chiptest_dac9e1195a0d_ct_124[] = { 0xf8, 0x86, 0xc0, 0x74, 0xae, 0x03, 0xe9, 0x02, - 0xf3, 0x3d, 0x0c, 0x91, 0x9e, 0xd7, 0xb5, 0xee }; + 0xf3, 0x3d, 0x0c, 0x91, 0x9e, 0xd7, 0xb5, 0xee }; static const uint8_t chiptest_dac9e1195a0d_tag_125[] = { 0x1f, 0x5d, 0xdb, 0xdd, 0x5b, 0xcf, 0xc5, 0x4f, - 0x0c, 0xbc, 0xf4, 0x7f, 0x46, 0x34, 0x63, 0x67 }; + 0x0c, 0xbc, 0xf4, 0x7f, 0x46, 0x34, 0x63, 0x67 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_126 = { .pt = chiptest_dac9e1195a0d_pt_120, .pt_len = 16, .aad = chiptest_dac9e1195a0d_aad_121, @@ -450,14 +450,14 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_126 = .tcId = 17, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_127[] = { 0x0a, 0x61, 0xf2, 0xb4, 0xd6, 0x13, 0x5e, 0x2f, - 0x63, 0xd3, 0xae, 0x42, 0xc3, 0x08, 0x08, 0x3e }; + 0x63, 0xd3, 0xae, 0x42, 0xc3, 0x08, 0x08, 0x3e }; static const uint8_t chiptest_dac9e1195a0d_aad_128[] = { 0x2c, 0xa7, 0x1b, 0x23, 0x18, 0xdd, 0x96, 0xb2, - 0x43, 0xc8, 0x70, 0xa3, 0xdd, 0xa9, 0xfa, 0x0d }; + 0x43, 0xc8, 0x70, 0xa3, 0xdd, 0xa9, 0xfa, 0x0d }; static const uint8_t chiptest_dac9e1195a0d_key_129[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_130[] = { 0x60, 0x66, 0x73, 0x03, 0x90, 0xc3, 0xae, 0x06 }; static const uint8_t chiptest_dac9e1195a0d_ct_131[] = { 0xc2, 0xaf, 0x35, 0x3b, 0x99, 0x82, 0xc3, 0x9f, - 0x6d, 0x91, 0x4a, 0xef, 0x8c, 0xf4, 0x97, 0x19 }; + 0x6d, 0x91, 0x4a, 0xef, 0x8c, 0xf4, 0x97, 0x19 }; static const uint8_t chiptest_dac9e1195a0d_tag_132[] = { 0xce, 0xb1, 0x1e, 0x3a, 0x99, 0xeb, 0x3b, 0xcd }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_133 = { .pt = chiptest_dac9e1195a0d_pt_127, .pt_len = 16, @@ -474,14 +474,14 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_133 = .tcId = 18, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_134[] = { 0x0a, 0x61, 0xf2, 0xb4, 0xd6, 0x13, 0x5e, 0x2f, - 0x63, 0xd3, 0xae, 0x42, 0xc3, 0x08, 0x08, 0x3e }; + 0x63, 0xd3, 0xae, 0x42, 0xc3, 0x08, 0x08, 0x3e }; static const uint8_t chiptest_dac9e1195a0d_aad_135[] = { 0x2c, 0xa7, 0x1b, 0x23, 0x18, 0xdd, 0x96, 0xb2, - 0x43, 0xc8, 0x70, 0xa3, 0xdd, 0xa9, 0xfa, 0x0d }; + 0x43, 0xc8, 0x70, 0xa3, 0xdd, 0xa9, 0xfa, 0x0d }; static const uint8_t chiptest_dac9e1195a0d_key_136[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_137[] = { 0x60, 0x66, 0x73, 0x03, 0x90, 0xc3, 0xae, 0x06 }; static const uint8_t chiptest_dac9e1195a0d_ct_138[] = { 0xc2, 0xaf, 0x35, 0x3b, 0x99, 0x82, 0xc3, 0x9f, - 0x6d, 0x91, 0x4a, 0xef, 0x8c, 0xf4, 0x97, 0x19 }; + 0x6d, 0x91, 0x4a, 0xef, 0x8c, 0xf4, 0x97, 0x19 }; static const uint8_t chiptest_dac9e1195a0d_tag_139[] = { 0x54, 0x26, 0x39, 0x94, 0xd2, 0x41, 0xe4, 0xff, 0x06, 0x0c, 0xcb, 0x0f }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_140 = { .pt = chiptest_dac9e1195a0d_pt_134, .pt_len = 16, @@ -498,16 +498,16 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_140 = .tcId = 19, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_141[] = { 0x0a, 0x61, 0xf2, 0xb4, 0xd6, 0x13, 0x5e, 0x2f, - 0x63, 0xd3, 0xae, 0x42, 0xc3, 0x08, 0x08, 0x3e }; + 0x63, 0xd3, 0xae, 0x42, 0xc3, 0x08, 0x08, 0x3e }; static const uint8_t chiptest_dac9e1195a0d_aad_142[] = { 0x2c, 0xa7, 0x1b, 0x23, 0x18, 0xdd, 0x96, 0xb2, - 0x43, 0xc8, 0x70, 0xa3, 0xdd, 0xa9, 0xfa, 0x0d }; + 0x43, 0xc8, 0x70, 0xa3, 0xdd, 0xa9, 0xfa, 0x0d }; static const uint8_t chiptest_dac9e1195a0d_key_143[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_144[] = { 0x60, 0x66, 0x73, 0x03, 0x90, 0xc3, 0xae, 0x06 }; static const uint8_t chiptest_dac9e1195a0d_ct_145[] = { 0xc2, 0xaf, 0x35, 0x3b, 0x99, 0x82, 0xc3, 0x9f, - 0x6d, 0x91, 0x4a, 0xef, 0x8c, 0xf4, 0x97, 0x19 }; + 0x6d, 0x91, 0x4a, 0xef, 0x8c, 0xf4, 0x97, 0x19 }; static const uint8_t chiptest_dac9e1195a0d_tag_146[] = { 0x08, 0x68, 0x46, 0xcc, 0x2f, 0x72, 0xa4, 0x90, - 0x23, 0xc3, 0x0f, 0xc6, 0x9a, 0xac, 0x4b, 0x7f }; + 0x23, 0xc3, 0x0f, 0xc6, 0x9a, 0xac, 0x4b, 0x7f }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_147 = { .pt = chiptest_dac9e1195a0d_pt_141, .pt_len = 16, .aad = chiptest_dac9e1195a0d_aad_142, @@ -523,14 +523,14 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_147 = .tcId = 20, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_148[] = { 0x33, 0x23, 0x11, 0xb6, 0xae, 0xb2, 0x15, 0x2e, - 0xb8, 0x44, 0x59, 0x4f, 0x41, 0xf8, 0xec, 0x69 }; + 0xb8, 0x44, 0x59, 0x4f, 0x41, 0xf8, 0xec, 0x69 }; static const uint8_t chiptest_dac9e1195a0d_aad_149[] = { 0xa4, 0x08, 0xf7, 0x5d, 0xdc, 0x1a, 0x13, 0x31, - 0x3d, 0xfb, 0x35, 0x5f, 0x79, 0xcc, 0x36, 0x55 }; + 0x3d, 0xfb, 0x35, 0x5f, 0x79, 0xcc, 0x36, 0x55 }; static const uint8_t chiptest_dac9e1195a0d_key_150[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_151[] = { 0x63, 0x90, 0x36, 0xf0, 0xad, 0x89, 0x82, 0x51, 0x58, 0xb0, 0x49, 0xca }; static const uint8_t chiptest_dac9e1195a0d_ct_152[] = { 0x4f, 0x19, 0xc6, 0xa3, 0xbc, 0x09, 0x99, 0x34, - 0xe3, 0x5b, 0x32, 0x9b, 0x89, 0xa8, 0x5e, 0x18 }; + 0xe3, 0x5b, 0x32, 0x9b, 0x89, 0xa8, 0x5e, 0x18 }; static const uint8_t chiptest_dac9e1195a0d_tag_153[] = { 0x92, 0x62, 0xb1, 0x84, 0xe2, 0xec, 0xe1, 0xd4 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_154 = { .pt = chiptest_dac9e1195a0d_pt_148, .pt_len = 16, @@ -547,14 +547,14 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_154 = .tcId = 21, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_155[] = { 0x33, 0x23, 0x11, 0xb6, 0xae, 0xb2, 0x15, 0x2e, - 0xb8, 0x44, 0x59, 0x4f, 0x41, 0xf8, 0xec, 0x69 }; + 0xb8, 0x44, 0x59, 0x4f, 0x41, 0xf8, 0xec, 0x69 }; static const uint8_t chiptest_dac9e1195a0d_aad_156[] = { 0xa4, 0x08, 0xf7, 0x5d, 0xdc, 0x1a, 0x13, 0x31, - 0x3d, 0xfb, 0x35, 0x5f, 0x79, 0xcc, 0x36, 0x55 }; + 0x3d, 0xfb, 0x35, 0x5f, 0x79, 0xcc, 0x36, 0x55 }; static const uint8_t chiptest_dac9e1195a0d_key_157[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_158[] = { 0x63, 0x90, 0x36, 0xf0, 0xad, 0x89, 0x82, 0x51, 0x58, 0xb0, 0x49, 0xca }; static const uint8_t chiptest_dac9e1195a0d_ct_159[] = { 0x4f, 0x19, 0xc6, 0xa3, 0xbc, 0x09, 0x99, 0x34, - 0xe3, 0x5b, 0x32, 0x9b, 0x89, 0xa8, 0x5e, 0x18 }; + 0xe3, 0x5b, 0x32, 0x9b, 0x89, 0xa8, 0x5e, 0x18 }; static const uint8_t chiptest_dac9e1195a0d_tag_160[] = { 0x0c, 0xc2, 0xc1, 0x5e, 0x0e, 0x93, 0x5a, 0x64, 0x9a, 0xfe, 0x4c, 0xce }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_161 = { .pt = chiptest_dac9e1195a0d_pt_155, .pt_len = 16, @@ -571,16 +571,16 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_161 = .tcId = 22, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_162[] = { 0x33, 0x23, 0x11, 0xb6, 0xae, 0xb2, 0x15, 0x2e, - 0xb8, 0x44, 0x59, 0x4f, 0x41, 0xf8, 0xec, 0x69 }; + 0xb8, 0x44, 0x59, 0x4f, 0x41, 0xf8, 0xec, 0x69 }; static const uint8_t chiptest_dac9e1195a0d_aad_163[] = { 0xa4, 0x08, 0xf7, 0x5d, 0xdc, 0x1a, 0x13, 0x31, - 0x3d, 0xfb, 0x35, 0x5f, 0x79, 0xcc, 0x36, 0x55 }; + 0x3d, 0xfb, 0x35, 0x5f, 0x79, 0xcc, 0x36, 0x55 }; static const uint8_t chiptest_dac9e1195a0d_key_164[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_165[] = { 0x63, 0x90, 0x36, 0xf0, 0xad, 0x89, 0x82, 0x51, 0x58, 0xb0, 0x49, 0xca }; static const uint8_t chiptest_dac9e1195a0d_ct_166[] = { 0x4f, 0x19, 0xc6, 0xa3, 0xbc, 0x09, 0x99, 0x34, - 0xe3, 0x5b, 0x32, 0x9b, 0x89, 0xa8, 0x5e, 0x18 }; + 0xe3, 0x5b, 0x32, 0x9b, 0x89, 0xa8, 0x5e, 0x18 }; static const uint8_t chiptest_dac9e1195a0d_tag_167[] = { 0xbd, 0x90, 0x92, 0xa8, 0xdb, 0x2e, 0x78, 0x0b, - 0x5a, 0x93, 0xa0, 0xfb, 0xe3, 0x3a, 0x5a, 0x38 }; + 0x5a, 0x93, 0xa0, 0xfb, 0xe3, 0x3a, 0x5a, 0x38 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_168 = { .pt = chiptest_dac9e1195a0d_pt_162, .pt_len = 16, .aad = chiptest_dac9e1195a0d_aad_163, @@ -596,15 +596,15 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_168 = .tcId = 23, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_169[] = { 0x3b, 0xc5, 0xc4, 0xda, 0x04, 0xd8, 0xa5, 0x15, 0x67, 0x9c, 0x5c, - 0x40, 0xc0, 0xfd, 0x7d, 0x9e, 0x2b, 0x52, 0x22, 0x3f, 0xeb, 0x1f, - 0x61, 0x99, 0x78, 0xe7, 0xce, 0x84, 0xdc, 0x3f, 0xbe, 0x85, 0xf2 }; + 0x40, 0xc0, 0xfd, 0x7d, 0x9e, 0x2b, 0x52, 0x22, 0x3f, 0xeb, 0x1f, + 0x61, 0x99, 0x78, 0xe7, 0xce, 0x84, 0xdc, 0x3f, 0xbe, 0x85, 0xf2 }; static const uint8_t chiptest_dac9e1195a0d_aad_170[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_171[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_172[] = { 0x7b, 0x05, 0xbc, 0x8b, 0xcf, 0xc1, 0x6c, 0xc1 }; static const uint8_t chiptest_dac9e1195a0d_ct_173[] = { 0xf1, 0x46, 0xa7, 0xb0, 0xf4, 0xff, 0x02, 0x3a, 0x23, 0xc3, 0xfe, - 0xd5, 0x60, 0x4c, 0xdf, 0xe5, 0x09, 0x3e, 0x3c, 0x7b, 0x91, 0x4a, - 0x68, 0xa5, 0xab, 0xff, 0x1a, 0x14, 0x96, 0x1e, 0x82, 0xb3, 0xb9 }; + 0xd5, 0x60, 0x4c, 0xdf, 0xe5, 0x09, 0x3e, 0x3c, 0x7b, 0x91, 0x4a, + 0x68, 0xa5, 0xab, 0xff, 0x1a, 0x14, 0x96, 0x1e, 0x82, 0xb3, 0xb9 }; static const uint8_t chiptest_dac9e1195a0d_tag_174[] = { 0x32, 0x6f, 0xff, 0xcc, 0xce, 0x78, 0x97, 0x57 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_175 = { .pt = chiptest_dac9e1195a0d_pt_169, .pt_len = 33, @@ -621,15 +621,15 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_175 = .tcId = 24, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_176[] = { 0x3b, 0xc5, 0xc4, 0xda, 0x04, 0xd8, 0xa5, 0x15, 0x67, 0x9c, 0x5c, - 0x40, 0xc0, 0xfd, 0x7d, 0x9e, 0x2b, 0x52, 0x22, 0x3f, 0xeb, 0x1f, - 0x61, 0x99, 0x78, 0xe7, 0xce, 0x84, 0xdc, 0x3f, 0xbe, 0x85, 0xf2 }; + 0x40, 0xc0, 0xfd, 0x7d, 0x9e, 0x2b, 0x52, 0x22, 0x3f, 0xeb, 0x1f, + 0x61, 0x99, 0x78, 0xe7, 0xce, 0x84, 0xdc, 0x3f, 0xbe, 0x85, 0xf2 }; static const uint8_t chiptest_dac9e1195a0d_aad_177[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_178[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_179[] = { 0x7b, 0x05, 0xbc, 0x8b, 0xcf, 0xc1, 0x6c, 0xc1 }; static const uint8_t chiptest_dac9e1195a0d_ct_180[] = { 0xf1, 0x46, 0xa7, 0xb0, 0xf4, 0xff, 0x02, 0x3a, 0x23, 0xc3, 0xfe, - 0xd5, 0x60, 0x4c, 0xdf, 0xe5, 0x09, 0x3e, 0x3c, 0x7b, 0x91, 0x4a, - 0x68, 0xa5, 0xab, 0xff, 0x1a, 0x14, 0x96, 0x1e, 0x82, 0xb3, 0xb9 }; + 0xd5, 0x60, 0x4c, 0xdf, 0xe5, 0x09, 0x3e, 0x3c, 0x7b, 0x91, 0x4a, + 0x68, 0xa5, 0xab, 0xff, 0x1a, 0x14, 0x96, 0x1e, 0x82, 0xb3, 0xb9 }; static const uint8_t chiptest_dac9e1195a0d_tag_181[] = { 0x5d, 0xca, 0x99, 0xed, 0x22, 0x49, 0x97, 0x05, 0x48, 0x57, 0x6e, 0x8b }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_182 = { .pt = chiptest_dac9e1195a0d_pt_176, .pt_len = 33, @@ -646,17 +646,17 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_182 = .tcId = 25, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_183[] = { 0x3b, 0xc5, 0xc4, 0xda, 0x04, 0xd8, 0xa5, 0x15, 0x67, 0x9c, 0x5c, - 0x40, 0xc0, 0xfd, 0x7d, 0x9e, 0x2b, 0x52, 0x22, 0x3f, 0xeb, 0x1f, - 0x61, 0x99, 0x78, 0xe7, 0xce, 0x84, 0xdc, 0x3f, 0xbe, 0x85, 0xf2 }; + 0x40, 0xc0, 0xfd, 0x7d, 0x9e, 0x2b, 0x52, 0x22, 0x3f, 0xeb, 0x1f, + 0x61, 0x99, 0x78, 0xe7, 0xce, 0x84, 0xdc, 0x3f, 0xbe, 0x85, 0xf2 }; static const uint8_t chiptest_dac9e1195a0d_aad_184[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_185[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_186[] = { 0x7b, 0x05, 0xbc, 0x8b, 0xcf, 0xc1, 0x6c, 0xc1 }; static const uint8_t chiptest_dac9e1195a0d_ct_187[] = { 0xf1, 0x46, 0xa7, 0xb0, 0xf4, 0xff, 0x02, 0x3a, 0x23, 0xc3, 0xfe, - 0xd5, 0x60, 0x4c, 0xdf, 0xe5, 0x09, 0x3e, 0x3c, 0x7b, 0x91, 0x4a, - 0x68, 0xa5, 0xab, 0xff, 0x1a, 0x14, 0x96, 0x1e, 0x82, 0xb3, 0xb9 }; + 0xd5, 0x60, 0x4c, 0xdf, 0xe5, 0x09, 0x3e, 0x3c, 0x7b, 0x91, 0x4a, + 0x68, 0xa5, 0xab, 0xff, 0x1a, 0x14, 0x96, 0x1e, 0x82, 0xb3, 0xb9 }; static const uint8_t chiptest_dac9e1195a0d_tag_188[] = { 0x31, 0x4c, 0xc7, 0xf3, 0x36, 0x41, 0x54, 0x55, - 0xd8, 0xf5, 0xfb, 0x36, 0xea, 0x1b, 0x73, 0xd8 }; + 0xd8, 0xf5, 0xfb, 0x36, 0xea, 0x1b, 0x73, 0xd8 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_189 = { .pt = chiptest_dac9e1195a0d_pt_183, .pt_len = 33, .aad = chiptest_dac9e1195a0d_aad_184, @@ -672,15 +672,15 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_189 = .tcId = 26, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_190[] = { 0x58, 0x07, 0xa2, 0x32, 0x31, 0x77, 0xa6, 0xba, 0xc6, 0x77, 0x3c, - 0xd9, 0x28, 0x9b, 0xc1, 0x20, 0x14, 0xb8, 0x95, 0xa4, 0xbc, 0xa7, - 0x8f, 0x93, 0x50, 0x86, 0xe1, 0x49, 0x7a, 0x38, 0xcc, 0x02, 0x42 }; + 0xd9, 0x28, 0x9b, 0xc1, 0x20, 0x14, 0xb8, 0x95, 0xa4, 0xbc, 0xa7, + 0x8f, 0x93, 0x50, 0x86, 0xe1, 0x49, 0x7a, 0x38, 0xcc, 0x02, 0x42 }; static const uint8_t chiptest_dac9e1195a0d_aad_191[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_192[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_193[] = { 0xee, 0xbc, 0x7d, 0x0c, 0xce, 0x8d, 0x7f, 0xd6, 0xa5, 0x72, 0x6e, 0x49 }; static const uint8_t chiptest_dac9e1195a0d_ct_194[] = { 0xb4, 0x48, 0x21, 0x1c, 0x9d, 0xa8, 0xc3, 0x31, 0x6c, 0x52, 0x69, - 0xe5, 0xc4, 0xf6, 0x65, 0x78, 0x67, 0x3f, 0x1d, 0xfc, 0x03, 0x8a, - 0x4f, 0x3f, 0x13, 0x2c, 0x85, 0x76, 0x2a, 0x89, 0x32, 0x06, 0xd4 }; + 0xe5, 0xc4, 0xf6, 0x65, 0x78, 0x67, 0x3f, 0x1d, 0xfc, 0x03, 0x8a, + 0x4f, 0x3f, 0x13, 0x2c, 0x85, 0x76, 0x2a, 0x89, 0x32, 0x06, 0xd4 }; static const uint8_t chiptest_dac9e1195a0d_tag_195[] = { 0xae, 0x93, 0x77, 0x15, 0xa6, 0x5b, 0x80, 0xd5 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_196 = { .pt = chiptest_dac9e1195a0d_pt_190, .pt_len = 33, @@ -697,15 +697,15 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_196 = .tcId = 27, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_197[] = { 0x58, 0x07, 0xa2, 0x32, 0x31, 0x77, 0xa6, 0xba, 0xc6, 0x77, 0x3c, - 0xd9, 0x28, 0x9b, 0xc1, 0x20, 0x14, 0xb8, 0x95, 0xa4, 0xbc, 0xa7, - 0x8f, 0x93, 0x50, 0x86, 0xe1, 0x49, 0x7a, 0x38, 0xcc, 0x02, 0x42 }; + 0xd9, 0x28, 0x9b, 0xc1, 0x20, 0x14, 0xb8, 0x95, 0xa4, 0xbc, 0xa7, + 0x8f, 0x93, 0x50, 0x86, 0xe1, 0x49, 0x7a, 0x38, 0xcc, 0x02, 0x42 }; static const uint8_t chiptest_dac9e1195a0d_aad_198[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_199[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_200[] = { 0xee, 0xbc, 0x7d, 0x0c, 0xce, 0x8d, 0x7f, 0xd6, 0xa5, 0x72, 0x6e, 0x49 }; static const uint8_t chiptest_dac9e1195a0d_ct_201[] = { 0xb4, 0x48, 0x21, 0x1c, 0x9d, 0xa8, 0xc3, 0x31, 0x6c, 0x52, 0x69, - 0xe5, 0xc4, 0xf6, 0x65, 0x78, 0x67, 0x3f, 0x1d, 0xfc, 0x03, 0x8a, - 0x4f, 0x3f, 0x13, 0x2c, 0x85, 0x76, 0x2a, 0x89, 0x32, 0x06, 0xd4 }; + 0xe5, 0xc4, 0xf6, 0x65, 0x78, 0x67, 0x3f, 0x1d, 0xfc, 0x03, 0x8a, + 0x4f, 0x3f, 0x13, 0x2c, 0x85, 0x76, 0x2a, 0x89, 0x32, 0x06, 0xd4 }; static const uint8_t chiptest_dac9e1195a0d_tag_202[] = { 0xc4, 0xa7, 0xd3, 0x61, 0x19, 0xeb, 0x20, 0x96, 0xaf, 0x5b, 0x39, 0x73 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_203 = { .pt = chiptest_dac9e1195a0d_pt_197, .pt_len = 33, @@ -722,17 +722,17 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_203 = .tcId = 28, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_204[] = { 0x58, 0x07, 0xa2, 0x32, 0x31, 0x77, 0xa6, 0xba, 0xc6, 0x77, 0x3c, - 0xd9, 0x28, 0x9b, 0xc1, 0x20, 0x14, 0xb8, 0x95, 0xa4, 0xbc, 0xa7, - 0x8f, 0x93, 0x50, 0x86, 0xe1, 0x49, 0x7a, 0x38, 0xcc, 0x02, 0x42 }; + 0xd9, 0x28, 0x9b, 0xc1, 0x20, 0x14, 0xb8, 0x95, 0xa4, 0xbc, 0xa7, + 0x8f, 0x93, 0x50, 0x86, 0xe1, 0x49, 0x7a, 0x38, 0xcc, 0x02, 0x42 }; static const uint8_t chiptest_dac9e1195a0d_aad_205[] = {}; static const uint8_t chiptest_dac9e1195a0d_key_206[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_207[] = { 0xee, 0xbc, 0x7d, 0x0c, 0xce, 0x8d, 0x7f, 0xd6, 0xa5, 0x72, 0x6e, 0x49 }; static const uint8_t chiptest_dac9e1195a0d_ct_208[] = { 0xb4, 0x48, 0x21, 0x1c, 0x9d, 0xa8, 0xc3, 0x31, 0x6c, 0x52, 0x69, - 0xe5, 0xc4, 0xf6, 0x65, 0x78, 0x67, 0x3f, 0x1d, 0xfc, 0x03, 0x8a, - 0x4f, 0x3f, 0x13, 0x2c, 0x85, 0x76, 0x2a, 0x89, 0x32, 0x06, 0xd4 }; + 0xe5, 0xc4, 0xf6, 0x65, 0x78, 0x67, 0x3f, 0x1d, 0xfc, 0x03, 0x8a, + 0x4f, 0x3f, 0x13, 0x2c, 0x85, 0x76, 0x2a, 0x89, 0x32, 0x06, 0xd4 }; static const uint8_t chiptest_dac9e1195a0d_tag_209[] = { 0x09, 0xbd, 0x22, 0x93, 0x58, 0xcb, 0x85, 0x4a, - 0x72, 0x2d, 0xc1, 0x5d, 0x98, 0x32, 0x7c, 0xe6 }; + 0x72, 0x2d, 0xc1, 0x5d, 0x98, 0x32, 0x7c, 0xe6 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_210 = { .pt = chiptest_dac9e1195a0d_pt_204, .pt_len = 33, .aad = chiptest_dac9e1195a0d_aad_205, @@ -748,16 +748,16 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_210 = .tcId = 29, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_211[] = { 0x84, 0x4f, 0xf8, 0x35, 0xe3, 0xac, 0x66, 0x7b, 0x28, 0x84, 0xf3, - 0x47, 0xf8, 0x88, 0xf5, 0x70, 0x91, 0x9d, 0xab, 0xc3, 0xd9, 0x75, - 0x54, 0xe0, 0x87, 0x9c, 0xc5, 0x89, 0x43, 0x36, 0xcc, 0x19, 0x2d }; + 0x47, 0xf8, 0x88, 0xf5, 0x70, 0x91, 0x9d, 0xab, 0xc3, 0xd9, 0x75, + 0x54, 0xe0, 0x87, 0x9c, 0xc5, 0x89, 0x43, 0x36, 0xcc, 0x19, 0x2d }; static const uint8_t chiptest_dac9e1195a0d_aad_212[] = { 0x62, 0x55, 0xa0, 0x07, 0x9e, 0x72, 0xc9, 0x5c, - 0x20, 0xf7, 0x0b, 0x6a, 0x09, 0xbb, 0x54, 0x13 }; + 0x20, 0xf7, 0x0b, 0x6a, 0x09, 0xbb, 0x54, 0x13 }; static const uint8_t chiptest_dac9e1195a0d_key_213[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_214[] = { 0x2d, 0xbf, 0xc3, 0xa1, 0x2e, 0x4d, 0x2a, 0x86 }; static const uint8_t chiptest_dac9e1195a0d_ct_215[] = { 0x2e, 0x6c, 0x47, 0x78, 0xf0, 0xcd, 0x09, 0x50, 0x95, 0xfa, 0xb4, - 0xfb, 0x68, 0xb5, 0x59, 0xbf, 0xe6, 0xff, 0x2d, 0x09, 0xea, 0x7b, - 0x66, 0x45, 0xfc, 0x1a, 0x25, 0x59, 0x5f, 0xd4, 0x48, 0x3e, 0xea }; + 0xfb, 0x68, 0xb5, 0x59, 0xbf, 0xe6, 0xff, 0x2d, 0x09, 0xea, 0x7b, + 0x66, 0x45, 0xfc, 0x1a, 0x25, 0x59, 0x5f, 0xd4, 0x48, 0x3e, 0xea }; static const uint8_t chiptest_dac9e1195a0d_tag_216[] = { 0xe9, 0xb7, 0x04, 0x88, 0xaa, 0xf0, 0x23, 0x91 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_217 = { .pt = chiptest_dac9e1195a0d_pt_211, .pt_len = 33, @@ -774,16 +774,16 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_217 = .tcId = 30, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_218[] = { 0x84, 0x4f, 0xf8, 0x35, 0xe3, 0xac, 0x66, 0x7b, 0x28, 0x84, 0xf3, - 0x47, 0xf8, 0x88, 0xf5, 0x70, 0x91, 0x9d, 0xab, 0xc3, 0xd9, 0x75, - 0x54, 0xe0, 0x87, 0x9c, 0xc5, 0x89, 0x43, 0x36, 0xcc, 0x19, 0x2d }; + 0x47, 0xf8, 0x88, 0xf5, 0x70, 0x91, 0x9d, 0xab, 0xc3, 0xd9, 0x75, + 0x54, 0xe0, 0x87, 0x9c, 0xc5, 0x89, 0x43, 0x36, 0xcc, 0x19, 0x2d }; static const uint8_t chiptest_dac9e1195a0d_aad_219[] = { 0x62, 0x55, 0xa0, 0x07, 0x9e, 0x72, 0xc9, 0x5c, - 0x20, 0xf7, 0x0b, 0x6a, 0x09, 0xbb, 0x54, 0x13 }; + 0x20, 0xf7, 0x0b, 0x6a, 0x09, 0xbb, 0x54, 0x13 }; static const uint8_t chiptest_dac9e1195a0d_key_220[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_221[] = { 0x2d, 0xbf, 0xc3, 0xa1, 0x2e, 0x4d, 0x2a, 0x86 }; static const uint8_t chiptest_dac9e1195a0d_ct_222[] = { 0x2e, 0x6c, 0x47, 0x78, 0xf0, 0xcd, 0x09, 0x50, 0x95, 0xfa, 0xb4, - 0xfb, 0x68, 0xb5, 0x59, 0xbf, 0xe6, 0xff, 0x2d, 0x09, 0xea, 0x7b, - 0x66, 0x45, 0xfc, 0x1a, 0x25, 0x59, 0x5f, 0xd4, 0x48, 0x3e, 0xea }; + 0xfb, 0x68, 0xb5, 0x59, 0xbf, 0xe6, 0xff, 0x2d, 0x09, 0xea, 0x7b, + 0x66, 0x45, 0xfc, 0x1a, 0x25, 0x59, 0x5f, 0xd4, 0x48, 0x3e, 0xea }; static const uint8_t chiptest_dac9e1195a0d_tag_223[] = { 0x1e, 0xe1, 0xda, 0x23, 0xcf, 0x3d, 0x1d, 0xb0, 0xd2, 0x01, 0x0e, 0x3d }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_224 = { .pt = chiptest_dac9e1195a0d_pt_218, .pt_len = 33, @@ -800,18 +800,18 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_224 = .tcId = 31, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_225[] = { 0x84, 0x4f, 0xf8, 0x35, 0xe3, 0xac, 0x66, 0x7b, 0x28, 0x84, 0xf3, - 0x47, 0xf8, 0x88, 0xf5, 0x70, 0x91, 0x9d, 0xab, 0xc3, 0xd9, 0x75, - 0x54, 0xe0, 0x87, 0x9c, 0xc5, 0x89, 0x43, 0x36, 0xcc, 0x19, 0x2d }; + 0x47, 0xf8, 0x88, 0xf5, 0x70, 0x91, 0x9d, 0xab, 0xc3, 0xd9, 0x75, + 0x54, 0xe0, 0x87, 0x9c, 0xc5, 0x89, 0x43, 0x36, 0xcc, 0x19, 0x2d }; static const uint8_t chiptest_dac9e1195a0d_aad_226[] = { 0x62, 0x55, 0xa0, 0x07, 0x9e, 0x72, 0xc9, 0x5c, - 0x20, 0xf7, 0x0b, 0x6a, 0x09, 0xbb, 0x54, 0x13 }; + 0x20, 0xf7, 0x0b, 0x6a, 0x09, 0xbb, 0x54, 0x13 }; static const uint8_t chiptest_dac9e1195a0d_key_227[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_228[] = { 0x2d, 0xbf, 0xc3, 0xa1, 0x2e, 0x4d, 0x2a, 0x86 }; static const uint8_t chiptest_dac9e1195a0d_ct_229[] = { 0x2e, 0x6c, 0x47, 0x78, 0xf0, 0xcd, 0x09, 0x50, 0x95, 0xfa, 0xb4, - 0xfb, 0x68, 0xb5, 0x59, 0xbf, 0xe6, 0xff, 0x2d, 0x09, 0xea, 0x7b, - 0x66, 0x45, 0xfc, 0x1a, 0x25, 0x59, 0x5f, 0xd4, 0x48, 0x3e, 0xea }; + 0xfb, 0x68, 0xb5, 0x59, 0xbf, 0xe6, 0xff, 0x2d, 0x09, 0xea, 0x7b, + 0x66, 0x45, 0xfc, 0x1a, 0x25, 0x59, 0x5f, 0xd4, 0x48, 0x3e, 0xea }; static const uint8_t chiptest_dac9e1195a0d_tag_230[] = { 0xa5, 0x63, 0x5f, 0x07, 0x86, 0xe5, 0x08, 0x8c, - 0xf9, 0x90, 0x07, 0x20, 0x59, 0x94, 0x5f, 0xe9 }; + 0xf9, 0x90, 0x07, 0x20, 0x59, 0x94, 0x5f, 0xe9 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_231 = { .pt = chiptest_dac9e1195a0d_pt_225, .pt_len = 33, .aad = chiptest_dac9e1195a0d_aad_226, @@ -827,16 +827,16 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_231 = .tcId = 32, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_232[] = { 0xd8, 0xc1, 0x36, 0xcc, 0x07, 0x01, 0x9d, 0x34, 0xcd, 0xca, 0xd0, - 0xa0, 0x42, 0xfc, 0x3d, 0x75, 0x19, 0xe3, 0x0b, 0x5d, 0xdc, 0xb9, - 0x10, 0xde, 0x53, 0xe6, 0x24, 0x12, 0x36, 0x36, 0xda, 0x52, 0x7b }; + 0xa0, 0x42, 0xfc, 0x3d, 0x75, 0x19, 0xe3, 0x0b, 0x5d, 0xdc, 0xb9, + 0x10, 0xde, 0x53, 0xe6, 0x24, 0x12, 0x36, 0x36, 0xda, 0x52, 0x7b }; static const uint8_t chiptest_dac9e1195a0d_aad_233[] = { 0x89, 0x3c, 0xd3, 0xe3, 0x53, 0x4d, 0xe7, 0x0d, - 0x0f, 0x29, 0x39, 0xe7, 0xae, 0x69, 0x62, 0x7d }; + 0x0f, 0x29, 0x39, 0xe7, 0xae, 0x69, 0x62, 0x7d }; static const uint8_t chiptest_dac9e1195a0d_key_234[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_235[] = { 0xb9, 0xb2, 0xeb, 0x2f, 0x55, 0x59, 0xba, 0xfd, 0x5d, 0xbb, 0xda, 0xf3 }; static const uint8_t chiptest_dac9e1195a0d_ct_236[] = { 0xf9, 0x9f, 0x6a, 0x7c, 0x88, 0x86, 0x4d, 0x21, 0x2c, 0x12, 0x27, - 0x91, 0x70, 0x23, 0xda, 0x36, 0xf1, 0xfa, 0x11, 0xf8, 0x26, 0x2d, - 0x75, 0xb6, 0xc2, 0x0c, 0x4c, 0x19, 0xdb, 0x92, 0x14, 0xcc, 0x19 }; + 0x91, 0x70, 0x23, 0xda, 0x36, 0xf1, 0xfa, 0x11, 0xf8, 0x26, 0x2d, + 0x75, 0xb6, 0xc2, 0x0c, 0x4c, 0x19, 0xdb, 0x92, 0x14, 0xcc, 0x19 }; static const uint8_t chiptest_dac9e1195a0d_tag_237[] = { 0x61, 0xaf, 0x0a, 0xf3, 0xe3, 0x2a, 0x8a, 0x82 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_238 = { .pt = chiptest_dac9e1195a0d_pt_232, .pt_len = 33, @@ -853,16 +853,16 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_238 = .tcId = 33, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_239[] = { 0xd8, 0xc1, 0x36, 0xcc, 0x07, 0x01, 0x9d, 0x34, 0xcd, 0xca, 0xd0, - 0xa0, 0x42, 0xfc, 0x3d, 0x75, 0x19, 0xe3, 0x0b, 0x5d, 0xdc, 0xb9, - 0x10, 0xde, 0x53, 0xe6, 0x24, 0x12, 0x36, 0x36, 0xda, 0x52, 0x7b }; + 0xa0, 0x42, 0xfc, 0x3d, 0x75, 0x19, 0xe3, 0x0b, 0x5d, 0xdc, 0xb9, + 0x10, 0xde, 0x53, 0xe6, 0x24, 0x12, 0x36, 0x36, 0xda, 0x52, 0x7b }; static const uint8_t chiptest_dac9e1195a0d_aad_240[] = { 0x89, 0x3c, 0xd3, 0xe3, 0x53, 0x4d, 0xe7, 0x0d, - 0x0f, 0x29, 0x39, 0xe7, 0xae, 0x69, 0x62, 0x7d }; + 0x0f, 0x29, 0x39, 0xe7, 0xae, 0x69, 0x62, 0x7d }; static const uint8_t chiptest_dac9e1195a0d_key_241[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_242[] = { 0xb9, 0xb2, 0xeb, 0x2f, 0x55, 0x59, 0xba, 0xfd, 0x5d, 0xbb, 0xda, 0xf3 }; static const uint8_t chiptest_dac9e1195a0d_ct_243[] = { 0xf9, 0x9f, 0x6a, 0x7c, 0x88, 0x86, 0x4d, 0x21, 0x2c, 0x12, 0x27, - 0x91, 0x70, 0x23, 0xda, 0x36, 0xf1, 0xfa, 0x11, 0xf8, 0x26, 0x2d, - 0x75, 0xb6, 0xc2, 0x0c, 0x4c, 0x19, 0xdb, 0x92, 0x14, 0xcc, 0x19 }; + 0x91, 0x70, 0x23, 0xda, 0x36, 0xf1, 0xfa, 0x11, 0xf8, 0x26, 0x2d, + 0x75, 0xb6, 0xc2, 0x0c, 0x4c, 0x19, 0xdb, 0x92, 0x14, 0xcc, 0x19 }; static const uint8_t chiptest_dac9e1195a0d_tag_244[] = { 0x97, 0x66, 0x01, 0x50, 0x02, 0xd8, 0x68, 0x6c, 0x12, 0xd0, 0x2c, 0x3d }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_245 = { .pt = chiptest_dac9e1195a0d_pt_239, .pt_len = 33, @@ -879,18 +879,18 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_245 = .tcId = 34, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_246[] = { 0xd8, 0xc1, 0x36, 0xcc, 0x07, 0x01, 0x9d, 0x34, 0xcd, 0xca, 0xd0, - 0xa0, 0x42, 0xfc, 0x3d, 0x75, 0x19, 0xe3, 0x0b, 0x5d, 0xdc, 0xb9, - 0x10, 0xde, 0x53, 0xe6, 0x24, 0x12, 0x36, 0x36, 0xda, 0x52, 0x7b }; + 0xa0, 0x42, 0xfc, 0x3d, 0x75, 0x19, 0xe3, 0x0b, 0x5d, 0xdc, 0xb9, + 0x10, 0xde, 0x53, 0xe6, 0x24, 0x12, 0x36, 0x36, 0xda, 0x52, 0x7b }; static const uint8_t chiptest_dac9e1195a0d_aad_247[] = { 0x89, 0x3c, 0xd3, 0xe3, 0x53, 0x4d, 0xe7, 0x0d, - 0x0f, 0x29, 0x39, 0xe7, 0xae, 0x69, 0x62, 0x7d }; + 0x0f, 0x29, 0x39, 0xe7, 0xae, 0x69, 0x62, 0x7d }; static const uint8_t chiptest_dac9e1195a0d_key_248[] = { 0x04, 0xe1, 0xaf, 0x8f, 0x15, 0xe2, 0x16, 0x4e, - 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; + 0xdb, 0x2d, 0xfd, 0xfe, 0xa2, 0xc4, 0x8b, 0xcf }; static const uint8_t chiptest_dac9e1195a0d_nonce_249[] = { 0xb9, 0xb2, 0xeb, 0x2f, 0x55, 0x59, 0xba, 0xfd, 0x5d, 0xbb, 0xda, 0xf3 }; static const uint8_t chiptest_dac9e1195a0d_ct_250[] = { 0xf9, 0x9f, 0x6a, 0x7c, 0x88, 0x86, 0x4d, 0x21, 0x2c, 0x12, 0x27, - 0x91, 0x70, 0x23, 0xda, 0x36, 0xf1, 0xfa, 0x11, 0xf8, 0x26, 0x2d, - 0x75, 0xb6, 0xc2, 0x0c, 0x4c, 0x19, 0xdb, 0x92, 0x14, 0xcc, 0x19 }; + 0x91, 0x70, 0x23, 0xda, 0x36, 0xf1, 0xfa, 0x11, 0xf8, 0x26, 0x2d, + 0x75, 0xb6, 0xc2, 0x0c, 0x4c, 0x19, 0xdb, 0x92, 0x14, 0xcc, 0x19 }; static const uint8_t chiptest_dac9e1195a0d_tag_251[] = { 0x9e, 0x7b, 0x72, 0x96, 0x6c, 0x9d, 0xbc, 0x93, - 0xdb, 0x0e, 0xa9, 0x92, 0xa0, 0x8c, 0x9c, 0xad }; + 0xdb, 0x0e, 0xa9, 0x92, 0xa0, 0x8c, 0x9c, 0xad }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_252 = { .pt = chiptest_dac9e1195a0d_pt_246, .pt_len = 33, .aad = chiptest_dac9e1195a0d_aad_247, @@ -906,16 +906,16 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_252 = .tcId = 35, .result = CHIP_NO_ERROR }; static const uint8_t chiptest_dac9e1195a0d_pt_253[] = { 0x31, 0x5e, 0x88, 0xf4, 0x83, 0x2d, 0x0c, 0x1d, - 0xb4, 0xd6, 0x22, 0xa7, 0x49, 0x97, 0x27, 0x6e }; + 0xb4, 0xd6, 0x22, 0xa7, 0x49, 0x97, 0x27, 0x6e }; static const uint8_t chiptest_dac9e1195a0d_aad_254[] = { 0x0f, 0x9d, 0xfc, 0x66, 0x19, 0x6e, 0xc5, 0x8b, - 0xd9, 0x32, 0x8d, 0xc9, 0x4f, 0xea, 0x9f, 0xe2 }; + 0xd9, 0x32, 0x8d, 0xc9, 0x4f, 0xea, 0x9f, 0xe2 }; static const uint8_t chiptest_dac9e1195a0d_key_255[] = { 0xb0, 0x40, 0x51, 0x6c, 0xe6, 0x32, 0x48, 0xb3, - 0xfc, 0xf5, 0x00, 0x98, 0x48, 0xc0, 0xdb, 0xf3 }; + 0xfc, 0xf5, 0x00, 0x98, 0x48, 0xc0, 0xdb, 0xf3 }; static const uint8_t chiptest_dac9e1195a0d_nonce_256[] = { 0x30, 0x0d, 0xb6, 0x16, 0xc5, 0xb5, 0xe5, 0xde, 0xb4, 0xf8, 0x90, 0x79 }; static const uint8_t chiptest_dac9e1195a0d_ct_257[] = { 0x84, 0x15, 0x9c, 0xfd, 0xb7, 0xfd, 0xab, 0x6a, - 0x11, 0x3e, 0x66, 0x55, 0xfe, 0xf4, 0x17, 0x16 }; + 0x11, 0x3e, 0x66, 0x55, 0xfe, 0xf4, 0x17, 0x16 }; static const uint8_t chiptest_dac9e1195a0d_tag_258[] = { 0xc8, 0x50, 0x01, 0xbe, 0xfc, 0x4d, 0xe3, 0x19, - 0xea, 0x9f, 0x01, 0x6a, 0xde, 0xf5, 0x6f, 0xe3 }; + 0xea, 0x9f, 0x01, 0x6a, 0xde, 0xf5, 0x6f, 0xe3 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_259 = { .pt = chiptest_dac9e1195a0d_pt_253, .pt_len = 16, .aad = chiptest_dac9e1195a0d_aad_254, @@ -931,16 +931,16 @@ static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_259 = .tcId = 36, .result = CHIP_ERROR_INTERNAL }; static const uint8_t chiptest_dac9e1195a0d_pt_260[] = { 0x31, 0x5e, 0x88, 0xf4, 0x83, 0x2d, 0x0c, 0x1d, - 0xb4, 0xd6, 0x22, 0xa7, 0x49, 0x97, 0x27, 0x6e }; + 0xb4, 0xd6, 0x22, 0xa7, 0x49, 0x97, 0x27, 0x6e }; static const uint8_t chiptest_dac9e1195a0d_aad_261[] = { 0x0f, 0x9d, 0xfc, 0x66, 0x19, 0x6e, 0xc5, 0x8b, - 0xd9, 0x32, 0x8d, 0xc9, 0x4f, 0xea, 0x9f, 0xe2 }; + 0xd9, 0x32, 0x8d, 0xc9, 0x4f, 0xea, 0x9f, 0xe2 }; static const uint8_t chiptest_dac9e1195a0d_key_262[] = { 0xb0, 0x40, 0x51, 0x6c, 0xe6, 0x32, 0x48, 0xb3, - 0xfc, 0xf5, 0x00, 0x98, 0x48, 0xc0, 0xdb, 0xf3 }; + 0xfc, 0xf5, 0x00, 0x98, 0x48, 0xc0, 0xdb, 0xf3 }; static const uint8_t chiptest_dac9e1195a0d_nonce_263[] = { 0x30, 0x0d, 0xb6, 0x16, 0xc5, 0xb5, 0xe5, 0xde, 0xb4, 0xf8, 0x90, 0x79 }; static const uint8_t chiptest_dac9e1195a0d_ct_264[] = { 0x85, 0x15, 0x9c, 0xfd, 0xb7, 0xfd, 0xab, 0x6a, - 0x11, 0x3e, 0x66, 0x55, 0xfe, 0xf4, 0x17, 0x16 }; + 0x11, 0x3e, 0x66, 0x55, 0xfe, 0xf4, 0x17, 0x16 }; static const uint8_t chiptest_dac9e1195a0d_tag_265[] = { 0xc7, 0x50, 0x01, 0xbe, 0xfc, 0x4d, 0xe3, 0x19, - 0xea, 0x9f, 0x01, 0x6a, 0xde, 0xf5, 0x6f, 0xe3 }; + 0xea, 0x9f, 0x01, 0x6a, 0xde, 0xf5, 0x6f, 0xe3 }; static const struct ccm_128_test_vector chiptest_dac9e1195a0d_test_vector_266 = { .pt = chiptest_dac9e1195a0d_pt_260, .pt_len = 16, .aad = chiptest_dac9e1195a0d_aad_261, diff --git a/src/crypto/tests/CHIPCryptoPALTest.cpp b/src/crypto/tests/CHIPCryptoPALTest.cpp index a295e92afc8a28..fd2c79b06c5b10 100644 --- a/src/crypto/tests/CHIPCryptoPALTest.cpp +++ b/src/crypto/tests/CHIPCryptoPALTest.cpp @@ -166,13 +166,13 @@ const AesCtrTestEntry theAesCtrTestVector[] = { .ciphertextLen = 16, }, { - .key = (const uint8_t *) "\x7e\x24\x06\x78\x17\xfa\xe0\xd7\x43\xd6\xce\x1f\x32\x53\x91\x63", - .nonce = (const uint8_t *) "\x00\x6c\xb6\xdb\xc0\x54\x3b\x59\xda\x48\xd9\x0b\x00", - .plaintext = (const uint8_t *) "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" - "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f", - .plaintextLen = 32, - .ciphertext = (const uint8_t *) "\x4f\x3d\xf9\x49\x15\x88\x4d\xe0\xdc\x0e\x30\x95\x0d\xe7\xa6\xe9" - "\x5a\x91\x7e\x1d\x06\x42\x22\xdb\x2f\x6e\xc7\x3d\x99\x4a\xd9\x5f", + .key = (const uint8_t *) "\x7e\x24\x06\x78\x17\xfa\xe0\xd7\x43\xd6\xce\x1f\x32\x53\x91\x63", + .nonce = (const uint8_t *) "\x00\x6c\xb6\xdb\xc0\x54\x3b\x59\xda\x48\xd9\x0b\x00", + .plaintext = (const uint8_t *) "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" + "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f", + .plaintextLen = 32, + .ciphertext = (const uint8_t *) "\x4f\x3d\xf9\x49\x15\x88\x4d\xe0\xdc\x0e\x30\x95\x0d\xe7\xa6\xe9" + "\x5a\x91\x7e\x1d\x06\x42\x22\xdb\x2f\x6e\xc7\x3d\x99\x4a\xd9\x5f", .ciphertextLen = 32, } }; @@ -1447,8 +1447,8 @@ void TestCSR_GenDirect(nlTestSuite * inSuite, void * inContext) // Let's corrupt the CSR buffer and make sure it fails to verify size_t length = csrSpan.size(); - csrBuf[length - 2] = (uint8_t)(csrBuf[length - 2] + 1); - csrBuf[length - 1] = (uint8_t)(csrBuf[length - 1] + 1); + csrBuf[length - 2] = (uint8_t) (csrBuf[length - 2] + 1); + csrBuf[length - 1] = (uint8_t) (csrBuf[length - 1] + 1); NL_TEST_ASSERT(inSuite, VerifyCertificateSigningRequest(csrSpan.data(), csrSpan.size(), pubkey) != CHIP_NO_ERROR); } @@ -1478,8 +1478,8 @@ static void TestCSR_GenByKeypair(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, memcmp(pubkey.ConstBytes(), keypair.Pubkey().ConstBytes(), pubkey.Length()) == 0); // Let's corrupt the CSR buffer and make sure it fails to verify - csr[length - 2] = (uint8_t)(csr[length - 2] + 1); - csr[length - 1] = (uint8_t)(csr[length - 1] + 1); + csr[length - 2] = (uint8_t) (csr[length - 2] + 1); + csr[length - 1] = (uint8_t) (csr[length - 1] + 1); NL_TEST_ASSERT(inSuite, VerifyCertificateSigningRequest(csr, length, pubkey) != CHIP_NO_ERROR); } diff --git a/src/crypto/tests/PBKDF2_SHA256_test_vectors.h b/src/crypto/tests/PBKDF2_SHA256_test_vectors.h index ec5c38d3d521eb..b19f3ba3b2ac83 100644 --- a/src/crypto/tests/PBKDF2_SHA256_test_vectors.h +++ b/src/crypto/tests/PBKDF2_SHA256_test_vectors.h @@ -40,7 +40,7 @@ struct pbkdf2_test_vector }; static const uint8_t chiptest_key1[] = { 0xf2, 0xe3, 0x4b, 0xd9, 0x50, 0xe9, 0x1c, 0xf3, 0x7d, 0x22, - 0xe1, 0x13, 0x5a, 0x39, 0x9b, 0x02, 0xa1, 0x7c, 0xb1, 0x93 }; + 0xe1, 0x13, 0x5a, 0x39, 0x9b, 0x02, 0xa1, 0x7c, 0xb1, 0x93 }; static const struct pbkdf2_test_vector chiptest_test_vector_1 = { .password = chip::Uint8::from_const_char("password"), .plen = 8, .salt = chip::Uint8::from_const_char("saltSALTsaltSALT"), @@ -52,7 +52,7 @@ static const struct pbkdf2_test_vector chiptest_test_vector_1 = { .password = ch .result = CHIP_NO_ERROR }; static const uint8_t chiptest_key2[] = { 0x2b, 0x77, 0x27, 0x5c, 0xc3, 0x12, 0x0b, 0x15, 0x13, 0xf6, - 0xf3, 0xe0, 0x36, 0x49, 0xfd, 0x49, 0x33, 0x76, 0x52, 0x60 }; + 0xf3, 0xe0, 0x36, 0x49, 0xfd, 0x49, 0x33, 0x76, 0x52, 0x60 }; static const struct pbkdf2_test_vector chiptest_test_vector_2 = { .password = chip::Uint8::from_const_char("password"), .plen = 8, .salt = chip::Uint8::from_const_char("saltSALTsaltSALT"), @@ -64,7 +64,7 @@ static const struct pbkdf2_test_vector chiptest_test_vector_2 = { .password = ch .result = CHIP_NO_ERROR }; static const uint8_t chiptest_key3[] = { 0x82, 0xff, 0xaa, 0xfc, 0x0b, 0x04, 0x91, 0x80, 0xee, 0xa7, - 0x9a, 0x04, 0x10, 0x31, 0x58, 0x87, 0xb6, 0x60, 0xac, 0x7e }; + 0x9a, 0x04, 0x10, 0x31, 0x58, 0x87, 0xb6, 0x60, 0xac, 0x7e }; static const struct pbkdf2_test_vector chiptest_test_vector_3 = { .password = chip::Uint8::from_const_char("password"), .plen = 8, .salt = chip::Uint8::from_const_char("saltSALTsaltSALT"), @@ -76,7 +76,7 @@ static const struct pbkdf2_test_vector chiptest_test_vector_3 = { .password = ch .result = CHIP_NO_ERROR }; static const uint8_t chiptest_key4[] = { 0xf8, 0x8a, 0xfb, 0xb7, 0x9d, 0xda, 0x3f, 0x28, 0x2e, 0x21, - 0xad, 0xf2, 0x53, 0xd0, 0xe9, 0xf1, 0x70, 0x82, 0x3a, 0x9f }; + 0xad, 0xf2, 0x53, 0xd0, 0xe9, 0xf1, 0x70, 0x82, 0x3a, 0x9f }; static const struct pbkdf2_test_vector chiptest_test_vector_4 = { .password = chip::Uint8::from_const_char("password"), .plen = 8, .salt = chip::Uint8::from_const_char("saltSALTsaltSALT"), diff --git a/src/crypto/tests/SPAKE2P_FE_MUL_test_vectors.h b/src/crypto/tests/SPAKE2P_FE_MUL_test_vectors.h index 86f94b3d3e441c..ecd32d871e585e 100644 --- a/src/crypto/tests/SPAKE2P_FE_MUL_test_vectors.h +++ b/src/crypto/tests/SPAKE2P_FE_MUL_test_vectors.h @@ -35,11 +35,11 @@ struct spake2p_fe_mul_tv }; static const uint8_t chiptest_63ed1e870cb3_fe1_1[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const uint8_t chiptest_63ed1e870cb3_fe2_2[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_3[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -52,11 +52,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_4 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_5[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }; static const uint8_t chiptest_63ed1e870cb3_fe2_6[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_7[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 }; @@ -69,11 +69,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_8 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_9[] = { 0x7f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const uint8_t chiptest_63ed1e870cb3_fe2_10[] = { 0x7f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_11[] = { 0xe2, 0x94, 0x7c, 0xc6, 0xbc, 0x61, 0x74, 0x5b, 0x77, 0x01, 0x57, 0x46, 0x6f, 0x66, 0x5e, 0x81, 0x11, 0x5c, 0x92, 0x2e, 0x37, 0xbd, 0xa0, 0xce, 0x91, 0xc7, 0x74, 0xd3, 0x60, 0xcb, 0xa3, 0x7c }; @@ -86,11 +86,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_12 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_13[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, - 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x50 }; + 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, + 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x50 }; static const uint8_t chiptest_63ed1e870cb3_fe2_14[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, - 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x50 }; + 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, + 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x50 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_15[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }; @@ -103,11 +103,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_16 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_17[] = { 0x2c, 0x5d, 0x31, 0x00, 0xbc, 0x77, 0x83, 0x34, 0x2c, 0x51, 0x49, - 0x7a, 0x2e, 0x2c, 0x03, 0x78, 0x3c, 0x4e, 0x79, 0x93, 0x0f, 0x72, - 0x2e, 0xcd, 0x5b, 0xda, 0xe8, 0x73, 0xea, 0x01, 0xf9, 0x82 }; + 0x7a, 0x2e, 0x2c, 0x03, 0x78, 0x3c, 0x4e, 0x79, 0x93, 0x0f, 0x72, + 0x2e, 0xcd, 0x5b, 0xda, 0xe8, 0x73, 0xea, 0x01, 0xf9, 0x82 }; static const uint8_t chiptest_63ed1e870cb3_fe2_18[] = { 0x85, 0xe2, 0xc4, 0x91, 0xfa, 0x64, 0xb7, 0x76, 0x8c, 0x46, 0xd0, - 0x1d, 0x1d, 0xe3, 0x1c, 0xb9, 0x84, 0xec, 0xaa, 0x6c, 0xd2, 0xda, - 0xb0, 0x3a, 0xa3, 0x26, 0xd2, 0x54, 0x14, 0xfb, 0x42, 0x70 }; + 0x1d, 0x1d, 0xe3, 0x1c, 0xb9, 0x84, 0xec, 0xaa, 0x6c, 0xd2, 0xda, + 0xb0, 0x3a, 0xa3, 0x26, 0xd2, 0x54, 0x14, 0xfb, 0x42, 0x70 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_19[] = { 0xb7, 0x32, 0xf0, 0xdd, 0xcb, 0x47, 0xd4, 0x80, 0xda, 0xa5, 0x37, 0x3a, 0x78, 0xf4, 0x2e, 0x87, 0x40, 0x27, 0x3b, 0x40, 0xf6, 0x04, 0xc3, 0x7b, 0xa7, 0xb3, 0xb8, 0x62, 0x83, 0xa5, 0x65, 0xc5 }; @@ -120,11 +120,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_20 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_21[] = { 0x37, 0xe8, 0x33, 0xe4, 0x5a, 0x70, 0x08, 0x32, 0x01, 0xcd, 0xbb, - 0xd1, 0x87, 0x4c, 0xfb, 0x83, 0x0b, 0xde, 0xe9, 0xa6, 0x09, 0xc7, - 0x9a, 0x40, 0x73, 0x24, 0x78, 0xba, 0xd5, 0x0b, 0x52, 0x28 }; + 0xd1, 0x87, 0x4c, 0xfb, 0x83, 0x0b, 0xde, 0xe9, 0xa6, 0x09, 0xc7, + 0x9a, 0x40, 0x73, 0x24, 0x78, 0xba, 0xd5, 0x0b, 0x52, 0x28 }; static const uint8_t chiptest_63ed1e870cb3_fe2_22[] = { 0x68, 0x4a, 0xec, 0x67, 0x23, 0x0d, 0x8f, 0x92, 0x62, 0x9a, 0x18, - 0x34, 0xa9, 0xce, 0x34, 0x15, 0xed, 0xe2, 0xb2, 0x35, 0xb8, 0xd9, - 0xab, 0xbc, 0xee, 0x3c, 0xe1, 0x19, 0x9a, 0x2d, 0x13, 0xcc }; + 0x34, 0xa9, 0xce, 0x34, 0x15, 0xed, 0xe2, 0xb2, 0x35, 0xb8, 0xd9, + 0xab, 0xbc, 0xee, 0x3c, 0xe1, 0x19, 0x9a, 0x2d, 0x13, 0xcc }; static const uint8_t chiptest_63ed1e870cb3_fe_out_23[] = { 0x5f, 0xf3, 0xcf, 0x72, 0xf1, 0x70, 0x67, 0xca, 0xde, 0xe7, 0x33, 0x7b, 0xe3, 0xed, 0x1b, 0xfd, 0x36, 0xbc, 0x22, 0x8f, 0xbd, 0x7a, 0x49, 0x36, 0xe8, 0x49, 0x3f, 0xb5, 0x16, 0x37, 0xd0, 0x4a }; @@ -137,11 +137,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_24 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_25[] = { 0x42, 0x08, 0xff, 0x5f, 0x67, 0x45, 0xf8, 0x90, 0x94, 0xdc, 0x66, - 0x28, 0xc4, 0xab, 0x2f, 0xe8, 0x2d, 0x64, 0x6e, 0x1c, 0xd8, 0x47, - 0xa8, 0x14, 0x09, 0x6a, 0x8c, 0x72, 0x08, 0x8a, 0xf2, 0x7b }; + 0x28, 0xc4, 0xab, 0x2f, 0xe8, 0x2d, 0x64, 0x6e, 0x1c, 0xd8, 0x47, + 0xa8, 0x14, 0x09, 0x6a, 0x8c, 0x72, 0x08, 0x8a, 0xf2, 0x7b }; static const uint8_t chiptest_63ed1e870cb3_fe2_26[] = { 0x53, 0xa0, 0x7e, 0xe8, 0xc0, 0x21, 0xf4, 0x63, 0x68, 0x8a, 0xad, - 0x18, 0xf2, 0x84, 0xe7, 0x67, 0xa4, 0xe8, 0x23, 0xf2, 0x08, 0x6c, - 0x7d, 0x0c, 0x2d, 0xa6, 0xd6, 0x53, 0x24, 0xb0, 0x4f, 0xd3 }; + 0x18, 0xf2, 0x84, 0xe7, 0x67, 0xa4, 0xe8, 0x23, 0xf2, 0x08, 0x6c, + 0x7d, 0x0c, 0x2d, 0xa6, 0xd6, 0x53, 0x24, 0xb0, 0x4f, 0xd3 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_27[] = { 0x1a, 0x90, 0x51, 0x21, 0x0e, 0x77, 0x68, 0x81, 0x7a, 0x4a, 0xa2, 0x80, 0x81, 0xd3, 0xdd, 0x76, 0xdd, 0x07, 0xeb, 0x0f, 0x77, 0xe9, 0xfb, 0x71, 0x5a, 0x45, 0x1f, 0x96, 0x74, 0x0a, 0xa7, 0x5b }; @@ -154,11 +154,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_28 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_29[] = { 0x54, 0xe4, 0x9a, 0x4d, 0x59, 0xac, 0x55, 0xe9, 0xc5, 0x12, 0xe1, - 0xd5, 0xb3, 0x29, 0x9b, 0x38, 0xa9, 0x13, 0x01, 0xaa, 0x24, 0x46, - 0x98, 0x6c, 0xd2, 0xf0, 0x1b, 0x3e, 0xbc, 0xac, 0x2b, 0x1e }; + 0xd5, 0xb3, 0x29, 0x9b, 0x38, 0xa9, 0x13, 0x01, 0xaa, 0x24, 0x46, + 0x98, 0x6c, 0xd2, 0xf0, 0x1b, 0x3e, 0xbc, 0xac, 0x2b, 0x1e }; static const uint8_t chiptest_63ed1e870cb3_fe2_30[] = { 0x1c, 0xb4, 0xbf, 0x27, 0xeb, 0xdf, 0xa7, 0xf0, 0x5f, 0x61, 0x16, - 0x18, 0xff, 0x9e, 0x51, 0x7e, 0xe2, 0x2d, 0xbe, 0xa7, 0xd5, 0xe3, - 0x2c, 0x81, 0x90, 0x42, 0x11, 0x76, 0x46, 0x49, 0x78, 0x33 }; + 0x18, 0xff, 0x9e, 0x51, 0x7e, 0xe2, 0x2d, 0xbe, 0xa7, 0xd5, 0xe3, + 0x2c, 0x81, 0x90, 0x42, 0x11, 0x76, 0x46, 0x49, 0x78, 0x33 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_31[] = { 0xec, 0xe9, 0x8c, 0xa7, 0x29, 0xd7, 0x87, 0xbc, 0x8b, 0x94, 0x44, 0x90, 0xfc, 0x0e, 0x23, 0x8f, 0x65, 0xf2, 0x1c, 0xc8, 0x57, 0x52, 0xd8, 0x72, 0xfd, 0x53, 0xc3, 0x9a, 0xc2, 0x58, 0x86, 0x52 }; @@ -171,11 +171,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_32 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_33[] = { 0x3c, 0xb6, 0xba, 0xa6, 0x1f, 0x42, 0xd1, 0x89, 0xc7, 0x23, 0xa6, - 0x27, 0x94, 0xfb, 0x4c, 0x11, 0x94, 0x8f, 0x58, 0xfe, 0xa2, 0x76, - 0x05, 0xf7, 0x1a, 0xa9, 0x1e, 0x46, 0x23, 0xf7, 0x2a, 0x6e }; + 0x27, 0x94, 0xfb, 0x4c, 0x11, 0x94, 0x8f, 0x58, 0xfe, 0xa2, 0x76, + 0x05, 0xf7, 0x1a, 0xa9, 0x1e, 0x46, 0x23, 0xf7, 0x2a, 0x6e }; static const uint8_t chiptest_63ed1e870cb3_fe2_34[] = { 0x39, 0xfe, 0xb2, 0xd8, 0x97, 0xca, 0x75, 0x1a, 0x3e, 0xc5, 0x85, - 0x7d, 0x97, 0x02, 0xfd, 0x9a, 0xb0, 0xca, 0xba, 0xc1, 0x0f, 0x31, - 0x0c, 0x4a, 0xcd, 0x4b, 0x95, 0xea, 0xc9, 0xf0, 0x32, 0x96 }; + 0x7d, 0x97, 0x02, 0xfd, 0x9a, 0xb0, 0xca, 0xba, 0xc1, 0x0f, 0x31, + 0x0c, 0x4a, 0xcd, 0x4b, 0x95, 0xea, 0xc9, 0xf0, 0x32, 0x96 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_35[] = { 0x27, 0x2e, 0x40, 0x34, 0xa4, 0xf1, 0x35, 0xc8, 0x68, 0x1d, 0xbd, 0x12, 0x1e, 0x8d, 0x99, 0x96, 0xbb, 0x6d, 0x7e, 0x69, 0x55, 0x19, 0x35, 0x40, 0xea, 0xd7, 0x63, 0x01, 0x65, 0x92, 0xd4, 0x38 }; @@ -188,11 +188,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_36 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_37[] = { 0x1b, 0x87, 0x82, 0x85, 0xc7, 0xaa, 0x0b, 0xf5, 0xfc, 0xdb, 0xaa, - 0x83, 0xa3, 0x66, 0x45, 0x9f, 0xab, 0x42, 0xa0, 0x7d, 0xb1, 0x61, - 0x38, 0xfb, 0xc9, 0xa2, 0x49, 0xf5, 0x9f, 0xed, 0x09, 0xce }; + 0x83, 0xa3, 0x66, 0x45, 0x9f, 0xab, 0x42, 0xa0, 0x7d, 0xb1, 0x61, + 0x38, 0xfb, 0xc9, 0xa2, 0x49, 0xf5, 0x9f, 0xed, 0x09, 0xce }; static const uint8_t chiptest_63ed1e870cb3_fe2_38[] = { 0x22, 0xe2, 0x3e, 0x7a, 0xed, 0x50, 0x28, 0x7d, 0x98, 0x0b, 0x07, - 0x4f, 0xbf, 0x75, 0x8c, 0x21, 0x0c, 0x36, 0xff, 0x7f, 0xcd, 0x02, - 0x09, 0x0d, 0x08, 0x6f, 0x2e, 0x63, 0x35, 0x57, 0x08, 0x4a }; + 0x4f, 0xbf, 0x75, 0x8c, 0x21, 0x0c, 0x36, 0xff, 0x7f, 0xcd, 0x02, + 0x09, 0x0d, 0x08, 0x6f, 0x2e, 0x63, 0x35, 0x57, 0x08, 0x4a }; static const uint8_t chiptest_63ed1e870cb3_fe_out_39[] = { 0xf6, 0x47, 0x28, 0x05, 0xb0, 0x98, 0x49, 0x88, 0x00, 0xfe, 0x0e, 0x45, 0xdd, 0x27, 0x18, 0x47, 0xd6, 0x0e, 0x39, 0x8f, 0xd8, 0x3b, 0xb2, 0x72, 0xfb, 0x20, 0xe9, 0x61, 0x67, 0x29, 0xc9, 0xb5 }; @@ -205,11 +205,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_40 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_41[] = { 0x65, 0x44, 0x2d, 0x0e, 0xa5, 0x52, 0xf6, 0x07, 0x84, 0xf5, 0x08, - 0x33, 0x23, 0x38, 0x12, 0xe0, 0x8c, 0xfa, 0xef, 0xc2, 0x6e, 0xb2, - 0x51, 0x37, 0xf9, 0x1f, 0x36, 0x63, 0x0d, 0x85, 0xcb, 0x08 }; + 0x33, 0x23, 0x38, 0x12, 0xe0, 0x8c, 0xfa, 0xef, 0xc2, 0x6e, 0xb2, + 0x51, 0x37, 0xf9, 0x1f, 0x36, 0x63, 0x0d, 0x85, 0xcb, 0x08 }; static const uint8_t chiptest_63ed1e870cb3_fe2_42[] = { 0x89, 0xe5, 0xf9, 0xa2, 0xba, 0xef, 0xcc, 0xc1, 0x01, 0xb3, 0xb4, - 0x81, 0xac, 0xd1, 0x3e, 0xb8, 0x3e, 0xf9, 0x01, 0x47, 0xe7, 0x25, - 0x48, 0xe0, 0x08, 0xea, 0xdb, 0xce, 0xaa, 0x72, 0x2a, 0xaa }; + 0x81, 0xac, 0xd1, 0x3e, 0xb8, 0x3e, 0xf9, 0x01, 0x47, 0xe7, 0x25, + 0x48, 0xe0, 0x08, 0xea, 0xdb, 0xce, 0xaa, 0x72, 0x2a, 0xaa }; static const uint8_t chiptest_63ed1e870cb3_fe_out_43[] = { 0x89, 0x37, 0xd9, 0xe2, 0x2b, 0x5d, 0xb3, 0x11, 0xca, 0xa9, 0xee, 0xcb, 0x51, 0x69, 0xf6, 0x38, 0x3f, 0x57, 0xaa, 0x36, 0x9a, 0x1a, 0x04, 0x4f, 0x4d, 0x33, 0x0d, 0x87, 0xb0, 0x1f, 0x56, 0x9f }; @@ -222,11 +222,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_44 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_45[] = { 0xfa, 0xa7, 0xb9, 0x68, 0x14, 0xf3, 0x0d, 0xbe, 0x37, 0x79, 0x67, - 0xc9, 0xa4, 0x0b, 0xb6, 0xe3, 0x0f, 0x01, 0x3d, 0x05, 0xdb, 0x73, - 0xc7, 0x84, 0x52, 0x0e, 0x0b, 0xef, 0x3a, 0x79, 0xa8, 0x0f }; + 0xc9, 0xa4, 0x0b, 0xb6, 0xe3, 0x0f, 0x01, 0x3d, 0x05, 0xdb, 0x73, + 0xc7, 0x84, 0x52, 0x0e, 0x0b, 0xef, 0x3a, 0x79, 0xa8, 0x0f }; static const uint8_t chiptest_63ed1e870cb3_fe2_46[] = { 0xf3, 0x1b, 0xbe, 0x73, 0xef, 0x62, 0xb3, 0xcd, 0x4e, 0x06, 0xc5, - 0x9b, 0x50, 0x1c, 0x7d, 0x5f, 0x26, 0x9e, 0xc1, 0x02, 0x85, 0x37, - 0x1b, 0x96, 0xcf, 0x3b, 0x16, 0xdf, 0x25, 0x76, 0x71, 0xe4 }; + 0x9b, 0x50, 0x1c, 0x7d, 0x5f, 0x26, 0x9e, 0xc1, 0x02, 0x85, 0x37, + 0x1b, 0x96, 0xcf, 0x3b, 0x16, 0xdf, 0x25, 0x76, 0x71, 0xe4 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_47[] = { 0x76, 0xbb, 0x90, 0xd9, 0xb4, 0xaa, 0x1f, 0xd0, 0x64, 0xb2, 0x10, 0x75, 0x71, 0x84, 0x2b, 0x1e, 0xac, 0x90, 0x10, 0x7e, 0x08, 0xee, 0xda, 0xee, 0x3a, 0x27, 0xc4, 0x43, 0x2a, 0x51, 0x5f, 0xd9 }; @@ -239,11 +239,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_48 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_49[] = { 0x93, 0xb1, 0x9f, 0xa2, 0x81, 0xce, 0x8e, 0xc6, 0x26, 0x30, 0x83, - 0x8a, 0xd9, 0x32, 0xf1, 0x99, 0x49, 0xc2, 0xc5, 0xdb, 0x50, 0xbf, - 0x82, 0x11, 0x38, 0xce, 0x40, 0xc9, 0x3e, 0x85, 0xd3, 0xc9 }; + 0x8a, 0xd9, 0x32, 0xf1, 0x99, 0x49, 0xc2, 0xc5, 0xdb, 0x50, 0xbf, + 0x82, 0x11, 0x38, 0xce, 0x40, 0xc9, 0x3e, 0x85, 0xd3, 0xc9 }; static const uint8_t chiptest_63ed1e870cb3_fe2_50[] = { 0x5b, 0xbb, 0x9f, 0x3f, 0x4f, 0x44, 0xd0, 0x72, 0x0f, 0x3a, 0xa9, - 0x4e, 0xd9, 0xaf, 0x1c, 0xe4, 0xf5, 0x7c, 0xce, 0x2e, 0x53, 0x34, - 0xe2, 0x46, 0xcd, 0x5e, 0x14, 0x07, 0x11, 0x62, 0x70, 0xc8 }; + 0x4e, 0xd9, 0xaf, 0x1c, 0xe4, 0xf5, 0x7c, 0xce, 0x2e, 0x53, 0x34, + 0xe2, 0x46, 0xcd, 0x5e, 0x14, 0x07, 0x11, 0x62, 0x70, 0xc8 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_51[] = { 0xb0, 0xce, 0x57, 0x4c, 0x66, 0x7e, 0x57, 0x52, 0x10, 0xde, 0x4f, 0xdb, 0x6c, 0xa9, 0x4a, 0x8d, 0x53, 0x32, 0xbd, 0xcb, 0x9e, 0xd6, 0x54, 0x97, 0x7d, 0x70, 0xbe, 0x22, 0x42, 0x1a, 0xb1, 0x47 }; @@ -256,11 +256,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_52 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_53[] = { 0xc3, 0x18, 0x0a, 0x9f, 0x58, 0x69, 0x86, 0x34, 0xe3, 0x11, 0x26, - 0x9d, 0xa9, 0x2e, 0xf1, 0xee, 0x88, 0xf4, 0xac, 0x98, 0xc9, 0x68, - 0x43, 0xbc, 0x4d, 0x83, 0x4e, 0x97, 0x0e, 0x04, 0x21, 0x2e }; + 0x9d, 0xa9, 0x2e, 0xf1, 0xee, 0x88, 0xf4, 0xac, 0x98, 0xc9, 0x68, + 0x43, 0xbc, 0x4d, 0x83, 0x4e, 0x97, 0x0e, 0x04, 0x21, 0x2e }; static const uint8_t chiptest_63ed1e870cb3_fe2_54[] = { 0xdd, 0x43, 0x95, 0xd5, 0x93, 0x22, 0x26, 0x81, 0x85, 0xc6, 0x0f, - 0x7a, 0x0e, 0x78, 0x2c, 0x3f, 0xad, 0x53, 0x5a, 0x4b, 0x1c, 0x83, - 0x52, 0x84, 0x24, 0x52, 0xdb, 0x0a, 0xe5, 0xee, 0xd0, 0xe6 }; + 0x7a, 0x0e, 0x78, 0x2c, 0x3f, 0xad, 0x53, 0x5a, 0x4b, 0x1c, 0x83, + 0x52, 0x84, 0x24, 0x52, 0xdb, 0x0a, 0xe5, 0xee, 0xd0, 0xe6 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_55[] = { 0x3a, 0xa9, 0xa5, 0x34, 0xbc, 0x75, 0x38, 0xcc, 0x5b, 0x55, 0x2e, 0xaa, 0x61, 0x1c, 0x2a, 0x42, 0x77, 0x27, 0x95, 0x67, 0xe0, 0xf6, 0x70, 0x1b, 0x39, 0x9c, 0xe0, 0xf7, 0xe9, 0x9b, 0x6c, 0xec }; @@ -273,11 +273,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_56 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_57[] = { 0xe1, 0xba, 0x1d, 0x51, 0x18, 0xe4, 0xd0, 0x43, 0x89, 0xca, 0xa5, - 0xf7, 0x05, 0xd3, 0x55, 0x95, 0x49, 0xf5, 0xa4, 0x0e, 0x25, 0x8d, - 0x3a, 0xc5, 0x8b, 0x11, 0xe7, 0xc4, 0x09, 0x5b, 0x21, 0x18 }; + 0xf7, 0x05, 0xd3, 0x55, 0x95, 0x49, 0xf5, 0xa4, 0x0e, 0x25, 0x8d, + 0x3a, 0xc5, 0x8b, 0x11, 0xe7, 0xc4, 0x09, 0x5b, 0x21, 0x18 }; static const uint8_t chiptest_63ed1e870cb3_fe2_58[] = { 0xde, 0x34, 0xd2, 0x7c, 0x0b, 0x4c, 0xf6, 0x7a, 0x16, 0xe1, 0x65, - 0x38, 0xe5, 0xfd, 0xf8, 0xe7, 0xc3, 0x9f, 0x91, 0x5c, 0xa2, 0x31, - 0x6e, 0xbf, 0xb9, 0x50, 0xf7, 0x60, 0x06, 0x06, 0xd5, 0xa8 }; + 0x38, 0xe5, 0xfd, 0xf8, 0xe7, 0xc3, 0x9f, 0x91, 0x5c, 0xa2, 0x31, + 0x6e, 0xbf, 0xb9, 0x50, 0xf7, 0x60, 0x06, 0x06, 0xd5, 0xa8 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_59[] = { 0x36, 0xe9, 0xee, 0x98, 0x94, 0x92, 0xba, 0xe5, 0x08, 0xa9, 0xd4, 0xe4, 0x6c, 0xa2, 0x78, 0xd9, 0x80, 0xd6, 0xa8, 0xaa, 0x69, 0xa6, 0x14, 0x53, 0xf2, 0x74, 0x0e, 0xc6, 0x96, 0xc1, 0xef, 0x3b }; @@ -290,11 +290,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_60 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_61[] = { 0xda, 0xe5, 0xdf, 0x2e, 0x15, 0xca, 0xd1, 0xa1, 0x32, 0xd2, 0xa1, - 0xce, 0xb7, 0x58, 0x5f, 0xe6, 0x7c, 0x7a, 0xce, 0xf6, 0xb2, 0x64, - 0x6a, 0x44, 0x81, 0x1a, 0x04, 0xcd, 0xcd, 0x05, 0x6a, 0xe2 }; + 0xce, 0xb7, 0x58, 0x5f, 0xe6, 0x7c, 0x7a, 0xce, 0xf6, 0xb2, 0x64, + 0x6a, 0x44, 0x81, 0x1a, 0x04, 0xcd, 0xcd, 0x05, 0x6a, 0xe2 }; static const uint8_t chiptest_63ed1e870cb3_fe2_62[] = { 0xcb, 0xa3, 0xfd, 0x43, 0xdc, 0xc3, 0xca, 0x49, 0x48, 0xc0, 0x2b, - 0x3b, 0xf7, 0x97, 0xb5, 0x50, 0xe7, 0xbb, 0x89, 0xa4, 0x7a, 0xa5, - 0x78, 0x0b, 0xad, 0x25, 0x19, 0xfd, 0x7e, 0x63, 0xca, 0x53 }; + 0x3b, 0xf7, 0x97, 0xb5, 0x50, 0xe7, 0xbb, 0x89, 0xa4, 0x7a, 0xa5, + 0x78, 0x0b, 0xad, 0x25, 0x19, 0xfd, 0x7e, 0x63, 0xca, 0x53 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_63[] = { 0x6c, 0x77, 0xed, 0xe2, 0x2e, 0x73, 0xd2, 0x1a, 0x7c, 0x71, 0x3d, 0x02, 0xae, 0x3f, 0x75, 0xec, 0xfc, 0xee, 0xeb, 0x2b, 0x0f, 0x9e, 0x1e, 0x16, 0x08, 0x28, 0x7d, 0x3e, 0xa2, 0x1d, 0xa6, 0xdf }; @@ -307,11 +307,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_64 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_65[] = { 0x73, 0x6c, 0x42, 0x51, 0x4e, 0x9c, 0xe4, 0x9b, 0x42, 0x8f, 0xbf, - 0x3a, 0x37, 0x0a, 0xf9, 0xf9, 0xac, 0x90, 0xf6, 0x60, 0x5c, 0x14, - 0x2e, 0xd1, 0x52, 0xcf, 0xb4, 0x60, 0x6e, 0x16, 0x49, 0xb7 }; + 0x3a, 0x37, 0x0a, 0xf9, 0xf9, 0xac, 0x90, 0xf6, 0x60, 0x5c, 0x14, + 0x2e, 0xd1, 0x52, 0xcf, 0xb4, 0x60, 0x6e, 0x16, 0x49, 0xb7 }; static const uint8_t chiptest_63ed1e870cb3_fe2_66[] = { 0x42, 0xbc, 0x61, 0xb7, 0xd4, 0x28, 0x3f, 0xfe, 0x2c, 0x5d, 0x3f, - 0xb9, 0x02, 0x20, 0x4b, 0x1f, 0xde, 0x79, 0xe5, 0x27, 0x6e, 0x77, - 0xf6, 0x56, 0xa4, 0xff, 0xcf, 0xed, 0xb9, 0x3e, 0x09, 0x98 }; + 0xb9, 0x02, 0x20, 0x4b, 0x1f, 0xde, 0x79, 0xe5, 0x27, 0x6e, 0x77, + 0xf6, 0x56, 0xa4, 0xff, 0xcf, 0xed, 0xb9, 0x3e, 0x09, 0x98 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_67[] = { 0x24, 0x8b, 0xc5, 0xe4, 0x35, 0x77, 0x15, 0xa2, 0xfe, 0xf7, 0xa2, 0xf6, 0xca, 0x86, 0x6f, 0x2b, 0xf6, 0xc7, 0xa9, 0xfd, 0xaf, 0xb4, 0x87, 0x25, 0xd7, 0x6a, 0x84, 0x96, 0xc3, 0xe2, 0x10, 0x15 }; @@ -324,11 +324,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_68 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_69[] = { 0x69, 0xc6, 0x0f, 0x22, 0xb6, 0xc6, 0x78, 0x84, 0xed, 0x83, 0xdb, - 0x44, 0x0d, 0x33, 0xbf, 0xb4, 0x11, 0x43, 0x69, 0x1c, 0xb3, 0x7c, - 0xec, 0xa9, 0x21, 0xb3, 0xd8, 0xda, 0x3a, 0x7c, 0x15, 0x62 }; + 0x44, 0x0d, 0x33, 0xbf, 0xb4, 0x11, 0x43, 0x69, 0x1c, 0xb3, 0x7c, + 0xec, 0xa9, 0x21, 0xb3, 0xd8, 0xda, 0x3a, 0x7c, 0x15, 0x62 }; static const uint8_t chiptest_63ed1e870cb3_fe2_70[] = { 0xe2, 0x22, 0x9d, 0xf1, 0x9d, 0xd3, 0x40, 0x0d, 0x10, 0x81, 0x48, - 0x14, 0x71, 0xd8, 0x67, 0x6b, 0xa6, 0xc2, 0x4b, 0x95, 0xc4, 0x64, - 0x53, 0xe8, 0xae, 0xda, 0xe6, 0x83, 0x9c, 0xd3, 0x58, 0x82 }; + 0x14, 0x71, 0xd8, 0x67, 0x6b, 0xa6, 0xc2, 0x4b, 0x95, 0xc4, 0x64, + 0x53, 0xe8, 0xae, 0xda, 0xe6, 0x83, 0x9c, 0xd3, 0x58, 0x82 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_71[] = { 0x57, 0x53, 0x9a, 0x54, 0x2c, 0xff, 0xb5, 0xa7, 0x88, 0x57, 0x2b, 0xb3, 0xa2, 0x4b, 0x71, 0x61, 0xd7, 0x1a, 0xfa, 0x28, 0xb9, 0xe6, 0x33, 0xba, 0x3b, 0x87, 0x0e, 0x78, 0x35, 0xf9, 0xe9, 0x11 }; @@ -341,11 +341,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_72 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_73[] = { 0xfd, 0x1b, 0x88, 0x12, 0x2e, 0x0e, 0xbd, 0xbf, 0xd3, 0x78, 0xd9, - 0xa1, 0xe6, 0x31, 0x70, 0xa8, 0xb7, 0xc3, 0x44, 0x3c, 0x42, 0x83, - 0xba, 0xaa, 0x68, 0x38, 0xc5, 0x69, 0x2f, 0x96, 0xf3, 0xad }; + 0xa1, 0xe6, 0x31, 0x70, 0xa8, 0xb7, 0xc3, 0x44, 0x3c, 0x42, 0x83, + 0xba, 0xaa, 0x68, 0x38, 0xc5, 0x69, 0x2f, 0x96, 0xf3, 0xad }; static const uint8_t chiptest_63ed1e870cb3_fe2_74[] = { 0x06, 0xf2, 0x1a, 0x57, 0x92, 0xd9, 0x6f, 0x10, 0x87, 0x05, 0xcd, - 0x9b, 0x75, 0x6b, 0x70, 0x73, 0x88, 0x7d, 0x3f, 0x03, 0x70, 0x7e, - 0x9f, 0x21, 0x98, 0xd8, 0x56, 0xcd, 0x1b, 0xdc, 0x94, 0x1a }; + 0x9b, 0x75, 0x6b, 0x70, 0x73, 0x88, 0x7d, 0x3f, 0x03, 0x70, 0x7e, + 0x9f, 0x21, 0x98, 0xd8, 0x56, 0xcd, 0x1b, 0xdc, 0x94, 0x1a }; static const uint8_t chiptest_63ed1e870cb3_fe_out_75[] = { 0x34, 0x23, 0x70, 0x5f, 0xac, 0x64, 0xb9, 0x65, 0xb7, 0x1c, 0x70, 0xb1, 0x16, 0x4b, 0x8e, 0x1a, 0x97, 0x30, 0x91, 0xef, 0xb7, 0x49, 0x08, 0xb8, 0xe2, 0x64, 0x94, 0x79, 0x84, 0x3d, 0xad, 0x99 }; @@ -358,11 +358,11 @@ static const struct spake2p_fe_mul_tv chiptest_63ed1e870cb3_test_vector_76 = { .fe_out_len = 32, }; static const uint8_t chiptest_63ed1e870cb3_fe1_77[] = { 0x26, 0x57, 0x4a, 0x69, 0x77, 0x9a, 0x55, 0xc5, 0x8c, 0x3e, 0xe9, - 0x37, 0x6c, 0x3c, 0x26, 0x75, 0x78, 0x00, 0x91, 0x62, 0xba, 0x2f, - 0x76, 0x75, 0x40, 0x79, 0x89, 0x7f, 0x27, 0x65, 0xb7, 0xe0 }; + 0x37, 0x6c, 0x3c, 0x26, 0x75, 0x78, 0x00, 0x91, 0x62, 0xba, 0x2f, + 0x76, 0x75, 0x40, 0x79, 0x89, 0x7f, 0x27, 0x65, 0xb7, 0xe0 }; static const uint8_t chiptest_63ed1e870cb3_fe2_78[] = { 0x79, 0x1a, 0x58, 0x65, 0x3a, 0x33, 0x22, 0xae, 0xc1, 0x4b, 0xfa, - 0x69, 0x61, 0x79, 0x3f, 0xb1, 0x90, 0x32, 0x46, 0x84, 0xc5, 0x1d, - 0x00, 0x16, 0x19, 0x89, 0x44, 0x4a, 0x51, 0xee, 0xbd, 0xe4 }; + 0x69, 0x61, 0x79, 0x3f, 0xb1, 0x90, 0x32, 0x46, 0x84, 0xc5, 0x1d, + 0x00, 0x16, 0x19, 0x89, 0x44, 0x4a, 0x51, 0xee, 0xbd, 0xe4 }; static const uint8_t chiptest_63ed1e870cb3_fe_out_79[] = { 0xcb, 0x33, 0x20, 0x59, 0x46, 0x96, 0xf5, 0xf3, 0xd3, 0xc9, 0x71, 0x95, 0x38, 0x45, 0xcd, 0x57, 0xec, 0x61, 0x42, 0xc3, 0xbf, 0xff, 0x19, 0x19, 0xd1, 0xf5, 0x2f, 0xed, 0x77, 0x99, 0x4c, 0xa2 }; diff --git a/src/crypto/tests/SPAKE2P_FE_RW_test_vectors.h b/src/crypto/tests/SPAKE2P_FE_RW_test_vectors.h index 66fbd54151af20..7b79e5a48dd07e 100644 --- a/src/crypto/tests/SPAKE2P_FE_RW_test_vectors.h +++ b/src/crypto/tests/SPAKE2P_FE_RW_test_vectors.h @@ -53,8 +53,8 @@ static const struct spake2p_fe_rw_tv chiptest_53ea71b7cccd_test_vector_6 = { .fe_out_len = 32, }; static const uint8_t chiptest_53ea71b7cccd_fe_in_7[] = { 0x7f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const uint8_t chiptest_53ea71b7cccd_fe_out_8[] = { 0x7f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -65,8 +65,8 @@ static const struct spake2p_fe_rw_tv chiptest_53ea71b7cccd_test_vector_9 = { .fe_out_len = 32, }; static const uint8_t chiptest_53ea71b7cccd_fe_in_10[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, - 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x50 }; + 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, + 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x50 }; static const uint8_t chiptest_53ea71b7cccd_fe_out_11[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x50 }; @@ -77,8 +77,8 @@ static const struct spake2p_fe_rw_tv chiptest_53ea71b7cccd_test_vector_12 = { .fe_out_len = 32, }; static const uint8_t chiptest_53ea71b7cccd_fe_in_13[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, - 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x51 }; + 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, + 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x51 }; static const uint8_t chiptest_53ea71b7cccd_fe_out_14[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -89,8 +89,8 @@ static const struct spake2p_fe_rw_tv chiptest_53ea71b7cccd_test_vector_15 = { .fe_out_len = 32, }; static const uint8_t chiptest_53ea71b7cccd_fe_in_16[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, - 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x52 }; + 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, + 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x52 }; static const uint8_t chiptest_53ea71b7cccd_fe_out_17[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }; @@ -101,8 +101,8 @@ static const struct spake2p_fe_rw_tv chiptest_53ea71b7cccd_test_vector_18 = { .fe_out_len = 32, }; static const uint8_t chiptest_53ea71b7cccd_fe_in_19[] = { 0x01, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x79, 0xcd, 0xf5, 0x5b, 0x4e, - 0x2f, 0x3d, 0x09, 0xe7, 0x73, 0x95, 0x85, 0xf8, 0xc6, 0x4a, 0xa1 }; + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x79, 0xcd, 0xf5, 0x5b, 0x4e, + 0x2f, 0x3d, 0x09, 0xe7, 0x73, 0x95, 0x85, 0xf8, 0xc6, 0x4a, 0xa1 }; static const uint8_t chiptest_53ea71b7cccd_fe_out_20[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, 0xa7, 0x17, 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x50 }; diff --git a/src/crypto/tests/SPAKE2P_HMAC_test_vectors.h b/src/crypto/tests/SPAKE2P_HMAC_test_vectors.h index dd1f083195d299..1e8b9088ece72a 100644 --- a/src/crypto/tests/SPAKE2P_HMAC_test_vectors.h +++ b/src/crypto/tests/SPAKE2P_HMAC_test_vectors.h @@ -35,8 +35,8 @@ struct spake2p_hmac_tv }; static const uint8_t chiptest_be68c22260b3_key_1[] = { 0x28, 0xd7, 0x74, 0x50, 0xc1, 0xc6, 0x64, 0x3b, 0xcc, 0x72, 0xb6, - 0xf0, 0x03, 0xf2, 0x7b, 0x92, 0x37, 0x16, 0xde, 0x1c, 0x9b, 0x38, - 0x1f, 0x1f, 0xee, 0xf7, 0x08, 0xb8, 0x55, 0xa0, 0x2d, 0xbe }; + 0xf0, 0x03, 0xf2, 0x7b, 0x92, 0x37, 0x16, 0xde, 0x1c, 0x9b, 0x38, + 0x1f, 0x1f, 0xee, 0xf7, 0x08, 0xb8, 0x55, 0xa0, 0x2d, 0xbe }; static const uint8_t chiptest_be68c22260b3_input_2[] = { 0xdd }; static const uint8_t chiptest_be68c22260b3_output_3[] = { 0x87, 0x0b, 0xf5, 0xd9, 0x95, 0x46, 0x0b, 0x9b, 0x69, 0xfa, 0xe8, 0x73, 0x89, 0xb9, 0x31, 0xb9, 0xe0, 0x97, 0x2a, 0xf8, 0xe1, 0x38, @@ -50,8 +50,8 @@ static const struct spake2p_hmac_tv chiptest_be68c22260b3_test_vector_4 = { .output_len = 32, }; static const uint8_t chiptest_be68c22260b3_key_5[] = { 0x28, 0xd7, 0x74, 0x50, 0xc1, 0xc6, 0x64, 0x3b, 0xcc, 0x72, 0xb6, - 0xf0, 0x03, 0xf2, 0x7b, 0x92, 0x37, 0x16, 0xde, 0x1c, 0x9b, 0x38, - 0x1f, 0x1f, 0xee, 0xf7, 0x08, 0xb8, 0x55, 0xa0, 0x2d, 0xbe }; + 0xf0, 0x03, 0xf2, 0x7b, 0x92, 0x37, 0x16, 0xde, 0x1c, 0x9b, 0x38, + 0x1f, 0x1f, 0xee, 0xf7, 0x08, 0xb8, 0x55, 0xa0, 0x2d, 0xbe }; static const uint8_t chiptest_be68c22260b3_input_6[] = { 0x84, 0xb7, 0xf1, 0xda, 0xca, 0x02, 0x91, 0x56, 0xea, 0x47, 0xda, 0x9b }; static const uint8_t chiptest_be68c22260b3_output_7[] = { 0x56, 0x0c, 0x73, 0x79, 0x45, 0xff, 0x4a, 0x10, 0x28, 0x62, 0x9e, 0xa3, 0x45, 0xda, 0xec, 0x57, 0x8d, 0x2e, 0xc3, 0xa7, 0x14, 0x63, @@ -65,11 +65,11 @@ static const struct spake2p_hmac_tv chiptest_be68c22260b3_test_vector_8 = { .output_len = 32, }; static const uint8_t chiptest_be68c22260b3_key_9[] = { 0x28, 0xd7, 0x74, 0x50, 0xc1, 0xc6, 0x64, 0x3b, 0xcc, 0x72, 0xb6, - 0xf0, 0x03, 0xf2, 0x7b, 0x92, 0x37, 0x16, 0xde, 0x1c, 0x9b, 0x38, - 0x1f, 0x1f, 0xee, 0xf7, 0x08, 0xb8, 0x55, 0xa0, 0x2d, 0xbe }; + 0xf0, 0x03, 0xf2, 0x7b, 0x92, 0x37, 0x16, 0xde, 0x1c, 0x9b, 0x38, + 0x1f, 0x1f, 0xee, 0xf7, 0x08, 0xb8, 0x55, 0xa0, 0x2d, 0xbe }; static const uint8_t chiptest_be68c22260b3_input_10[] = { 0xe0, 0x82, 0x91, 0xf0, 0x39, 0xe4, 0x78, 0xc3, 0xdf, 0xb2, 0x82, - 0xb6, 0x99, 0x3b, 0xae, 0x80, 0x1f, 0xa0, 0xd3, 0xd0, 0xb0, 0x39, - 0x20, 0xb6, 0x3e, 0x17, 0xeb, 0x1e, 0xbb, 0x55, 0x0b, 0x64 }; + 0xb6, 0x99, 0x3b, 0xae, 0x80, 0x1f, 0xa0, 0xd3, 0xd0, 0xb0, 0x39, + 0x20, 0xb6, 0x3e, 0x17, 0xeb, 0x1e, 0xbb, 0x55, 0x0b, 0x64 }; static const uint8_t chiptest_be68c22260b3_output_11[] = { 0xf2, 0x93, 0x0f, 0xcc, 0x89, 0x78, 0xa4, 0x93, 0xc7, 0x79, 0xd4, 0x1f, 0x7e, 0xb9, 0x6d, 0x50, 0xfe, 0xa3, 0x5b, 0x3f, 0x36, 0xf3, 0xed, 0x04, 0x80, 0x98, 0x51, 0x37, 0x4b, 0xdf, 0xa3, 0x86 }; @@ -82,14 +82,14 @@ static const struct spake2p_hmac_tv chiptest_be68c22260b3_test_vector_12 = { .output_len = 32, }; static const uint8_t chiptest_be68c22260b3_key_13[] = { 0x28, 0xd7, 0x74, 0x50, 0xc1, 0xc6, 0x64, 0x3b, 0xcc, 0x72, 0xb6, - 0xf0, 0x03, 0xf2, 0x7b, 0x92, 0x37, 0x16, 0xde, 0x1c, 0x9b, 0x38, - 0x1f, 0x1f, 0xee, 0xf7, 0x08, 0xb8, 0x55, 0xa0, 0x2d, 0xbe }; + 0xf0, 0x03, 0xf2, 0x7b, 0x92, 0x37, 0x16, 0xde, 0x1c, 0x9b, 0x38, + 0x1f, 0x1f, 0xee, 0xf7, 0x08, 0xb8, 0x55, 0xa0, 0x2d, 0xbe }; static const uint8_t chiptest_be68c22260b3_input_14[] = { 0x2a, 0xc0, 0xae, 0x52, 0xdf, 0x1c, 0x83, 0x0a, 0x95, 0x59, 0x7a, - 0x43, 0xd5, 0xa6, 0xed, 0x1a, 0x46, 0x4d, 0xf6, 0x96, 0x4d, 0x28, - 0x12, 0x2f, 0x98, 0x16, 0x9e, 0xb4, 0x92, 0x0b, 0x8e, 0x56, 0x50, - 0x31, 0x09, 0x74, 0xa0, 0x23, 0x8f, 0x0e, 0x5d, 0x80, 0x7e, 0x91, - 0x8d, 0x9e, 0x4c, 0x89, 0x00, 0x17, 0x0f, 0x95, 0x59, 0x81, 0x5d, - 0x06, 0x1d, 0x71, 0xbf, 0xb7, 0xc6, 0x1d, 0x2c, 0x0d }; + 0x43, 0xd5, 0xa6, 0xed, 0x1a, 0x46, 0x4d, 0xf6, 0x96, 0x4d, 0x28, + 0x12, 0x2f, 0x98, 0x16, 0x9e, 0xb4, 0x92, 0x0b, 0x8e, 0x56, 0x50, + 0x31, 0x09, 0x74, 0xa0, 0x23, 0x8f, 0x0e, 0x5d, 0x80, 0x7e, 0x91, + 0x8d, 0x9e, 0x4c, 0x89, 0x00, 0x17, 0x0f, 0x95, 0x59, 0x81, 0x5d, + 0x06, 0x1d, 0x71, 0xbf, 0xb7, 0xc6, 0x1d, 0x2c, 0x0d }; static const uint8_t chiptest_be68c22260b3_output_15[] = { 0x97, 0xac, 0x84, 0xe7, 0x3a, 0x68, 0x94, 0xa7, 0x25, 0xb1, 0x11, 0x92, 0x69, 0x15, 0x95, 0x5a, 0xf8, 0xf6, 0x16, 0xc2, 0xc7, 0xe3, 0x7c, 0xd8, 0xaf, 0x2c, 0x27, 0x23, 0x9a, 0x33, 0x6f, 0xc4 }; @@ -102,8 +102,8 @@ static const struct spake2p_hmac_tv chiptest_be68c22260b3_test_vector_16 = { .output_len = 32, }; static const uint8_t chiptest_be68c22260b3_key_17[] = { 0x28, 0xd7, 0x74, 0x50, 0xc1, 0xc6, 0x64, 0x3b, 0xcc, 0x72, 0xb6, - 0xf0, 0x03, 0xf2, 0x7b, 0x92, 0x37, 0x16, 0xde, 0x1c, 0x9b, 0x38, - 0x1f, 0x1f, 0xee, 0xf7, 0x08, 0xb8, 0x55, 0xa0, 0x2d, 0xbe }; + 0xf0, 0x03, 0xf2, 0x7b, 0x92, 0x37, 0x16, 0xde, 0x1c, 0x9b, 0x38, + 0x1f, 0x1f, 0xee, 0xf7, 0x08, 0xb8, 0x55, 0xa0, 0x2d, 0xbe }; static const uint8_t chiptest_be68c22260b3_input_18[] = { 0x77, 0xf0, 0xd4, 0x66, 0xdb, 0x6e, 0x39, 0x13, 0x60, 0x59, 0xc3, 0xdc, 0x10, 0x6e, 0x3f, 0x1d, 0x79, 0x86, 0xb3, 0x66, 0xbd, 0x63, 0x0b, 0xdd, 0x65, 0xf3, 0x68, 0x09, 0x27, 0x9d, 0x70, 0x79, 0x90, 0x96, 0xd2, 0x34, 0xbf, 0x86, diff --git a/src/crypto/tests/SPAKE2P_POINT_MUL_ADD_test_vectors.h b/src/crypto/tests/SPAKE2P_POINT_MUL_ADD_test_vectors.h index f4f37fdf670e6e..ab7eac7a750dfa 100644 --- a/src/crypto/tests/SPAKE2P_POINT_MUL_ADD_test_vectors.h +++ b/src/crypto/tests/SPAKE2P_POINT_MUL_ADD_test_vectors.h @@ -40,23 +40,23 @@ struct spake2p_point_muladd_tv }; static const uint8_t chiptest_fcf59b3113ef_point1_1[] = { 0x04, 0x5d, 0xe7, 0x3c, 0x3b, 0x9c, 0x5a, 0x6f, 0x62, 0x83, 0x01, - 0xdc, 0xd3, 0x84, 0x9f, 0x1b, 0x58, 0xa2, 0xd5, 0x44, 0x27, 0x58, - 0x4f, 0xb3, 0xa2, 0xdf, 0xb8, 0x18, 0x25, 0x88, 0x17, 0x97, 0xa3, - 0xf8, 0xbc, 0x49, 0xdd, 0xd3, 0xee, 0xd6, 0x55, 0x86, 0xec, 0xa4, - 0x58, 0x93, 0x06, 0x9b, 0x79, 0x66, 0x07, 0xc1, 0x85, 0x46, 0x0b, - 0xce, 0x6d, 0xe5, 0x42, 0x69, 0x70, 0x02, 0x12, 0x3b, 0x77 }; + 0xdc, 0xd3, 0x84, 0x9f, 0x1b, 0x58, 0xa2, 0xd5, 0x44, 0x27, 0x58, + 0x4f, 0xb3, 0xa2, 0xdf, 0xb8, 0x18, 0x25, 0x88, 0x17, 0x97, 0xa3, + 0xf8, 0xbc, 0x49, 0xdd, 0xd3, 0xee, 0xd6, 0x55, 0x86, 0xec, 0xa4, + 0x58, 0x93, 0x06, 0x9b, 0x79, 0x66, 0x07, 0xc1, 0x85, 0x46, 0x0b, + 0xce, 0x6d, 0xe5, 0x42, 0x69, 0x70, 0x02, 0x12, 0x3b, 0x77 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_2[] = { 0xb1, 0x4b, 0x5e, 0x03, 0xfc, 0xbf, 0xd5, 0x07, 0x98, 0x96, 0x9c, - 0x24, 0xc8, 0x0c, 0x77, 0xb6, 0x78, 0xa7, 0xc6, 0x6b, 0x9c, 0xce, - 0x16, 0xef, 0x46, 0xe1, 0x1e, 0xbf, 0x6d, 0xd5, 0x2c, 0x00 }; + 0x24, 0xc8, 0x0c, 0x77, 0xb6, 0x78, 0xa7, 0xc6, 0x6b, 0x9c, 0xce, + 0x16, 0xef, 0x46, 0xe1, 0x1e, 0xbf, 0x6d, 0xd5, 0x2c, 0x00 }; static const uint8_t chiptest_fcf59b3113ef_point2_3[] = { 0x04, 0xe5, 0x6d, 0xed, 0x91, 0x01, 0x0a, 0x92, 0x45, 0x0c, 0x5d, - 0xef, 0x8a, 0xac, 0xd3, 0x3c, 0x09, 0xdd, 0x42, 0xb0, 0x2b, 0x4e, - 0xc2, 0xb6, 0xf9, 0x25, 0x90, 0xd6, 0x19, 0x78, 0xd3, 0x84, 0x79, - 0x76, 0x61, 0xc2, 0x72, 0x70, 0x90, 0xf3, 0x17, 0x49, 0x8e, 0xb9, - 0xd7, 0xe4, 0x65, 0x3f, 0xbd, 0xc6, 0xef, 0x53, 0xdb, 0x0e, 0x5c, - 0xd1, 0xe9, 0x17, 0xb4, 0x6e, 0x5f, 0x6c, 0xd3, 0x2e, 0x64 }; + 0xef, 0x8a, 0xac, 0xd3, 0x3c, 0x09, 0xdd, 0x42, 0xb0, 0x2b, 0x4e, + 0xc2, 0xb6, 0xf9, 0x25, 0x90, 0xd6, 0x19, 0x78, 0xd3, 0x84, 0x79, + 0x76, 0x61, 0xc2, 0x72, 0x70, 0x90, 0xf3, 0x17, 0x49, 0x8e, 0xb9, + 0xd7, 0xe4, 0x65, 0x3f, 0xbd, 0xc6, 0xef, 0x53, 0xdb, 0x0e, 0x5c, + 0xd1, 0xe9, 0x17, 0xb4, 0x6e, 0x5f, 0x6c, 0xd3, 0x2e, 0x64 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_4[] = { 0x98, 0x97, 0xb6, 0x17, 0x69, 0xae, 0xa7, 0xfe, 0x82, 0x67, 0xe2, - 0xbf, 0x19, 0x95, 0xfd, 0x09, 0xae, 0xe0, 0x02, 0x64, 0xd7, 0x22, - 0x0d, 0x55, 0x06, 0x60, 0x7b, 0xcc, 0x20, 0xe5, 0xa0, 0xf1 }; + 0xbf, 0x19, 0x95, 0xfd, 0x09, 0xae, 0xe0, 0x02, 0x64, 0xd7, 0x22, + 0x0d, 0x55, 0x06, 0x60, 0x7b, 0xcc, 0x20, 0xe5, 0xa0, 0xf1 }; static const uint8_t chiptest_fcf59b3113ef_out_point_5[] = { 0x04, 0x1b, 0x4a, 0xdb, 0x11, 0x30, 0xec, 0x0a, 0x72, 0xda, 0x84, 0x70, 0x93, 0xa1, 0x76, 0x35, 0x35, 0xa5, 0xe9, 0xe6, 0x92, 0x12, 0xfc, 0x5f, 0xee, 0xc6, 0x97, 0x27, 0xb2, 0x8c, 0x7c, 0x83, 0x77, @@ -76,23 +76,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_6 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_7[] = { 0x04, 0x8e, 0xa4, 0x1c, 0xaa, 0x08, 0x06, 0x29, 0x8b, 0x95, 0x69, - 0xc1, 0xc5, 0x80, 0x7f, 0x58, 0x17, 0x15, 0xa3, 0x66, 0x18, 0x8a, - 0x67, 0xf8, 0x43, 0xa8, 0xcc, 0x93, 0x64, 0x14, 0x5f, 0x00, 0x4b, - 0x7a, 0x9f, 0xef, 0xaf, 0xa2, 0x72, 0xe6, 0x8b, 0x08, 0x79, 0xa3, - 0xc1, 0x93, 0xda, 0x96, 0xec, 0x48, 0xfe, 0xad, 0xe2, 0xd8, 0x6e, - 0x50, 0x9a, 0x47, 0x92, 0xea, 0xde, 0x33, 0x83, 0xc9, 0xe9 }; + 0xc1, 0xc5, 0x80, 0x7f, 0x58, 0x17, 0x15, 0xa3, 0x66, 0x18, 0x8a, + 0x67, 0xf8, 0x43, 0xa8, 0xcc, 0x93, 0x64, 0x14, 0x5f, 0x00, 0x4b, + 0x7a, 0x9f, 0xef, 0xaf, 0xa2, 0x72, 0xe6, 0x8b, 0x08, 0x79, 0xa3, + 0xc1, 0x93, 0xda, 0x96, 0xec, 0x48, 0xfe, 0xad, 0xe2, 0xd8, 0x6e, + 0x50, 0x9a, 0x47, 0x92, 0xea, 0xde, 0x33, 0x83, 0xc9, 0xe9 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_8[] = { 0x9f, 0xbb, 0x0e, 0xc3, 0x4d, 0x11, 0xed, 0x91, 0x2a, 0x51, 0x72, - 0x0e, 0x71, 0x30, 0x22, 0x32, 0xda, 0x76, 0x18, 0x9d, 0x21, 0x0c, - 0xcb, 0xc1, 0x85, 0x38, 0x9d, 0x6d, 0xaa, 0x94, 0x76, 0x5f }; + 0x0e, 0x71, 0x30, 0x22, 0x32, 0xda, 0x76, 0x18, 0x9d, 0x21, 0x0c, + 0xcb, 0xc1, 0x85, 0x38, 0x9d, 0x6d, 0xaa, 0x94, 0x76, 0x5f }; static const uint8_t chiptest_fcf59b3113ef_point2_9[] = { 0x04, 0xe6, 0x45, 0xf8, 0xba, 0xbd, 0xb3, 0x3f, 0xd2, 0xe9, 0x55, - 0x06, 0xcf, 0xd4, 0x5a, 0xee, 0x5a, 0x70, 0x37, 0xe1, 0x61, 0x90, - 0xfb, 0x98, 0x3c, 0x33, 0x8a, 0x99, 0x79, 0x5f, 0xeb, 0x5e, 0x47, - 0xbb, 0x0b, 0xfe, 0xc4, 0xac, 0x34, 0x7e, 0x82, 0xa4, 0x77, 0x9a, - 0xdf, 0x98, 0x7e, 0xa1, 0x6a, 0x3d, 0xae, 0x73, 0xc8, 0xcf, 0x68, - 0x06, 0x56, 0xeb, 0xec, 0x30, 0x30, 0x50, 0x3f, 0xfe, 0xa7 }; + 0x06, 0xcf, 0xd4, 0x5a, 0xee, 0x5a, 0x70, 0x37, 0xe1, 0x61, 0x90, + 0xfb, 0x98, 0x3c, 0x33, 0x8a, 0x99, 0x79, 0x5f, 0xeb, 0x5e, 0x47, + 0xbb, 0x0b, 0xfe, 0xc4, 0xac, 0x34, 0x7e, 0x82, 0xa4, 0x77, 0x9a, + 0xdf, 0x98, 0x7e, 0xa1, 0x6a, 0x3d, 0xae, 0x73, 0xc8, 0xcf, 0x68, + 0x06, 0x56, 0xeb, 0xec, 0x30, 0x30, 0x50, 0x3f, 0xfe, 0xa7 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_10[] = { 0x87, 0x8d, 0x31, 0xb4, 0x82, 0xf5, 0x6a, 0x32, 0x20, 0x21, 0xb7, - 0xbb, 0x57, 0x76, 0xc0, 0xca, 0xa0, 0x34, 0x3f, 0x8b, 0x02, 0x89, - 0xbe, 0xeb, 0xb9, 0x64, 0x4d, 0x45, 0x0c, 0x6a, 0x06 }; + 0xbb, 0x57, 0x76, 0xc0, 0xca, 0xa0, 0x34, 0x3f, 0x8b, 0x02, 0x89, + 0xbe, 0xeb, 0xb9, 0x64, 0x4d, 0x45, 0x0c, 0x6a, 0x06 }; static const uint8_t chiptest_fcf59b3113ef_out_point_11[] = { 0x04, 0x5c, 0x60, 0xf0, 0x8c, 0x47, 0x57, 0x07, 0x23, 0xf5, 0x74, 0xcc, 0x01, 0x7b, 0x2b, 0x50, 0xd8, 0x66, 0xfe, 0x5d, 0x84, 0x46, 0xd2, 0x37, 0xde, 0xa2, 0x42, 0x33, 0x5c, 0xfe, 0x8d, 0xda, 0xcd, @@ -112,23 +112,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_12 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_13[] = { 0x04, 0x90, 0x8a, 0xe0, 0x65, 0x97, 0xb4, 0x17, 0x02, 0xca, 0x2e, - 0xc9, 0x7f, 0xbd, 0x5b, 0x63, 0xae, 0x15, 0x82, 0x46, 0x4a, 0x55, - 0xc7, 0xe6, 0x5c, 0x76, 0xaf, 0x3f, 0xf6, 0xf3, 0xb5, 0x7f, 0x56, - 0xeb, 0xa2, 0x64, 0x03, 0x4c, 0x98, 0x8e, 0x1c, 0xdd, 0x2c, 0x8f, - 0xe2, 0x98, 0x44, 0x8c, 0xcc, 0x12, 0x0c, 0xcf, 0x12, 0xb1, 0x97, - 0x6d, 0x55, 0x92, 0xa5, 0x2c, 0x03, 0x3a, 0xd1, 0x0f, 0xa0 }; + 0xc9, 0x7f, 0xbd, 0x5b, 0x63, 0xae, 0x15, 0x82, 0x46, 0x4a, 0x55, + 0xc7, 0xe6, 0x5c, 0x76, 0xaf, 0x3f, 0xf6, 0xf3, 0xb5, 0x7f, 0x56, + 0xeb, 0xa2, 0x64, 0x03, 0x4c, 0x98, 0x8e, 0x1c, 0xdd, 0x2c, 0x8f, + 0xe2, 0x98, 0x44, 0x8c, 0xcc, 0x12, 0x0c, 0xcf, 0x12, 0xb1, 0x97, + 0x6d, 0x55, 0x92, 0xa5, 0x2c, 0x03, 0x3a, 0xd1, 0x0f, 0xa0 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_14[] = { 0x2e, 0x56, 0x81, 0xc3, 0xe0, 0x63, 0x4d, 0xfb, 0x15, 0x3a, 0xdc, - 0x38, 0xb2, 0x6e, 0x96, 0x69, 0x44, 0x9c, 0x45, 0x11, 0x3d, 0x0c, - 0xf1, 0x9f, 0x5c, 0x23, 0x35, 0x6c, 0x18, 0xb5, 0xc0, 0x31 }; + 0x38, 0xb2, 0x6e, 0x96, 0x69, 0x44, 0x9c, 0x45, 0x11, 0x3d, 0x0c, + 0xf1, 0x9f, 0x5c, 0x23, 0x35, 0x6c, 0x18, 0xb5, 0xc0, 0x31 }; static const uint8_t chiptest_fcf59b3113ef_point2_15[] = { 0x04, 0x78, 0xdc, 0xaa, 0x28, 0x27, 0x02, 0xcf, 0x4a, 0x0f, 0x89, - 0x19, 0xf0, 0x72, 0x9c, 0x19, 0xce, 0xee, 0x6f, 0xa9, 0x00, 0x84, - 0x0a, 0xd4, 0x88, 0x0d, 0x35, 0x28, 0xf0, 0x80, 0x12, 0x7c, 0x8e, - 0xbe, 0x0f, 0xad, 0xf7, 0x9f, 0x0a, 0xc4, 0x02, 0x84, 0x21, 0xf8, - 0x38, 0x8f, 0xdd, 0x39, 0x48, 0x56, 0x7b, 0x07, 0xd9, 0x15, 0xc2, - 0x19, 0xec, 0x95, 0x60, 0x5e, 0xbb, 0x2c, 0x22, 0x57, 0x0d }; + 0x19, 0xf0, 0x72, 0x9c, 0x19, 0xce, 0xee, 0x6f, 0xa9, 0x00, 0x84, + 0x0a, 0xd4, 0x88, 0x0d, 0x35, 0x28, 0xf0, 0x80, 0x12, 0x7c, 0x8e, + 0xbe, 0x0f, 0xad, 0xf7, 0x9f, 0x0a, 0xc4, 0x02, 0x84, 0x21, 0xf8, + 0x38, 0x8f, 0xdd, 0x39, 0x48, 0x56, 0x7b, 0x07, 0xd9, 0x15, 0xc2, + 0x19, 0xec, 0x95, 0x60, 0x5e, 0xbb, 0x2c, 0x22, 0x57, 0x0d }; static const uint8_t chiptest_fcf59b3113ef_scalar2_16[] = { 0x17, 0x52, 0xb9, 0x70, 0xa6, 0x7a, 0x43, 0xaf, 0x9e, 0x3f, 0x5d, - 0x68, 0xe3, 0xa4, 0x7c, 0x29, 0x83, 0x28, 0x81, 0x6c, 0xaa, 0x3b, - 0xa4, 0xcf, 0x1c, 0xdf, 0x45, 0x64, 0xf5, 0x08, 0x04, 0x5e }; + 0x68, 0xe3, 0xa4, 0x7c, 0x29, 0x83, 0x28, 0x81, 0x6c, 0xaa, 0x3b, + 0xa4, 0xcf, 0x1c, 0xdf, 0x45, 0x64, 0xf5, 0x08, 0x04, 0x5e }; static const uint8_t chiptest_fcf59b3113ef_out_point_17[] = { 0x04, 0xf6, 0xcd, 0xf5, 0xbd, 0xc0, 0x70, 0xd0, 0xd7, 0x92, 0xa4, 0x9b, 0x6a, 0x09, 0x64, 0xd3, 0xaf, 0x26, 0x78, 0x28, 0xa4, 0xb4, 0xbf, 0x47, 0x6e, 0x95, 0xe4, 0x5b, 0x4e, 0x3e, 0x93, 0x85, 0xf4, @@ -148,23 +148,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_18 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_19[] = { 0x04, 0x04, 0x05, 0x2b, 0x2c, 0xc8, 0xef, 0xb8, 0xc2, 0xad, 0xfd, - 0x12, 0x67, 0xc6, 0xf1, 0xc1, 0xcb, 0x34, 0x49, 0xae, 0x6e, 0x09, - 0x5e, 0xf2, 0x54, 0x5c, 0x91, 0x48, 0x66, 0xe8, 0x55, 0xf0, 0x9d, - 0x7c, 0xdb, 0xa3, 0x2d, 0x86, 0x32, 0x03, 0x13, 0x34, 0x2d, 0xbb, - 0x38, 0x0d, 0x0a, 0x16, 0xcd, 0x65, 0xa5, 0xdd, 0x17, 0xc6, 0xa0, - 0x46, 0x77, 0xd1, 0xa9, 0x9b, 0xaf, 0x32, 0x3b, 0x45, 0x60 }; + 0x12, 0x67, 0xc6, 0xf1, 0xc1, 0xcb, 0x34, 0x49, 0xae, 0x6e, 0x09, + 0x5e, 0xf2, 0x54, 0x5c, 0x91, 0x48, 0x66, 0xe8, 0x55, 0xf0, 0x9d, + 0x7c, 0xdb, 0xa3, 0x2d, 0x86, 0x32, 0x03, 0x13, 0x34, 0x2d, 0xbb, + 0x38, 0x0d, 0x0a, 0x16, 0xcd, 0x65, 0xa5, 0xdd, 0x17, 0xc6, 0xa0, + 0x46, 0x77, 0xd1, 0xa9, 0x9b, 0xaf, 0x32, 0x3b, 0x45, 0x60 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_20[] = { 0x39, 0x95, 0xe8, 0x7e, 0xd1, 0x30, 0x5d, 0x34, 0x95, 0x4c, 0x00, - 0x1b, 0xcd, 0x68, 0xd9, 0xb0, 0x5f, 0xae, 0x71, 0x82, 0x19, 0xf9, - 0xa5, 0x6a, 0x11, 0x96, 0x01, 0xac, 0x18, 0xa6, 0x1a, 0xf4 }; + 0x1b, 0xcd, 0x68, 0xd9, 0xb0, 0x5f, 0xae, 0x71, 0x82, 0x19, 0xf9, + 0xa5, 0x6a, 0x11, 0x96, 0x01, 0xac, 0x18, 0xa6, 0x1a, 0xf4 }; static const uint8_t chiptest_fcf59b3113ef_point2_21[] = { 0x04, 0x16, 0x33, 0xcd, 0xc0, 0xd3, 0x03, 0x7e, 0xa0, 0x7d, 0xb6, - 0x75, 0x02, 0x44, 0xfd, 0x56, 0xa1, 0x7f, 0x1f, 0xb0, 0xe4, 0x2a, - 0xf5, 0xb5, 0xb2, 0x86, 0xf2, 0x92, 0xe9, 0xcf, 0xd5, 0xb9, 0x19, - 0x66, 0x23, 0x8b, 0x12, 0xf3, 0x1e, 0x4c, 0x07, 0x7a, 0x26, 0x2c, - 0xa6, 0x92, 0x86, 0x9d, 0x8e, 0x2d, 0x49, 0x31, 0x77, 0x13, 0x37, - 0x09, 0x57, 0xe5, 0x70, 0x25, 0xa3, 0x2d, 0xc6, 0x71, 0xb9 }; + 0x75, 0x02, 0x44, 0xfd, 0x56, 0xa1, 0x7f, 0x1f, 0xb0, 0xe4, 0x2a, + 0xf5, 0xb5, 0xb2, 0x86, 0xf2, 0x92, 0xe9, 0xcf, 0xd5, 0xb9, 0x19, + 0x66, 0x23, 0x8b, 0x12, 0xf3, 0x1e, 0x4c, 0x07, 0x7a, 0x26, 0x2c, + 0xa6, 0x92, 0x86, 0x9d, 0x8e, 0x2d, 0x49, 0x31, 0x77, 0x13, 0x37, + 0x09, 0x57, 0xe5, 0x70, 0x25, 0xa3, 0x2d, 0xc6, 0x71, 0xb9 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_22[] = { 0x94, 0xcd, 0x9d, 0xe5, 0x38, 0xf2, 0xac, 0xff, 0x85, 0x44, 0xa1, - 0x75, 0xd7, 0xed, 0xad, 0x1c, 0x5a, 0xca, 0xa4, 0xa1, 0x55, 0x89, - 0xf5, 0x6f, 0x9d, 0xe2, 0xb0, 0xae, 0xef, 0x3c, 0xaf, 0x44 }; + 0x75, 0xd7, 0xed, 0xad, 0x1c, 0x5a, 0xca, 0xa4, 0xa1, 0x55, 0x89, + 0xf5, 0x6f, 0x9d, 0xe2, 0xb0, 0xae, 0xef, 0x3c, 0xaf, 0x44 }; static const uint8_t chiptest_fcf59b3113ef_out_point_23[] = { 0x04, 0x0d, 0xce, 0x4a, 0x77, 0x28, 0xfa, 0xfb, 0x9e, 0xa1, 0x89, 0x08, 0xcc, 0xae, 0x5b, 0x1c, 0x9d, 0x68, 0x17, 0x48, 0x30, 0x8b, 0x6b, 0xf2, 0x68, 0xc2, 0x65, 0xdd, 0xe6, 0x84, 0x03, 0x82, 0x8d, @@ -184,23 +184,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_24 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_25[] = { 0x04, 0xa1, 0xe5, 0x1c, 0xcf, 0x92, 0x59, 0x79, 0x0d, 0xe7, 0xce, - 0x64, 0x18, 0x53, 0x9c, 0x2f, 0x43, 0x30, 0x54, 0x68, 0x8d, 0x5b, - 0x61, 0x97, 0xe8, 0x15, 0x5e, 0x0a, 0x28, 0xad, 0x50, 0xb4, 0xa3, - 0x41, 0x0e, 0xe4, 0x65, 0xe0, 0xad, 0x74, 0xc3, 0x20, 0xf7, 0xdd, - 0x5e, 0xbf, 0xea, 0xa4, 0xac, 0x6d, 0x0c, 0xb4, 0xf3, 0x25, 0x82, - 0xaf, 0x99, 0x55, 0x6a, 0x0f, 0xcc, 0x0d, 0x9c, 0x38, 0xb2 }; + 0x64, 0x18, 0x53, 0x9c, 0x2f, 0x43, 0x30, 0x54, 0x68, 0x8d, 0x5b, + 0x61, 0x97, 0xe8, 0x15, 0x5e, 0x0a, 0x28, 0xad, 0x50, 0xb4, 0xa3, + 0x41, 0x0e, 0xe4, 0x65, 0xe0, 0xad, 0x74, 0xc3, 0x20, 0xf7, 0xdd, + 0x5e, 0xbf, 0xea, 0xa4, 0xac, 0x6d, 0x0c, 0xb4, 0xf3, 0x25, 0x82, + 0xaf, 0x99, 0x55, 0x6a, 0x0f, 0xcc, 0x0d, 0x9c, 0x38, 0xb2 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_26[] = { 0xe5, 0x9f, 0xca, 0x67, 0x6c, 0x9e, 0x6d, 0x89, 0xa4, 0xa8, 0x95, - 0xe1, 0x4a, 0x6a, 0x36, 0x77, 0xbc, 0x25, 0x8a, 0x4e, 0xf0, 0x96, - 0x6a, 0x80, 0xf3, 0x27, 0xe3, 0x08, 0x70, 0x6c, 0xf7, 0xc0 }; + 0xe1, 0x4a, 0x6a, 0x36, 0x77, 0xbc, 0x25, 0x8a, 0x4e, 0xf0, 0x96, + 0x6a, 0x80, 0xf3, 0x27, 0xe3, 0x08, 0x70, 0x6c, 0xf7, 0xc0 }; static const uint8_t chiptest_fcf59b3113ef_point2_27[] = { 0x04, 0xe2, 0x69, 0x7d, 0x01, 0x24, 0xec, 0x02, 0xaf, 0x50, 0x80, - 0x52, 0xc1, 0x83, 0x2b, 0xad, 0x8c, 0x2e, 0x44, 0xba, 0x2a, 0xc2, - 0x49, 0x1f, 0x43, 0x1f, 0xae, 0x4f, 0x67, 0xfe, 0xeb, 0xa5, 0x1b, - 0x62, 0x84, 0x84, 0x41, 0x94, 0x79, 0x4d, 0x11, 0xc8, 0xd8, 0xe1, - 0x2c, 0xc2, 0xa6, 0x50, 0x23, 0xed, 0x6e, 0x44, 0xc5, 0xc9, 0xa7, - 0x4a, 0xda, 0x0f, 0x29, 0x61, 0x4a, 0x72, 0x3d, 0x6a, 0xf3 }; + 0x52, 0xc1, 0x83, 0x2b, 0xad, 0x8c, 0x2e, 0x44, 0xba, 0x2a, 0xc2, + 0x49, 0x1f, 0x43, 0x1f, 0xae, 0x4f, 0x67, 0xfe, 0xeb, 0xa5, 0x1b, + 0x62, 0x84, 0x84, 0x41, 0x94, 0x79, 0x4d, 0x11, 0xc8, 0xd8, 0xe1, + 0x2c, 0xc2, 0xa6, 0x50, 0x23, 0xed, 0x6e, 0x44, 0xc5, 0xc9, 0xa7, + 0x4a, 0xda, 0x0f, 0x29, 0x61, 0x4a, 0x72, 0x3d, 0x6a, 0xf3 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_28[] = { 0x7f, 0x97, 0xa2, 0x28, 0xac, 0x84, 0xf8, 0x4f, 0x86, 0x4f, 0x5e, - 0x11, 0x81, 0x02, 0x40, 0xdf, 0x2e, 0xa1, 0xd0, 0x6b, 0xb9, 0xce, - 0x36, 0x2f, 0x75, 0xc8, 0x56, 0x5c, 0x38, 0xb2, 0x87, 0x18 }; + 0x11, 0x81, 0x02, 0x40, 0xdf, 0x2e, 0xa1, 0xd0, 0x6b, 0xb9, 0xce, + 0x36, 0x2f, 0x75, 0xc8, 0x56, 0x5c, 0x38, 0xb2, 0x87, 0x18 }; static const uint8_t chiptest_fcf59b3113ef_out_point_29[] = { 0x04, 0x40, 0xa6, 0xc1, 0xc2, 0x00, 0x05, 0x4c, 0x39, 0x6f, 0xbc, 0xee, 0xab, 0x78, 0x44, 0x77, 0xb0, 0x79, 0x79, 0x95, 0x61, 0x6d, 0xfe, 0x63, 0xba, 0xfe, 0x80, 0x22, 0x24, 0xbe, 0x09, 0x1a, 0xec, @@ -220,23 +220,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_30 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_31[] = { 0x04, 0x61, 0xf0, 0x79, 0x37, 0x77, 0x2f, 0xda, 0x0d, 0x5e, 0xe9, - 0xd2, 0x05, 0x61, 0x54, 0x61, 0x7b, 0x12, 0xb4, 0x81, 0xad, 0xe9, - 0x3c, 0x68, 0x6e, 0x13, 0x33, 0xf9, 0xb3, 0x69, 0x36, 0xcd, 0xb1, - 0xc2, 0x20, 0xe0, 0x80, 0x4d, 0xd3, 0x7c, 0x4e, 0x68, 0x36, 0x25, - 0x71, 0xca, 0x9f, 0x52, 0xc1, 0x05, 0xd4, 0x0f, 0x13, 0x92, 0x80, - 0x3b, 0x55, 0xc9, 0xc8, 0x55, 0x26, 0xd7, 0xeb, 0x68, 0xd5 }; + 0xd2, 0x05, 0x61, 0x54, 0x61, 0x7b, 0x12, 0xb4, 0x81, 0xad, 0xe9, + 0x3c, 0x68, 0x6e, 0x13, 0x33, 0xf9, 0xb3, 0x69, 0x36, 0xcd, 0xb1, + 0xc2, 0x20, 0xe0, 0x80, 0x4d, 0xd3, 0x7c, 0x4e, 0x68, 0x36, 0x25, + 0x71, 0xca, 0x9f, 0x52, 0xc1, 0x05, 0xd4, 0x0f, 0x13, 0x92, 0x80, + 0x3b, 0x55, 0xc9, 0xc8, 0x55, 0x26, 0xd7, 0xeb, 0x68, 0xd5 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_32[] = { 0x4a, 0x2d, 0x7f, 0x72, 0xc4, 0x2f, 0x2e, 0xe5, 0xa4, 0x67, 0x1e, - 0xb2, 0xbf, 0x90, 0x6f, 0x56, 0x79, 0x06, 0x8c, 0x58, 0x10, 0x16, - 0x46, 0xbb, 0x02, 0xa5, 0xff, 0x36, 0xf2, 0x9f, 0x6d, 0x70 }; + 0xb2, 0xbf, 0x90, 0x6f, 0x56, 0x79, 0x06, 0x8c, 0x58, 0x10, 0x16, + 0x46, 0xbb, 0x02, 0xa5, 0xff, 0x36, 0xf2, 0x9f, 0x6d, 0x70 }; static const uint8_t chiptest_fcf59b3113ef_point2_33[] = { 0x04, 0x56, 0xb2, 0xd9, 0xa7, 0x4d, 0x0b, 0x74, 0x4a, 0xe7, 0x79, - 0x3a, 0xb6, 0x25, 0xcf, 0x39, 0xf1, 0xdc, 0x2b, 0xc0, 0x00, 0xe4, - 0x39, 0xdd, 0x35, 0x37, 0x96, 0x8e, 0x30, 0xa6, 0xea, 0xba, 0x65, - 0x65, 0x58, 0x9d, 0x63, 0xcf, 0xe2, 0x86, 0x0a, 0x59, 0x9a, 0x8c, - 0xce, 0x18, 0x3d, 0x59, 0x8b, 0x9b, 0x2c, 0x3a, 0xbc, 0xb4, 0xc9, - 0x1e, 0xed, 0x2c, 0x26, 0x63, 0xee, 0x77, 0x37, 0x86, 0x7f }; + 0x3a, 0xb6, 0x25, 0xcf, 0x39, 0xf1, 0xdc, 0x2b, 0xc0, 0x00, 0xe4, + 0x39, 0xdd, 0x35, 0x37, 0x96, 0x8e, 0x30, 0xa6, 0xea, 0xba, 0x65, + 0x65, 0x58, 0x9d, 0x63, 0xcf, 0xe2, 0x86, 0x0a, 0x59, 0x9a, 0x8c, + 0xce, 0x18, 0x3d, 0x59, 0x8b, 0x9b, 0x2c, 0x3a, 0xbc, 0xb4, 0xc9, + 0x1e, 0xed, 0x2c, 0x26, 0x63, 0xee, 0x77, 0x37, 0x86, 0x7f }; static const uint8_t chiptest_fcf59b3113ef_scalar2_34[] = { 0x37, 0x84, 0x30, 0xa3, 0xae, 0x9f, 0x0e, 0xdf, 0x78, 0xdd, 0x43, - 0x08, 0x02, 0x60, 0xae, 0x91, 0xa4, 0x58, 0xca, 0x08, 0x04, 0x61, - 0x0b, 0x7c, 0x46, 0x61, 0x20, 0x6e, 0x5d, 0xb3, 0x98, 0xbb }; + 0x08, 0x02, 0x60, 0xae, 0x91, 0xa4, 0x58, 0xca, 0x08, 0x04, 0x61, + 0x0b, 0x7c, 0x46, 0x61, 0x20, 0x6e, 0x5d, 0xb3, 0x98, 0xbb }; static const uint8_t chiptest_fcf59b3113ef_out_point_35[] = { 0x04, 0xd0, 0x3f, 0xe0, 0x2f, 0x58, 0x4e, 0x32, 0x09, 0x2d, 0x91, 0x4c, 0x60, 0xba, 0xe3, 0x6a, 0xaf, 0xac, 0x6e, 0x62, 0x09, 0x41, 0x9c, 0x9f, 0xea, 0xab, 0xe7, 0x69, 0x03, 0xa4, 0x86, 0x7e, 0xd6, @@ -256,23 +256,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_36 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_37[] = { 0x04, 0x19, 0x5c, 0xe1, 0x33, 0x2f, 0x34, 0xbb, 0x82, 0x45, 0x43, - 0xef, 0x9e, 0x99, 0x41, 0x9f, 0xd2, 0xde, 0xd7, 0xd9, 0xd5, 0x4b, - 0x5f, 0x55, 0x98, 0xeb, 0xaa, 0xe2, 0xee, 0x60, 0x01, 0x3b, 0xef, - 0xe2, 0x08, 0xf8, 0xae, 0x81, 0x31, 0x11, 0x1f, 0xe6, 0xad, 0x86, - 0x10, 0x45, 0x12, 0x5b, 0x84, 0x50, 0x49, 0xbc, 0x34, 0x19, 0xf7, - 0x39, 0xec, 0x4c, 0x17, 0xbe, 0x13, 0x2c, 0xc8, 0xbc, 0x2c }; + 0xef, 0x9e, 0x99, 0x41, 0x9f, 0xd2, 0xde, 0xd7, 0xd9, 0xd5, 0x4b, + 0x5f, 0x55, 0x98, 0xeb, 0xaa, 0xe2, 0xee, 0x60, 0x01, 0x3b, 0xef, + 0xe2, 0x08, 0xf8, 0xae, 0x81, 0x31, 0x11, 0x1f, 0xe6, 0xad, 0x86, + 0x10, 0x45, 0x12, 0x5b, 0x84, 0x50, 0x49, 0xbc, 0x34, 0x19, 0xf7, + 0x39, 0xec, 0x4c, 0x17, 0xbe, 0x13, 0x2c, 0xc8, 0xbc, 0x2c }; static const uint8_t chiptest_fcf59b3113ef_scalar1_38[] = { 0xc1, 0x9d, 0xa9, 0x8f, 0x1a, 0x9c, 0xd3, 0x3f, 0x7b, 0xfe, 0xd5, - 0xb8, 0xfa, 0x1b, 0x57, 0x3e, 0xc0, 0x4c, 0x60, 0x35, 0xbd, 0xb5, - 0x66, 0xb6, 0x34, 0xd7, 0xa7, 0xe5, 0xe9, 0xd0, 0xbe, 0x85 }; + 0xb8, 0xfa, 0x1b, 0x57, 0x3e, 0xc0, 0x4c, 0x60, 0x35, 0xbd, 0xb5, + 0x66, 0xb6, 0x34, 0xd7, 0xa7, 0xe5, 0xe9, 0xd0, 0xbe, 0x85 }; static const uint8_t chiptest_fcf59b3113ef_point2_39[] = { 0x04, 0x3e, 0xae, 0x00, 0xab, 0x5c, 0xe8, 0x14, 0x33, 0x12, 0x47, - 0xff, 0xc9, 0xab, 0x97, 0x51, 0xd1, 0x7d, 0xdc, 0xdb, 0xd7, 0xd8, - 0x26, 0x2c, 0xb7, 0xf8, 0x1f, 0xd1, 0xbd, 0x59, 0x4e, 0x21, 0x4e, - 0x20, 0x39, 0xa9, 0x2e, 0xeb, 0xbb, 0xd1, 0x57, 0x12, 0xfd, 0x91, - 0xa9, 0x4f, 0xe6, 0xc3, 0x24, 0x2c, 0x4d, 0xe5, 0xa8, 0x1a, 0x2a, - 0x6d, 0x45, 0xee, 0x04, 0xb1, 0x31, 0xdc, 0xe7, 0xa7, 0xdf }; + 0xff, 0xc9, 0xab, 0x97, 0x51, 0xd1, 0x7d, 0xdc, 0xdb, 0xd7, 0xd8, + 0x26, 0x2c, 0xb7, 0xf8, 0x1f, 0xd1, 0xbd, 0x59, 0x4e, 0x21, 0x4e, + 0x20, 0x39, 0xa9, 0x2e, 0xeb, 0xbb, 0xd1, 0x57, 0x12, 0xfd, 0x91, + 0xa9, 0x4f, 0xe6, 0xc3, 0x24, 0x2c, 0x4d, 0xe5, 0xa8, 0x1a, 0x2a, + 0x6d, 0x45, 0xee, 0x04, 0xb1, 0x31, 0xdc, 0xe7, 0xa7, 0xdf }; static const uint8_t chiptest_fcf59b3113ef_scalar2_40[] = { 0x5b, 0x64, 0x97, 0x39, 0x8f, 0x94, 0x83, 0xd0, 0xac, 0x97, 0xb4, - 0xaa, 0x04, 0x49, 0xd1, 0x2f, 0x51, 0xef, 0x42, 0x32, 0x7b, 0x1a, - 0x22, 0xf7, 0x88, 0xec, 0x1c, 0x1d, 0xd3, 0xb1, 0x6e, 0xce }; + 0xaa, 0x04, 0x49, 0xd1, 0x2f, 0x51, 0xef, 0x42, 0x32, 0x7b, 0x1a, + 0x22, 0xf7, 0x88, 0xec, 0x1c, 0x1d, 0xd3, 0xb1, 0x6e, 0xce }; static const uint8_t chiptest_fcf59b3113ef_out_point_41[] = { 0x04, 0xa9, 0x05, 0xa7, 0x08, 0x8a, 0xeb, 0x82, 0xcd, 0xe9, 0xe8, 0x54, 0x65, 0x43, 0x5e, 0xa7, 0xe6, 0x95, 0x7b, 0x7a, 0x90, 0x11, 0xe5, 0x90, 0xe9, 0x96, 0xae, 0x70, 0x48, 0x68, 0xef, 0xc1, 0x81, @@ -292,23 +292,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_42 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_43[] = { 0x04, 0x1d, 0xe7, 0x29, 0x26, 0x0b, 0x7a, 0x6e, 0x8f, 0x5d, 0x54, - 0x91, 0x92, 0x92, 0x12, 0x82, 0xbb, 0xd0, 0xc2, 0xbb, 0x1d, 0xf3, - 0x62, 0xed, 0x85, 0x2a, 0xd1, 0x1e, 0xcf, 0x0e, 0x34, 0x06, 0x91, - 0x2d, 0xb7, 0xe0, 0x2d, 0x61, 0x8d, 0x1f, 0xbd, 0x57, 0x4c, 0xfa, - 0x01, 0x27, 0x28, 0x32, 0x40, 0x70, 0xce, 0xf6, 0x11, 0xc5, 0x3e, - 0xac, 0x14, 0x07, 0xba, 0x1a, 0x46, 0x56, 0xa7, 0x07, 0x5a }; + 0x91, 0x92, 0x92, 0x12, 0x82, 0xbb, 0xd0, 0xc2, 0xbb, 0x1d, 0xf3, + 0x62, 0xed, 0x85, 0x2a, 0xd1, 0x1e, 0xcf, 0x0e, 0x34, 0x06, 0x91, + 0x2d, 0xb7, 0xe0, 0x2d, 0x61, 0x8d, 0x1f, 0xbd, 0x57, 0x4c, 0xfa, + 0x01, 0x27, 0x28, 0x32, 0x40, 0x70, 0xce, 0xf6, 0x11, 0xc5, 0x3e, + 0xac, 0x14, 0x07, 0xba, 0x1a, 0x46, 0x56, 0xa7, 0x07, 0x5a }; static const uint8_t chiptest_fcf59b3113ef_scalar1_44[] = { 0xd2, 0x97, 0x77, 0x2d, 0x0c, 0x72, 0x50, 0x47, 0xf6, 0x5d, 0xe6, - 0x3a, 0x78, 0x43, 0x8d, 0xef, 0x33, 0x8f, 0x3e, 0x87, 0xb7, 0x4b, - 0x01, 0x22, 0xcf, 0x72, 0x8f, 0x88, 0x56, 0x63, 0x70, 0xe0 }; + 0x3a, 0x78, 0x43, 0x8d, 0xef, 0x33, 0x8f, 0x3e, 0x87, 0xb7, 0x4b, + 0x01, 0x22, 0xcf, 0x72, 0x8f, 0x88, 0x56, 0x63, 0x70, 0xe0 }; static const uint8_t chiptest_fcf59b3113ef_point2_45[] = { 0x04, 0xd2, 0xcd, 0x9d, 0xae, 0xd6, 0x93, 0xcf, 0xf6, 0xcd, 0x61, - 0xbc, 0xd2, 0x1c, 0xbe, 0x1e, 0xaa, 0x51, 0x3a, 0x33, 0x22, 0x9f, - 0x58, 0x3d, 0x7e, 0xca, 0x53, 0x95, 0xd9, 0x80, 0xdb, 0x42, 0x9e, - 0xf6, 0x35, 0x66, 0xe9, 0x06, 0xb3, 0x68, 0x5a, 0xca, 0xcd, 0xab, - 0x56, 0x87, 0xd0, 0xd9, 0xb3, 0xcf, 0x60, 0xf1, 0x8d, 0x38, 0x2c, - 0x52, 0x1a, 0x71, 0x69, 0xb5, 0x83, 0x60, 0xa1, 0xbc, 0x36 }; + 0xbc, 0xd2, 0x1c, 0xbe, 0x1e, 0xaa, 0x51, 0x3a, 0x33, 0x22, 0x9f, + 0x58, 0x3d, 0x7e, 0xca, 0x53, 0x95, 0xd9, 0x80, 0xdb, 0x42, 0x9e, + 0xf6, 0x35, 0x66, 0xe9, 0x06, 0xb3, 0x68, 0x5a, 0xca, 0xcd, 0xab, + 0x56, 0x87, 0xd0, 0xd9, 0xb3, 0xcf, 0x60, 0xf1, 0x8d, 0x38, 0x2c, + 0x52, 0x1a, 0x71, 0x69, 0xb5, 0x83, 0x60, 0xa1, 0xbc, 0x36 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_46[] = { 0xbb, 0xf4, 0xf2, 0x78, 0x67, 0x24, 0xc1, 0xed, 0x8c, 0x47, 0x6c, - 0x34, 0x17, 0xff, 0x4c, 0xcd, 0x83, 0x97, 0x6f, 0xbd, 0x77, 0xc2, - 0xde, 0x5f, 0x60, 0x24, 0x85, 0x88, 0x20, 0x77, 0xf0, 0xa9 }; + 0x34, 0x17, 0xff, 0x4c, 0xcd, 0x83, 0x97, 0x6f, 0xbd, 0x77, 0xc2, + 0xde, 0x5f, 0x60, 0x24, 0x85, 0x88, 0x20, 0x77, 0xf0, 0xa9 }; static const uint8_t chiptest_fcf59b3113ef_out_point_47[] = { 0x04, 0x05, 0xd5, 0x25, 0x05, 0xec, 0x51, 0xf9, 0x65, 0xb9, 0xcf, 0x9f, 0x73, 0x7d, 0x9e, 0x6a, 0xfd, 0x5b, 0x4d, 0x50, 0xfa, 0xd8, 0xb0, 0xc8, 0xba, 0xbb, 0x96, 0xd0, 0x52, 0x95, 0x14, 0xf6, 0x7a, @@ -328,23 +328,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_48 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_49[] = { 0x04, 0xe4, 0x96, 0x23, 0x9b, 0xa5, 0x1a, 0x04, 0x6d, 0xf4, 0xad, - 0x40, 0x8e, 0x68, 0x7e, 0x56, 0x51, 0x5f, 0xd3, 0xd5, 0x0d, 0x26, - 0xa4, 0x99, 0x12, 0x84, 0x7e, 0xb4, 0x3a, 0x71, 0xe2, 0xfe, 0xb3, - 0x74, 0x24, 0xbd, 0x48, 0x1d, 0x46, 0x15, 0x1f, 0x25, 0x61, 0xc1, - 0x52, 0xd1, 0x44, 0x4b, 0xcf, 0xc5, 0xd6, 0xe7, 0x00, 0x10, 0x48, - 0xe5, 0x0d, 0x00, 0x8d, 0xc8, 0xd8, 0x6f, 0x00, 0xe6, 0xd4 }; + 0x40, 0x8e, 0x68, 0x7e, 0x56, 0x51, 0x5f, 0xd3, 0xd5, 0x0d, 0x26, + 0xa4, 0x99, 0x12, 0x84, 0x7e, 0xb4, 0x3a, 0x71, 0xe2, 0xfe, 0xb3, + 0x74, 0x24, 0xbd, 0x48, 0x1d, 0x46, 0x15, 0x1f, 0x25, 0x61, 0xc1, + 0x52, 0xd1, 0x44, 0x4b, 0xcf, 0xc5, 0xd6, 0xe7, 0x00, 0x10, 0x48, + 0xe5, 0x0d, 0x00, 0x8d, 0xc8, 0xd8, 0x6f, 0x00, 0xe6, 0xd4 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_50[] = { 0xce, 0x6b, 0xea, 0xe7, 0xa6, 0xc6, 0xe9, 0xb9, 0xb7, 0x19, 0x8d, - 0xa8, 0xee, 0x40, 0x2a, 0x8a, 0xce, 0xd0, 0x81, 0xce, 0xbe, 0x21, - 0x5b, 0xfb, 0x73, 0x02, 0x73, 0xb8, 0x4d, 0x94, 0xd2, 0x9f }; + 0xa8, 0xee, 0x40, 0x2a, 0x8a, 0xce, 0xd0, 0x81, 0xce, 0xbe, 0x21, + 0x5b, 0xfb, 0x73, 0x02, 0x73, 0xb8, 0x4d, 0x94, 0xd2, 0x9f }; static const uint8_t chiptest_fcf59b3113ef_point2_51[] = { 0x04, 0xfd, 0x81, 0x98, 0x3d, 0xed, 0xf6, 0xa9, 0xa5, 0xcd, 0x7c, - 0x5f, 0x87, 0x5f, 0x42, 0x1f, 0xd6, 0x67, 0x2a, 0xfe, 0x82, 0xa5, - 0xa2, 0x44, 0x04, 0xfb, 0xdb, 0xd5, 0xb1, 0x75, 0x76, 0xbc, 0xb5, - 0x66, 0xef, 0x05, 0xe6, 0x3f, 0x5e, 0x74, 0x11, 0xfe, 0x09, 0x67, - 0x38, 0xc4, 0xbd, 0x22, 0xe7, 0xf9, 0x3e, 0xbb, 0x72, 0x3a, 0x99, - 0xfd, 0xbe, 0x65, 0x32, 0x96, 0xdc, 0x2e, 0xc6, 0xa6, 0xfd }; + 0x5f, 0x87, 0x5f, 0x42, 0x1f, 0xd6, 0x67, 0x2a, 0xfe, 0x82, 0xa5, + 0xa2, 0x44, 0x04, 0xfb, 0xdb, 0xd5, 0xb1, 0x75, 0x76, 0xbc, 0xb5, + 0x66, 0xef, 0x05, 0xe6, 0x3f, 0x5e, 0x74, 0x11, 0xfe, 0x09, 0x67, + 0x38, 0xc4, 0xbd, 0x22, 0xe7, 0xf9, 0x3e, 0xbb, 0x72, 0x3a, 0x99, + 0xfd, 0xbe, 0x65, 0x32, 0x96, 0xdc, 0x2e, 0xc6, 0xa6, 0xfd }; static const uint8_t chiptest_fcf59b3113ef_scalar2_52[] = { 0xe6, 0xdc, 0x4c, 0x0e, 0x62, 0xf5, 0x4e, 0x8a, 0xa0, 0xc3, 0x56, - 0xc9, 0x53, 0xd1, 0x6e, 0x54, 0x60, 0x58, 0x99, 0xe6, 0xfc, 0x58, - 0xc3, 0x5f, 0x59, 0xf8, 0x1b, 0x72, 0x64, 0xb1, 0xdb, 0x9a }; + 0xc9, 0x53, 0xd1, 0x6e, 0x54, 0x60, 0x58, 0x99, 0xe6, 0xfc, 0x58, + 0xc3, 0x5f, 0x59, 0xf8, 0x1b, 0x72, 0x64, 0xb1, 0xdb, 0x9a }; static const uint8_t chiptest_fcf59b3113ef_out_point_53[] = { 0x04, 0xdc, 0x2b, 0x7d, 0xdb, 0xa5, 0x47, 0xe7, 0xf5, 0x2c, 0xa0, 0x13, 0x64, 0x52, 0xcc, 0x0f, 0x42, 0x6b, 0x51, 0x01, 0xd4, 0xff, 0xac, 0x31, 0xf3, 0x72, 0x1d, 0x2c, 0x37, 0x6f, 0xba, 0xcf, 0x35, @@ -364,23 +364,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_54 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_55[] = { 0x04, 0x31, 0x34, 0x05, 0x2a, 0x59, 0x08, 0xdd, 0xba, 0x38, 0xf5, - 0xae, 0x22, 0x58, 0x94, 0xd4, 0x58, 0x30, 0xa4, 0x25, 0x3d, 0xe5, - 0xcc, 0xa1, 0x37, 0x48, 0xb1, 0x6e, 0x27, 0x96, 0x34, 0x5c, 0x46, - 0x5d, 0x49, 0xdd, 0x55, 0xe6, 0x98, 0xb0, 0x7e, 0xdb, 0x55, 0xee, - 0x98, 0xfa, 0x49, 0x31, 0x82, 0xd9, 0x83, 0x00, 0x65, 0xe9, 0x90, - 0xb1, 0x04, 0x1a, 0xde, 0xcf, 0xef, 0x0a, 0x4a, 0x0d, 0xe9 }; + 0xae, 0x22, 0x58, 0x94, 0xd4, 0x58, 0x30, 0xa4, 0x25, 0x3d, 0xe5, + 0xcc, 0xa1, 0x37, 0x48, 0xb1, 0x6e, 0x27, 0x96, 0x34, 0x5c, 0x46, + 0x5d, 0x49, 0xdd, 0x55, 0xe6, 0x98, 0xb0, 0x7e, 0xdb, 0x55, 0xee, + 0x98, 0xfa, 0x49, 0x31, 0x82, 0xd9, 0x83, 0x00, 0x65, 0xe9, 0x90, + 0xb1, 0x04, 0x1a, 0xde, 0xcf, 0xef, 0x0a, 0x4a, 0x0d, 0xe9 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_56[] = { 0x9b, 0xb5, 0xbb, 0x1a, 0xb7, 0x47, 0xcf, 0x16, 0x77, 0xfe, 0xcd, - 0x56, 0xae, 0xac, 0xd9, 0x6d, 0x2a, 0xd6, 0x4e, 0xc3, 0xc8, 0xc0, - 0x32, 0xdf, 0x17, 0x7e, 0xfc, 0x86, 0x1c, 0x96, 0x48, 0x40 }; + 0x56, 0xae, 0xac, 0xd9, 0x6d, 0x2a, 0xd6, 0x4e, 0xc3, 0xc8, 0xc0, + 0x32, 0xdf, 0x17, 0x7e, 0xfc, 0x86, 0x1c, 0x96, 0x48, 0x40 }; static const uint8_t chiptest_fcf59b3113ef_point2_57[] = { 0x04, 0x7a, 0x8b, 0xd8, 0xe8, 0x3d, 0xa1, 0x78, 0xb8, 0x44, 0x1f, - 0x5e, 0x65, 0xfe, 0x1e, 0x4c, 0x24, 0x6f, 0x13, 0xcc, 0x82, 0x12, - 0x73, 0xda, 0x7c, 0x6e, 0xf7, 0x76, 0xe0, 0x45, 0x0a, 0x65, 0xbf, - 0xab, 0xcb, 0x25, 0x2b, 0xda, 0xac, 0xbc, 0xc5, 0xd9, 0x41, 0x5e, - 0xdf, 0xee, 0x07, 0x1a, 0x1f, 0x9e, 0xcf, 0x24, 0x0b, 0x77, 0xe6, - 0x70, 0x08, 0x80, 0x33, 0x29, 0x2c, 0xba, 0x93, 0x4a, 0x60 }; + 0x5e, 0x65, 0xfe, 0x1e, 0x4c, 0x24, 0x6f, 0x13, 0xcc, 0x82, 0x12, + 0x73, 0xda, 0x7c, 0x6e, 0xf7, 0x76, 0xe0, 0x45, 0x0a, 0x65, 0xbf, + 0xab, 0xcb, 0x25, 0x2b, 0xda, 0xac, 0xbc, 0xc5, 0xd9, 0x41, 0x5e, + 0xdf, 0xee, 0x07, 0x1a, 0x1f, 0x9e, 0xcf, 0x24, 0x0b, 0x77, 0xe6, + 0x70, 0x08, 0x80, 0x33, 0x29, 0x2c, 0xba, 0x93, 0x4a, 0x60 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_58[] = { 0x33, 0xb9, 0x4d, 0xf8, 0xaf, 0x32, 0xef, 0x7b, 0x2c, 0x83, 0x98, - 0xbf, 0x0f, 0x93, 0x41, 0x77, 0x31, 0xf9, 0x15, 0xcc, 0xbb, 0x40, - 0x6c, 0xad, 0x96, 0xf7, 0x95, 0x1a, 0x19, 0x7f, 0x11, 0x90 }; + 0xbf, 0x0f, 0x93, 0x41, 0x77, 0x31, 0xf9, 0x15, 0xcc, 0xbb, 0x40, + 0x6c, 0xad, 0x96, 0xf7, 0x95, 0x1a, 0x19, 0x7f, 0x11, 0x90 }; static const uint8_t chiptest_fcf59b3113ef_out_point_59[] = { 0x04, 0x6d, 0xb3, 0xe3, 0x7c, 0x6f, 0x44, 0x31, 0x27, 0x9c, 0x73, 0xdf, 0x67, 0x08, 0xb8, 0x6b, 0x2f, 0xfa, 0x77, 0xf9, 0x00, 0x7b, 0x4a, 0xbc, 0xc8, 0xe5, 0xeb, 0xe4, 0x57, 0x26, 0x93, 0xcb, 0x23, @@ -400,23 +400,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_60 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_61[] = { 0x04, 0xa0, 0x00, 0x94, 0x24, 0x8c, 0x85, 0xb3, 0xb7, 0xbe, 0xa0, - 0x98, 0x15, 0x25, 0xdb, 0xd2, 0xd8, 0xc9, 0x49, 0x17, 0x1e, 0x75, - 0x8d, 0x0e, 0x2b, 0x37, 0x02, 0x58, 0x54, 0xc2, 0xe5, 0x33, 0x3e, - 0xfc, 0xf4, 0x04, 0x5e, 0xdc, 0x3d, 0x21, 0x79, 0xbb, 0x63, 0xb4, - 0x3a, 0x83, 0xc7, 0x3b, 0xdb, 0x40, 0xe1, 0x67, 0x37, 0x57, 0x8c, - 0x86, 0xbe, 0x49, 0x2c, 0x49, 0xcf, 0x31, 0xfb, 0x54, 0x36 }; + 0x98, 0x15, 0x25, 0xdb, 0xd2, 0xd8, 0xc9, 0x49, 0x17, 0x1e, 0x75, + 0x8d, 0x0e, 0x2b, 0x37, 0x02, 0x58, 0x54, 0xc2, 0xe5, 0x33, 0x3e, + 0xfc, 0xf4, 0x04, 0x5e, 0xdc, 0x3d, 0x21, 0x79, 0xbb, 0x63, 0xb4, + 0x3a, 0x83, 0xc7, 0x3b, 0xdb, 0x40, 0xe1, 0x67, 0x37, 0x57, 0x8c, + 0x86, 0xbe, 0x49, 0x2c, 0x49, 0xcf, 0x31, 0xfb, 0x54, 0x36 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_62[] = { 0x5a, 0x8d, 0x81, 0xe1, 0xf9, 0x62, 0xeb, 0x8a, 0x3b, 0x2c, 0x5f, - 0x4d, 0x9e, 0x08, 0x03, 0x92, 0xe4, 0xe0, 0x58, 0x03, 0x91, 0x62, - 0x8a, 0xe2, 0x59, 0xd0, 0x89, 0xee, 0x10, 0xfc, 0xa9, 0x21 }; + 0x4d, 0x9e, 0x08, 0x03, 0x92, 0xe4, 0xe0, 0x58, 0x03, 0x91, 0x62, + 0x8a, 0xe2, 0x59, 0xd0, 0x89, 0xee, 0x10, 0xfc, 0xa9, 0x21 }; static const uint8_t chiptest_fcf59b3113ef_point2_63[] = { 0x04, 0x64, 0xcf, 0x03, 0xf3, 0x06, 0x36, 0x40, 0x46, 0xed, 0xe1, - 0xa7, 0x1c, 0x1f, 0x3a, 0xb0, 0xf3, 0xa7, 0xe0, 0x18, 0xf3, 0xb7, - 0xb1, 0xee, 0xc1, 0x78, 0x63, 0x2e, 0x55, 0xf0, 0x04, 0xae, 0x33, - 0x0c, 0x9d, 0x1e, 0x33, 0xc6, 0xc2, 0x7f, 0x7f, 0xdd, 0xba, 0xf1, - 0x5c, 0x30, 0x61, 0x8d, 0xb0, 0x09, 0x1a, 0x69, 0xd2, 0x0f, 0x3b, - 0xf4, 0xa0, 0x18, 0xbe, 0x8a, 0x8c, 0x72, 0x84, 0xad, 0x6c }; + 0xa7, 0x1c, 0x1f, 0x3a, 0xb0, 0xf3, 0xa7, 0xe0, 0x18, 0xf3, 0xb7, + 0xb1, 0xee, 0xc1, 0x78, 0x63, 0x2e, 0x55, 0xf0, 0x04, 0xae, 0x33, + 0x0c, 0x9d, 0x1e, 0x33, 0xc6, 0xc2, 0x7f, 0x7f, 0xdd, 0xba, 0xf1, + 0x5c, 0x30, 0x61, 0x8d, 0xb0, 0x09, 0x1a, 0x69, 0xd2, 0x0f, 0x3b, + 0xf4, 0xa0, 0x18, 0xbe, 0x8a, 0x8c, 0x72, 0x84, 0xad, 0x6c }; static const uint8_t chiptest_fcf59b3113ef_scalar2_64[] = { 0xa7, 0xd9, 0xa6, 0xe1, 0x82, 0xbe, 0x17, 0xd4, 0xc8, 0x1f, 0x32, - 0x92, 0xa4, 0xa8, 0x2e, 0x80, 0x14, 0xa9, 0x31, 0x96, 0x0c, 0xcc, - 0xf0, 0x95, 0xde, 0xcd, 0x56, 0xd1, 0x98, 0xd6, 0x72, 0xd4 }; + 0x92, 0xa4, 0xa8, 0x2e, 0x80, 0x14, 0xa9, 0x31, 0x96, 0x0c, 0xcc, + 0xf0, 0x95, 0xde, 0xcd, 0x56, 0xd1, 0x98, 0xd6, 0x72, 0xd4 }; static const uint8_t chiptest_fcf59b3113ef_out_point_65[] = { 0x04, 0xe5, 0xa5, 0x2f, 0x8f, 0xc5, 0xff, 0x51, 0xef, 0xcd, 0x61, 0x4f, 0x48, 0x5f, 0xc7, 0xf0, 0x39, 0x83, 0x27, 0x2b, 0x26, 0xd0, 0x27, 0x8f, 0x1f, 0x23, 0xf2, 0xd6, 0xe9, 0x69, 0x8a, 0xc6, 0xb3, @@ -436,23 +436,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_66 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_67[] = { 0x04, 0xa0, 0x24, 0x27, 0xc8, 0x30, 0x58, 0x5a, 0xca, 0x4f, 0xaa, - 0x49, 0xf7, 0x1d, 0x30, 0xbb, 0x28, 0x01, 0x0b, 0x41, 0x41, 0xf2, - 0xfa, 0xda, 0xa5, 0x2b, 0x1e, 0x86, 0x60, 0x61, 0xd5, 0xfa, 0xf5, - 0x2c, 0x7a, 0x59, 0x92, 0x70, 0x87, 0xbd, 0x71, 0xbc, 0xd8, 0x5a, - 0xd7, 0x18, 0xff, 0x66, 0xf3, 0x59, 0x16, 0x56, 0xe8, 0x08, 0xe4, - 0x57, 0xa7, 0xfc, 0xae, 0x55, 0x6c, 0x0a, 0xc0, 0xfb, 0x2f }; + 0x49, 0xf7, 0x1d, 0x30, 0xbb, 0x28, 0x01, 0x0b, 0x41, 0x41, 0xf2, + 0xfa, 0xda, 0xa5, 0x2b, 0x1e, 0x86, 0x60, 0x61, 0xd5, 0xfa, 0xf5, + 0x2c, 0x7a, 0x59, 0x92, 0x70, 0x87, 0xbd, 0x71, 0xbc, 0xd8, 0x5a, + 0xd7, 0x18, 0xff, 0x66, 0xf3, 0x59, 0x16, 0x56, 0xe8, 0x08, 0xe4, + 0x57, 0xa7, 0xfc, 0xae, 0x55, 0x6c, 0x0a, 0xc0, 0xfb, 0x2f }; static const uint8_t chiptest_fcf59b3113ef_scalar1_68[] = { 0x45, 0xb2, 0x65, 0xd4, 0xbd, 0xcd, 0x74, 0x5f, 0x71, 0x0e, 0xe7, - 0xc2, 0xec, 0x7a, 0xdd, 0x59, 0x52, 0x9f, 0x16, 0xc7, 0x34, 0xf3, - 0x2b, 0x06, 0x25, 0x5b, 0x6c, 0x07, 0x2b, 0x86, 0x7e, 0xcc }; + 0xc2, 0xec, 0x7a, 0xdd, 0x59, 0x52, 0x9f, 0x16, 0xc7, 0x34, 0xf3, + 0x2b, 0x06, 0x25, 0x5b, 0x6c, 0x07, 0x2b, 0x86, 0x7e, 0xcc }; static const uint8_t chiptest_fcf59b3113ef_point2_69[] = { 0x04, 0x70, 0x64, 0x21, 0x3e, 0x56, 0x25, 0x93, 0x78, 0xdf, 0x55, - 0xc6, 0x37, 0xeb, 0x02, 0x1d, 0x29, 0x93, 0xe8, 0xe7, 0x5a, 0xc5, - 0x11, 0x9b, 0x71, 0x9e, 0xd5, 0x5a, 0x26, 0x4a, 0x90, 0x4c, 0x15, - 0xe0, 0xc5, 0x95, 0x9e, 0x73, 0x89, 0xbe, 0xaa, 0xfe, 0xd2, 0x6d, - 0xbd, 0xe0, 0x88, 0x01, 0x5d, 0xcc, 0xcc, 0x9f, 0x2a, 0x0d, 0x61, - 0x5d, 0x2e, 0x36, 0xc8, 0xc1, 0xb8, 0xe8, 0x76, 0xa1, 0xc6 }; + 0xc6, 0x37, 0xeb, 0x02, 0x1d, 0x29, 0x93, 0xe8, 0xe7, 0x5a, 0xc5, + 0x11, 0x9b, 0x71, 0x9e, 0xd5, 0x5a, 0x26, 0x4a, 0x90, 0x4c, 0x15, + 0xe0, 0xc5, 0x95, 0x9e, 0x73, 0x89, 0xbe, 0xaa, 0xfe, 0xd2, 0x6d, + 0xbd, 0xe0, 0x88, 0x01, 0x5d, 0xcc, 0xcc, 0x9f, 0x2a, 0x0d, 0x61, + 0x5d, 0x2e, 0x36, 0xc8, 0xc1, 0xb8, 0xe8, 0x76, 0xa1, 0xc6 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_70[] = { 0x6b, 0xcc, 0x8f, 0x0f, 0x5e, 0x4b, 0x2b, 0xa9, 0x4f, 0xd1, 0xfa, - 0xcf, 0x39, 0xd3, 0x78, 0x69, 0x6a, 0xde, 0xee, 0xe7, 0x4c, 0x89, - 0x1b, 0x6d, 0xc2, 0xe9, 0x96, 0x05, 0x77, 0x59, 0x0d, 0x86 }; + 0xcf, 0x39, 0xd3, 0x78, 0x69, 0x6a, 0xde, 0xee, 0xe7, 0x4c, 0x89, + 0x1b, 0x6d, 0xc2, 0xe9, 0x96, 0x05, 0x77, 0x59, 0x0d, 0x86 }; static const uint8_t chiptest_fcf59b3113ef_out_point_71[] = { 0x04, 0x28, 0xf8, 0x4d, 0x78, 0x05, 0xbc, 0xb9, 0x9f, 0xd4, 0x22, 0x71, 0xaf, 0x8b, 0x5f, 0x92, 0x9f, 0x5c, 0x0c, 0x51, 0xa5, 0x5e, 0xac, 0x33, 0x51, 0xfe, 0x68, 0x2c, 0x03, 0x5d, 0x1b, 0xa4, 0x25, @@ -472,23 +472,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_72 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_73[] = { 0x04, 0xd9, 0x3d, 0x3f, 0x70, 0xc3, 0xf6, 0x49, 0xaf, 0x56, 0x53, - 0xef, 0x96, 0xe9, 0xc2, 0xec, 0x2d, 0x8d, 0x66, 0x45, 0x56, 0x97, - 0x2f, 0x2d, 0x01, 0x59, 0x9b, 0x8f, 0x68, 0x08, 0xf2, 0xe2, 0x12, - 0x61, 0x2c, 0x58, 0x80, 0x06, 0x7c, 0x30, 0xee, 0x55, 0xc8, 0x74, - 0x58, 0x75, 0xbf, 0xb8, 0x45, 0x7f, 0x6a, 0x91, 0xf1, 0x80, 0xe7, - 0xd6, 0xfc, 0x6c, 0xd6, 0xda, 0x91, 0xeb, 0xa3, 0x03, 0xd4 }; + 0xef, 0x96, 0xe9, 0xc2, 0xec, 0x2d, 0x8d, 0x66, 0x45, 0x56, 0x97, + 0x2f, 0x2d, 0x01, 0x59, 0x9b, 0x8f, 0x68, 0x08, 0xf2, 0xe2, 0x12, + 0x61, 0x2c, 0x58, 0x80, 0x06, 0x7c, 0x30, 0xee, 0x55, 0xc8, 0x74, + 0x58, 0x75, 0xbf, 0xb8, 0x45, 0x7f, 0x6a, 0x91, 0xf1, 0x80, 0xe7, + 0xd6, 0xfc, 0x6c, 0xd6, 0xda, 0x91, 0xeb, 0xa3, 0x03, 0xd4 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_74[] = { 0xb4, 0x3b, 0x48, 0x6f, 0x81, 0xf2, 0x6f, 0xed, 0x7f, 0xde, 0xa7, - 0x11, 0x06, 0x87, 0xe9, 0xc4, 0x72, 0xd1, 0x91, 0xe5, 0x44, 0x2c, - 0xc2, 0x31, 0xc1, 0xbf, 0x8e, 0x66, 0xd7, 0x69, 0x74, 0x4b }; + 0x11, 0x06, 0x87, 0xe9, 0xc4, 0x72, 0xd1, 0x91, 0xe5, 0x44, 0x2c, + 0xc2, 0x31, 0xc1, 0xbf, 0x8e, 0x66, 0xd7, 0x69, 0x74, 0x4b }; static const uint8_t chiptest_fcf59b3113ef_point2_75[] = { 0x04, 0x01, 0xbf, 0x20, 0x58, 0x20, 0x2e, 0x60, 0x94, 0x40, 0xc2, - 0xd9, 0xc9, 0x68, 0x3b, 0x86, 0x78, 0xa8, 0x60, 0x0d, 0x3c, 0xb3, - 0xcb, 0x09, 0x31, 0x73, 0xc3, 0x13, 0x3f, 0xdc, 0x4a, 0x58, 0x49, - 0x90, 0x5b, 0xb0, 0x1d, 0x8e, 0x70, 0x63, 0x21, 0x3a, 0xaa, 0x03, - 0x4e, 0xc2, 0xc5, 0xfa, 0x86, 0x54, 0x84, 0xf3, 0xfc, 0xec, 0xdc, - 0x5b, 0xdc, 0xee, 0x25, 0x0d, 0x42, 0x84, 0x26, 0x28, 0x8b }; + 0xd9, 0xc9, 0x68, 0x3b, 0x86, 0x78, 0xa8, 0x60, 0x0d, 0x3c, 0xb3, + 0xcb, 0x09, 0x31, 0x73, 0xc3, 0x13, 0x3f, 0xdc, 0x4a, 0x58, 0x49, + 0x90, 0x5b, 0xb0, 0x1d, 0x8e, 0x70, 0x63, 0x21, 0x3a, 0xaa, 0x03, + 0x4e, 0xc2, 0xc5, 0xfa, 0x86, 0x54, 0x84, 0xf3, 0xfc, 0xec, 0xdc, + 0x5b, 0xdc, 0xee, 0x25, 0x0d, 0x42, 0x84, 0x26, 0x28, 0x8b }; static const uint8_t chiptest_fcf59b3113ef_scalar2_76[] = { 0x13, 0x7f, 0x0e, 0x3e, 0xec, 0x85, 0x18, 0xf0, 0x95, 0x6d, 0x86, - 0xf4, 0xc7, 0x86, 0xe7, 0x7c, 0x72, 0x10, 0xcc, 0x93, 0x05, 0xb3, - 0x6c, 0xb6, 0xeb, 0x6f, 0x36, 0x94, 0xf1, 0x3e, 0xb4, 0x0b }; + 0xf4, 0xc7, 0x86, 0xe7, 0x7c, 0x72, 0x10, 0xcc, 0x93, 0x05, 0xb3, + 0x6c, 0xb6, 0xeb, 0x6f, 0x36, 0x94, 0xf1, 0x3e, 0xb4, 0x0b }; static const uint8_t chiptest_fcf59b3113ef_out_point_77[] = { 0x04, 0x12, 0xa6, 0x09, 0x10, 0x47, 0x32, 0xa6, 0xa0, 0x23, 0x27, 0xe5, 0x52, 0x35, 0x2c, 0x6a, 0x1c, 0x28, 0xd4, 0x5d, 0xfe, 0x6a, 0x54, 0x3d, 0x41, 0x93, 0x0b, 0xa3, 0x93, 0x64, 0xb7, 0x56, 0xe9, @@ -508,23 +508,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_78 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_79[] = { 0x04, 0xe3, 0xf1, 0x0e, 0x4c, 0xda, 0x25, 0x69, 0xcc, 0x9a, 0xa6, - 0xf7, 0x8b, 0xfe, 0xec, 0x27, 0x90, 0xf7, 0x80, 0x81, 0x07, 0x2c, - 0x30, 0xd3, 0xbf, 0x83, 0x62, 0x66, 0xf3, 0xe7, 0x31, 0x70, 0x71, - 0x8f, 0x63, 0x94, 0x3d, 0x88, 0x57, 0xd2, 0x3e, 0x78, 0x97, 0xd2, - 0x89, 0x97, 0xaf, 0xf2, 0xf8, 0x5a, 0x6c, 0x8b, 0xba, 0x4b, 0x4c, - 0xc2, 0xb6, 0x33, 0xc3, 0x49, 0xcd, 0x58, 0xe7, 0x12, 0x4c }; + 0xf7, 0x8b, 0xfe, 0xec, 0x27, 0x90, 0xf7, 0x80, 0x81, 0x07, 0x2c, + 0x30, 0xd3, 0xbf, 0x83, 0x62, 0x66, 0xf3, 0xe7, 0x31, 0x70, 0x71, + 0x8f, 0x63, 0x94, 0x3d, 0x88, 0x57, 0xd2, 0x3e, 0x78, 0x97, 0xd2, + 0x89, 0x97, 0xaf, 0xf2, 0xf8, 0x5a, 0x6c, 0x8b, 0xba, 0x4b, 0x4c, + 0xc2, 0xb6, 0x33, 0xc3, 0x49, 0xcd, 0x58, 0xe7, 0x12, 0x4c }; static const uint8_t chiptest_fcf59b3113ef_scalar1_80[] = { 0x45, 0xc0, 0x3c, 0x6a, 0x85, 0xc6, 0x2d, 0xfb, 0x37, 0x23, 0x20, - 0xda, 0xf8, 0xd2, 0xb1, 0x1f, 0x86, 0x24, 0xa0, 0x63, 0xc3, 0x3b, - 0x28, 0x28, 0x6c, 0xe4, 0x76, 0x6b, 0x49, 0xb3, 0xd2, 0x39 }; + 0xda, 0xf8, 0xd2, 0xb1, 0x1f, 0x86, 0x24, 0xa0, 0x63, 0xc3, 0x3b, + 0x28, 0x28, 0x6c, 0xe4, 0x76, 0x6b, 0x49, 0xb3, 0xd2, 0x39 }; static const uint8_t chiptest_fcf59b3113ef_point2_81[] = { 0x04, 0x46, 0xfb, 0x35, 0xcd, 0x58, 0x9f, 0xb9, 0x99, 0xfa, 0x7f, - 0xa6, 0x6c, 0xc9, 0x29, 0x4e, 0xbb, 0x6c, 0xa0, 0x2d, 0xd6, 0x28, - 0xb2, 0x8e, 0xcd, 0xa6, 0x3c, 0x3b, 0xef, 0x5a, 0xc2, 0xf1, 0xaf, - 0x84, 0xbb, 0xbc, 0x3b, 0x30, 0xac, 0xf0, 0x02, 0xf8, 0xa4, 0x92, - 0x0d, 0xbf, 0xb5, 0x7e, 0xe5, 0x3c, 0x0e, 0xa1, 0xe9, 0xb9, 0x1c, - 0x39, 0x3a, 0xeb, 0x10, 0x3b, 0xbe, 0xc6, 0x57, 0x47, 0x67 }; + 0xa6, 0x6c, 0xc9, 0x29, 0x4e, 0xbb, 0x6c, 0xa0, 0x2d, 0xd6, 0x28, + 0xb2, 0x8e, 0xcd, 0xa6, 0x3c, 0x3b, 0xef, 0x5a, 0xc2, 0xf1, 0xaf, + 0x84, 0xbb, 0xbc, 0x3b, 0x30, 0xac, 0xf0, 0x02, 0xf8, 0xa4, 0x92, + 0x0d, 0xbf, 0xb5, 0x7e, 0xe5, 0x3c, 0x0e, 0xa1, 0xe9, 0xb9, 0x1c, + 0x39, 0x3a, 0xeb, 0x10, 0x3b, 0xbe, 0xc6, 0x57, 0x47, 0x67 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_82[] = { 0xfa, 0xad, 0x85, 0xd1, 0xe7, 0x1a, 0x2d, 0x1b, 0x32, 0x9e, 0x3b, - 0x30, 0x9e, 0x83, 0x3a, 0x8b, 0xbf, 0xe8, 0xd4, 0x2f, 0x46, 0x2f, - 0x3f, 0x77, 0x40, 0x89, 0x91, 0xb4, 0x14, 0x65, 0x2d, 0x34 }; + 0x30, 0x9e, 0x83, 0x3a, 0x8b, 0xbf, 0xe8, 0xd4, 0x2f, 0x46, 0x2f, + 0x3f, 0x77, 0x40, 0x89, 0x91, 0xb4, 0x14, 0x65, 0x2d, 0x34 }; static const uint8_t chiptest_fcf59b3113ef_out_point_83[] = { 0x04, 0xc9, 0x7b, 0xa6, 0x19, 0xd8, 0xb2, 0xf6, 0x5c, 0x62, 0x44, 0xfb, 0xa0, 0x78, 0xed, 0x43, 0xd7, 0xd5, 0xcc, 0x75, 0x93, 0x4f, 0x02, 0x9d, 0x39, 0x43, 0x46, 0x40, 0x08, 0xff, 0xa6, 0x65, 0xfc, @@ -544,23 +544,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_84 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_85[] = { 0x04, 0x56, 0xf8, 0xed, 0xe1, 0x8e, 0xf1, 0x4e, 0xad, 0xa8, 0x56, - 0xcd, 0x8e, 0xbb, 0x77, 0x4f, 0x19, 0xfe, 0xe4, 0x96, 0x38, 0x19, - 0xae, 0x88, 0x86, 0xea, 0xed, 0xa9, 0x70, 0xc9, 0x41, 0x03, 0x74, - 0x74, 0x42, 0xf2, 0x36, 0x0f, 0xfb, 0x02, 0xa7, 0x46, 0x85, 0xdb, - 0xce, 0x7d, 0x6e, 0x65, 0xa2, 0xe3, 0xba, 0x5e, 0x67, 0x3f, 0x3d, - 0x76, 0x21, 0x4c, 0xeb, 0xf8, 0x5b, 0x33, 0x98, 0xc4, 0xa9 }; + 0xcd, 0x8e, 0xbb, 0x77, 0x4f, 0x19, 0xfe, 0xe4, 0x96, 0x38, 0x19, + 0xae, 0x88, 0x86, 0xea, 0xed, 0xa9, 0x70, 0xc9, 0x41, 0x03, 0x74, + 0x74, 0x42, 0xf2, 0x36, 0x0f, 0xfb, 0x02, 0xa7, 0x46, 0x85, 0xdb, + 0xce, 0x7d, 0x6e, 0x65, 0xa2, 0xe3, 0xba, 0x5e, 0x67, 0x3f, 0x3d, + 0x76, 0x21, 0x4c, 0xeb, 0xf8, 0x5b, 0x33, 0x98, 0xc4, 0xa9 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_86[] = { 0xb1, 0xf4, 0x5c, 0xad, 0x7f, 0xfe, 0xb6, 0x04, 0x61, 0x7e, 0xf3, - 0xea, 0xf3, 0x35, 0x01, 0x35, 0x16, 0x10, 0x86, 0xd5, 0x0d, 0xc3, - 0x21, 0xae, 0x7f, 0x9b, 0x95, 0xc8, 0xeb, 0xb2, 0x4f, 0x0d }; + 0xea, 0xf3, 0x35, 0x01, 0x35, 0x16, 0x10, 0x86, 0xd5, 0x0d, 0xc3, + 0x21, 0xae, 0x7f, 0x9b, 0x95, 0xc8, 0xeb, 0xb2, 0x4f, 0x0d }; static const uint8_t chiptest_fcf59b3113ef_point2_87[] = { 0x04, 0x95, 0x3c, 0x8e, 0xc3, 0x23, 0x34, 0x74, 0x4f, 0xd0, 0x99, - 0x2c, 0x1e, 0x14, 0xf4, 0x5f, 0x74, 0x97, 0x21, 0xa8, 0xe9, 0xfd, - 0xcd, 0x32, 0xd3, 0x40, 0x0f, 0xc6, 0xbb, 0x50, 0xc9, 0x5b, 0x50, - 0x14, 0x04, 0x5d, 0x74, 0xa9, 0x33, 0x4c, 0x3b, 0xc7, 0x12, 0x0c, - 0x8f, 0x8f, 0x90, 0x54, 0x93, 0x98, 0x61, 0xb1, 0xe8, 0x53, 0x44, - 0x36, 0x2f, 0xc5, 0x48, 0x31, 0xc6, 0x70, 0x41, 0xa1, 0xa3 }; + 0x2c, 0x1e, 0x14, 0xf4, 0x5f, 0x74, 0x97, 0x21, 0xa8, 0xe9, 0xfd, + 0xcd, 0x32, 0xd3, 0x40, 0x0f, 0xc6, 0xbb, 0x50, 0xc9, 0x5b, 0x50, + 0x14, 0x04, 0x5d, 0x74, 0xa9, 0x33, 0x4c, 0x3b, 0xc7, 0x12, 0x0c, + 0x8f, 0x8f, 0x90, 0x54, 0x93, 0x98, 0x61, 0xb1, 0xe8, 0x53, 0x44, + 0x36, 0x2f, 0xc5, 0x48, 0x31, 0xc6, 0x70, 0x41, 0xa1, 0xa3 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_88[] = { 0x27, 0x30, 0xdc, 0xa7, 0xa7, 0xf4, 0x31, 0x43, 0x12, 0x87, 0x82, - 0x84, 0xa2, 0xd2, 0xe8, 0xa1, 0x0e, 0x3b, 0x94, 0x56, 0xb5, 0x09, - 0xc2, 0xde, 0xd4, 0x54, 0x81, 0xce, 0x33, 0x0e, 0x65, 0x19 }; + 0x84, 0xa2, 0xd2, 0xe8, 0xa1, 0x0e, 0x3b, 0x94, 0x56, 0xb5, 0x09, + 0xc2, 0xde, 0xd4, 0x54, 0x81, 0xce, 0x33, 0x0e, 0x65, 0x19 }; static const uint8_t chiptest_fcf59b3113ef_out_point_89[] = { 0x04, 0x14, 0x3d, 0xe8, 0xb9, 0xac, 0x3b, 0x6a, 0x88, 0x17, 0x1b, 0xc2, 0x2e, 0x76, 0x32, 0x29, 0x62, 0x9b, 0x44, 0x82, 0x2d, 0x94, 0x54, 0x91, 0x68, 0x86, 0xdc, 0x8e, 0x74, 0x4b, 0x33, 0x40, 0xd5, @@ -580,23 +580,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_90 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_91[] = { 0x04, 0xb0, 0x14, 0x84, 0xd2, 0x82, 0xf3, 0x3e, 0x48, 0xbd, 0xb4, - 0x17, 0x5b, 0x67, 0xcd, 0xda, 0xa9, 0xfb, 0x35, 0x3c, 0x6e, 0x2b, - 0x64, 0xae, 0x39, 0x59, 0xdf, 0x49, 0xed, 0xbb, 0x82, 0x94, 0x8a, - 0xf3, 0xfa, 0x5f, 0xd1, 0xc7, 0x99, 0x1e, 0xbf, 0xf0, 0xd4, 0x43, - 0x09, 0x04, 0x3e, 0xc8, 0xfa, 0x64, 0xda, 0xe1, 0xcd, 0xe2, 0x1e, - 0x49, 0x7d, 0xc0, 0xe7, 0x90, 0x24, 0x44, 0xea, 0xc7, 0xe6 }; + 0x17, 0x5b, 0x67, 0xcd, 0xda, 0xa9, 0xfb, 0x35, 0x3c, 0x6e, 0x2b, + 0x64, 0xae, 0x39, 0x59, 0xdf, 0x49, 0xed, 0xbb, 0x82, 0x94, 0x8a, + 0xf3, 0xfa, 0x5f, 0xd1, 0xc7, 0x99, 0x1e, 0xbf, 0xf0, 0xd4, 0x43, + 0x09, 0x04, 0x3e, 0xc8, 0xfa, 0x64, 0xda, 0xe1, 0xcd, 0xe2, 0x1e, + 0x49, 0x7d, 0xc0, 0xe7, 0x90, 0x24, 0x44, 0xea, 0xc7, 0xe6 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_92[] = { 0xfc, 0x8e, 0x98, 0x95, 0x8b, 0xa3, 0x50, 0xb0, 0x3f, 0xba, 0x98, - 0xf9, 0xf4, 0x57, 0x37, 0xce, 0xb8, 0xfe, 0x8c, 0x58, 0x9d, 0xdf, - 0x5c, 0x2f, 0x63, 0xc5, 0x3a, 0x43, 0xbc, 0x87, 0xeb, 0x4e }; + 0xf9, 0xf4, 0x57, 0x37, 0xce, 0xb8, 0xfe, 0x8c, 0x58, 0x9d, 0xdf, + 0x5c, 0x2f, 0x63, 0xc5, 0x3a, 0x43, 0xbc, 0x87, 0xeb, 0x4e }; static const uint8_t chiptest_fcf59b3113ef_point2_93[] = { 0x04, 0x3c, 0x8a, 0x6c, 0xb6, 0x66, 0x2c, 0x07, 0x3b, 0xb6, 0x20, - 0x28, 0xb0, 0x12, 0x31, 0x26, 0x92, 0x2f, 0x00, 0xe1, 0x90, 0x0b, - 0x66, 0x17, 0x5f, 0xcc, 0x1e, 0x4f, 0xdb, 0xf7, 0xe7, 0xfb, 0x65, - 0x99, 0x81, 0xb8, 0x8b, 0xab, 0x1e, 0xda, 0x74, 0x62, 0x22, 0xa3, - 0xd9, 0x46, 0xa5, 0x44, 0xa0, 0x6b, 0xc9, 0x05, 0xeb, 0xa7, 0x02, - 0xf9, 0xf7, 0x2e, 0x7b, 0x55, 0xb3, 0x28, 0xbf, 0x22, 0xc4 }; + 0x28, 0xb0, 0x12, 0x31, 0x26, 0x92, 0x2f, 0x00, 0xe1, 0x90, 0x0b, + 0x66, 0x17, 0x5f, 0xcc, 0x1e, 0x4f, 0xdb, 0xf7, 0xe7, 0xfb, 0x65, + 0x99, 0x81, 0xb8, 0x8b, 0xab, 0x1e, 0xda, 0x74, 0x62, 0x22, 0xa3, + 0xd9, 0x46, 0xa5, 0x44, 0xa0, 0x6b, 0xc9, 0x05, 0xeb, 0xa7, 0x02, + 0xf9, 0xf7, 0x2e, 0x7b, 0x55, 0xb3, 0x28, 0xbf, 0x22, 0xc4 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_94[] = { 0x19, 0xd7, 0x60, 0xf1, 0x64, 0x90, 0x1e, 0x83, 0x5b, 0x2e, 0xc1, - 0xf9, 0xc6, 0x1d, 0xf8, 0xf7, 0x10, 0x1c, 0x8a, 0x01, 0xdc, 0xd0, - 0x70, 0xfc, 0x82, 0x00, 0x2c, 0x06, 0x6f, 0xfb, 0x20, 0xb3 }; + 0xf9, 0xc6, 0x1d, 0xf8, 0xf7, 0x10, 0x1c, 0x8a, 0x01, 0xdc, 0xd0, + 0x70, 0xfc, 0x82, 0x00, 0x2c, 0x06, 0x6f, 0xfb, 0x20, 0xb3 }; static const uint8_t chiptest_fcf59b3113ef_out_point_95[] = { 0x04, 0x22, 0x11, 0xed, 0x30, 0xee, 0x65, 0xe4, 0x45, 0xde, 0x8d, 0xd7, 0xfe, 0xa9, 0x47, 0x8c, 0x70, 0x35, 0x80, 0x64, 0x35, 0xa7, 0x5d, 0x96, 0xea, 0xc2, 0xe3, 0x3c, 0x73, 0xcf, 0x5e, 0xbb, 0xf5, @@ -616,23 +616,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_96 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_97[] = { 0x04, 0x30, 0x51, 0x75, 0x4e, 0x6e, 0xf1, 0x96, 0xe1, 0x18, 0x48, - 0x1c, 0x03, 0x55, 0x93, 0xfd, 0xa5, 0xd5, 0x11, 0x62, 0x8d, 0x9f, - 0xbd, 0x8f, 0x28, 0xb7, 0xa3, 0x05, 0x7f, 0xc2, 0xc8, 0xb1, 0x02, - 0xce, 0x46, 0x08, 0x28, 0x7b, 0x86, 0x1f, 0xdc, 0x04, 0xd6, 0x73, - 0xb8, 0x21, 0x69, 0x9d, 0x0f, 0x2b, 0x8b, 0x32, 0xc5, 0xc3, 0xb6, - 0x54, 0x9e, 0xd0, 0x3e, 0x71, 0x5c, 0xbf, 0x37, 0xff, 0x0b }; + 0x1c, 0x03, 0x55, 0x93, 0xfd, 0xa5, 0xd5, 0x11, 0x62, 0x8d, 0x9f, + 0xbd, 0x8f, 0x28, 0xb7, 0xa3, 0x05, 0x7f, 0xc2, 0xc8, 0xb1, 0x02, + 0xce, 0x46, 0x08, 0x28, 0x7b, 0x86, 0x1f, 0xdc, 0x04, 0xd6, 0x73, + 0xb8, 0x21, 0x69, 0x9d, 0x0f, 0x2b, 0x8b, 0x32, 0xc5, 0xc3, 0xb6, + 0x54, 0x9e, 0xd0, 0x3e, 0x71, 0x5c, 0xbf, 0x37, 0xff, 0x0b }; static const uint8_t chiptest_fcf59b3113ef_scalar1_98[] = { 0x72, 0xc6, 0x32, 0x24, 0x28, 0x90, 0x3c, 0x1c, 0xee, 0xdd, 0x75, - 0xe4, 0xdc, 0xfc, 0xc1, 0xb0, 0x14, 0xbf, 0xc9, 0x72, 0x25, 0x0f, - 0xcd, 0xbe, 0x0c, 0x70, 0x03, 0x14, 0xdd, 0x8a, 0xf9, 0xa2 }; + 0xe4, 0xdc, 0xfc, 0xc1, 0xb0, 0x14, 0xbf, 0xc9, 0x72, 0x25, 0x0f, + 0xcd, 0xbe, 0x0c, 0x70, 0x03, 0x14, 0xdd, 0x8a, 0xf9, 0xa2 }; static const uint8_t chiptest_fcf59b3113ef_point2_99[] = { 0x04, 0xe2, 0x0b, 0x0f, 0xa2, 0x93, 0x13, 0xf0, 0x5a, 0x6e, 0x71, - 0x39, 0x24, 0x5a, 0x82, 0xcd, 0xbf, 0x1c, 0x11, 0xb5, 0xe2, 0x30, - 0x74, 0xe6, 0x6e, 0xe7, 0x1d, 0x18, 0x66, 0x30, 0xc1, 0x5f, 0x23, - 0x6b, 0x12, 0xc9, 0xc9, 0x53, 0x66, 0xe8, 0xd1, 0xc0, 0x9f, 0x39, - 0x03, 0x74, 0x24, 0x35, 0x03, 0x93, 0xa9, 0x15, 0x47, 0xcf, 0x88, - 0x2a, 0xb2, 0x0f, 0xe1, 0x1c, 0x7c, 0x06, 0x9e, 0x95, 0x74 }; + 0x39, 0x24, 0x5a, 0x82, 0xcd, 0xbf, 0x1c, 0x11, 0xb5, 0xe2, 0x30, + 0x74, 0xe6, 0x6e, 0xe7, 0x1d, 0x18, 0x66, 0x30, 0xc1, 0x5f, 0x23, + 0x6b, 0x12, 0xc9, 0xc9, 0x53, 0x66, 0xe8, 0xd1, 0xc0, 0x9f, 0x39, + 0x03, 0x74, 0x24, 0x35, 0x03, 0x93, 0xa9, 0x15, 0x47, 0xcf, 0x88, + 0x2a, 0xb2, 0x0f, 0xe1, 0x1c, 0x7c, 0x06, 0x9e, 0x95, 0x74 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_100[] = { 0x3c, 0x64, 0x29, 0xf0, 0x93, 0xf8, 0xd9, 0x4d, 0x83, 0x02, 0x3c, - 0xf3, 0xe9, 0x9e, 0x1f, 0xe6, 0x99, 0xf7, 0x2c, 0xc0, 0x19, 0xbe, - 0x23, 0xea, 0x0d, 0x54, 0x2b, 0x11, 0xc1, 0x7c, 0x22 }; + 0xf3, 0xe9, 0x9e, 0x1f, 0xe6, 0x99, 0xf7, 0x2c, 0xc0, 0x19, 0xbe, + 0x23, 0xea, 0x0d, 0x54, 0x2b, 0x11, 0xc1, 0x7c, 0x22 }; static const uint8_t chiptest_fcf59b3113ef_out_point_101[] = { 0x04, 0x72, 0x40, 0xd8, 0x36, 0xff, 0x7b, 0x00, 0xb1, 0x8b, 0x34, 0x06, 0xda, 0x5c, 0xa4, 0x5e, 0x8e, 0x15, 0xf5, 0x70, 0x9b, 0x4f, 0x09, 0x73, 0x45, 0x1d, 0x8b, 0xc0, 0xc8, 0x17, 0x60, 0xdc, 0x01, @@ -652,23 +652,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_10 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_103[] = { 0x04, 0xe4, 0xa2, 0xce, 0x58, 0xd2, 0xe9, 0xe5, 0x6e, 0xa8, 0x7d, - 0xc8, 0xd8, 0x95, 0x8e, 0xca, 0x58, 0x1b, 0x0f, 0x92, 0x3f, 0xe9, - 0xca, 0xb9, 0xc2, 0x79, 0x48, 0x7b, 0xb8, 0x04, 0x3e, 0x47, 0x02, - 0xd4, 0x17, 0x73, 0x03, 0xcc, 0x61, 0x72, 0x2b, 0xec, 0x0e, 0xee, - 0x15, 0xe9, 0xcb, 0x7d, 0x76, 0x51, 0xe0, 0x2d, 0x5b, 0x2f, 0xbd, - 0x5e, 0xe5, 0x03, 0xd6, 0x53, 0x86, 0x26, 0xe7, 0x98, 0xc0 }; + 0xc8, 0xd8, 0x95, 0x8e, 0xca, 0x58, 0x1b, 0x0f, 0x92, 0x3f, 0xe9, + 0xca, 0xb9, 0xc2, 0x79, 0x48, 0x7b, 0xb8, 0x04, 0x3e, 0x47, 0x02, + 0xd4, 0x17, 0x73, 0x03, 0xcc, 0x61, 0x72, 0x2b, 0xec, 0x0e, 0xee, + 0x15, 0xe9, 0xcb, 0x7d, 0x76, 0x51, 0xe0, 0x2d, 0x5b, 0x2f, 0xbd, + 0x5e, 0xe5, 0x03, 0xd6, 0x53, 0x86, 0x26, 0xe7, 0x98, 0xc0 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_104[] = { 0x3a, 0x78, 0x23, 0xeb, 0xf9, 0xa6, 0x0a, 0xb8, 0x42, 0x1d, 0x04, - 0x23, 0xb9, 0x3e, 0x0b, 0xaa, 0x4d, 0x6a, 0x8c, 0xb4, 0x5c, 0xc9, - 0x68, 0x27, 0x3a, 0x04, 0x55, 0xc1, 0x3b, 0xc5, 0x9e, 0x1a }; + 0x23, 0xb9, 0x3e, 0x0b, 0xaa, 0x4d, 0x6a, 0x8c, 0xb4, 0x5c, 0xc9, + 0x68, 0x27, 0x3a, 0x04, 0x55, 0xc1, 0x3b, 0xc5, 0x9e, 0x1a }; static const uint8_t chiptest_fcf59b3113ef_point2_105[] = { 0x04, 0xaf, 0x52, 0x6b, 0x71, 0x16, 0xb7, 0x11, 0xcd, 0xbb, 0x15, - 0xbe, 0x85, 0x95, 0xb3, 0x11, 0x93, 0x4c, 0xa3, 0x3e, 0x19, 0xb7, - 0xca, 0x89, 0xc7, 0x81, 0xf8, 0xac, 0x47, 0xf7, 0xa2, 0x80, 0x48, - 0xa1, 0x93, 0x68, 0x7c, 0x68, 0x1d, 0x1f, 0xae, 0xbe, 0x32, 0x3f, - 0xdd, 0x23, 0xde, 0x10, 0x81, 0x08, 0xf5, 0x33, 0xa2, 0x17, 0xd2, - 0x3b, 0xde, 0x53, 0x6e, 0xb7, 0x47, 0x49, 0x5f, 0x20, 0x40 }; + 0xbe, 0x85, 0x95, 0xb3, 0x11, 0x93, 0x4c, 0xa3, 0x3e, 0x19, 0xb7, + 0xca, 0x89, 0xc7, 0x81, 0xf8, 0xac, 0x47, 0xf7, 0xa2, 0x80, 0x48, + 0xa1, 0x93, 0x68, 0x7c, 0x68, 0x1d, 0x1f, 0xae, 0xbe, 0x32, 0x3f, + 0xdd, 0x23, 0xde, 0x10, 0x81, 0x08, 0xf5, 0x33, 0xa2, 0x17, 0xd2, + 0x3b, 0xde, 0x53, 0x6e, 0xb7, 0x47, 0x49, 0x5f, 0x20, 0x40 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_106[] = { 0xf1, 0x4c, 0xfd, 0x9f, 0x84, 0xcf, 0xab, 0xcb, 0xab, 0x88, 0x77, - 0x0f, 0xee, 0x35, 0x3d, 0xca, 0xfa, 0x42, 0x83, 0x5b, 0x03, 0x2a, - 0x48, 0x95, 0x63, 0x46, 0x69, 0x60, 0xda, 0x7d, 0x93, 0x71 }; + 0x0f, 0xee, 0x35, 0x3d, 0xca, 0xfa, 0x42, 0x83, 0x5b, 0x03, 0x2a, + 0x48, 0x95, 0x63, 0x46, 0x69, 0x60, 0xda, 0x7d, 0x93, 0x71 }; static const uint8_t chiptest_fcf59b3113ef_out_point_107[] = { 0x04, 0xc3, 0xc6, 0xff, 0x52, 0xbb, 0x8a, 0x11, 0x6b, 0xf4, 0x9c, 0x7a, 0x00, 0x9c, 0xd1, 0xf7, 0x1c, 0xb4, 0xc9, 0xbe, 0xfc, 0x9c, 0x05, 0x19, 0x39, 0xc8, 0x08, 0xa8, 0x7d, 0x15, 0x5a, 0x0e, 0x5d, @@ -688,23 +688,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_10 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_109[] = { 0x04, 0xea, 0x43, 0xef, 0x47, 0x57, 0xf9, 0xff, 0x04, 0xfd, 0xac, - 0x1a, 0xf8, 0x89, 0x12, 0xda, 0x2d, 0xf4, 0xdc, 0x40, 0x08, 0x21, - 0x87, 0x62, 0xbc, 0x94, 0x51, 0x0f, 0xbc, 0x3e, 0xd7, 0x05, 0xc6, - 0x97, 0x2c, 0x27, 0x04, 0x94, 0x76, 0x4e, 0xb7, 0xf7, 0x80, 0xe5, - 0x57, 0x4e, 0x14, 0x15, 0x9e, 0x49, 0x7e, 0xbb, 0xa3, 0x2c, 0xac, - 0x08, 0x69, 0x34, 0xc2, 0xd9, 0x08, 0x13, 0x76, 0xf7, 0xdc }; + 0x1a, 0xf8, 0x89, 0x12, 0xda, 0x2d, 0xf4, 0xdc, 0x40, 0x08, 0x21, + 0x87, 0x62, 0xbc, 0x94, 0x51, 0x0f, 0xbc, 0x3e, 0xd7, 0x05, 0xc6, + 0x97, 0x2c, 0x27, 0x04, 0x94, 0x76, 0x4e, 0xb7, 0xf7, 0x80, 0xe5, + 0x57, 0x4e, 0x14, 0x15, 0x9e, 0x49, 0x7e, 0xbb, 0xa3, 0x2c, 0xac, + 0x08, 0x69, 0x34, 0xc2, 0xd9, 0x08, 0x13, 0x76, 0xf7, 0xdc }; static const uint8_t chiptest_fcf59b3113ef_scalar1_110[] = { 0x47, 0xb3, 0x81, 0x34, 0x60, 0x0e, 0xb7, 0xb7, 0x7b, 0xb7, 0xf7, - 0xe9, 0xfc, 0x8c, 0x00, 0x56, 0x01, 0x1f, 0xd6, 0xc2, 0x95, 0xa4, - 0x91, 0xc5, 0x90, 0x34, 0x69, 0x21, 0x45, 0xaf, 0xdc, 0x6f }; + 0xe9, 0xfc, 0x8c, 0x00, 0x56, 0x01, 0x1f, 0xd6, 0xc2, 0x95, 0xa4, + 0x91, 0xc5, 0x90, 0x34, 0x69, 0x21, 0x45, 0xaf, 0xdc, 0x6f }; static const uint8_t chiptest_fcf59b3113ef_point2_111[] = { 0x04, 0x42, 0xc2, 0x2a, 0x1d, 0x88, 0x7c, 0xd0, 0x3e, 0x1b, 0xd9, - 0xaa, 0x8a, 0x54, 0xf7, 0x9c, 0x23, 0xb5, 0xfc, 0x27, 0x40, 0x76, - 0x1c, 0x78, 0x7e, 0x40, 0x1b, 0x21, 0xd8, 0x22, 0x38, 0x07, 0x8d, - 0xb4, 0xc0, 0x53, 0xde, 0x18, 0x8c, 0xc4, 0x3a, 0xca, 0xe2, 0x93, - 0x58, 0x20, 0xfd, 0x5e, 0x50, 0xc0, 0x72, 0x8c, 0x3f, 0x60, 0x16, - 0xb1, 0x93, 0x5c, 0xaf, 0x61, 0xed, 0x78, 0xd9, 0x43, 0xf9 }; + 0xaa, 0x8a, 0x54, 0xf7, 0x9c, 0x23, 0xb5, 0xfc, 0x27, 0x40, 0x76, + 0x1c, 0x78, 0x7e, 0x40, 0x1b, 0x21, 0xd8, 0x22, 0x38, 0x07, 0x8d, + 0xb4, 0xc0, 0x53, 0xde, 0x18, 0x8c, 0xc4, 0x3a, 0xca, 0xe2, 0x93, + 0x58, 0x20, 0xfd, 0x5e, 0x50, 0xc0, 0x72, 0x8c, 0x3f, 0x60, 0x16, + 0xb1, 0x93, 0x5c, 0xaf, 0x61, 0xed, 0x78, 0xd9, 0x43, 0xf9 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_112[] = { 0x79, 0x85, 0xce, 0x7d, 0x70, 0x9f, 0x3b, 0xa8, 0xd9, 0xfb, 0x20, - 0x71, 0x60, 0xd4, 0x48, 0x08, 0x40, 0xac, 0xfb, 0x9b, 0x05, 0xcb, - 0x18, 0xd7, 0xac, 0xb0, 0x27, 0xe8, 0x85, 0x97, 0xe0, 0xaf }; + 0x71, 0x60, 0xd4, 0x48, 0x08, 0x40, 0xac, 0xfb, 0x9b, 0x05, 0xcb, + 0x18, 0xd7, 0xac, 0xb0, 0x27, 0xe8, 0x85, 0x97, 0xe0, 0xaf }; static const uint8_t chiptest_fcf59b3113ef_out_point_113[] = { 0x04, 0xff, 0x7e, 0x7e, 0xde, 0x7c, 0x30, 0xb4, 0x24, 0x29, 0x0e, 0xa6, 0xa8, 0x1a, 0x6d, 0xa8, 0x22, 0xcc, 0x87, 0x12, 0xd5, 0x56, 0x83, 0x3a, 0x22, 0x0b, 0x08, 0xdf, 0x2f, 0x00, 0x29, 0xb2, 0x5a, @@ -724,23 +724,23 @@ static const struct spake2p_point_muladd_tv chiptest_fcf59b3113ef_test_vector_11 .out_point_len = 65, }; static const uint8_t chiptest_fcf59b3113ef_point1_115[] = { 0x04, 0xfa, 0xa1, 0x3a, 0xf2, 0x55, 0x2c, 0x6b, 0x5a, 0x6c, 0x47, - 0xbf, 0x59, 0x22, 0x19, 0x7e, 0x7a, 0xd4, 0xd6, 0x9c, 0x68, 0x4e, - 0x28, 0xca, 0x0a, 0x91, 0x43, 0xa9, 0x72, 0x84, 0x5f, 0x48, 0x7e, - 0x16, 0x45, 0x97, 0x96, 0x0b, 0xab, 0x98, 0x16, 0xde, 0xb3, 0x53, - 0x02, 0x1e, 0x1f, 0x99, 0xde, 0x7f, 0x04, 0xa6, 0x63, 0x52, 0x63, - 0xbe, 0xf8, 0xd1, 0x50, 0x52, 0xfa, 0xed, 0xef, 0x3e, 0xf4 }; + 0xbf, 0x59, 0x22, 0x19, 0x7e, 0x7a, 0xd4, 0xd6, 0x9c, 0x68, 0x4e, + 0x28, 0xca, 0x0a, 0x91, 0x43, 0xa9, 0x72, 0x84, 0x5f, 0x48, 0x7e, + 0x16, 0x45, 0x97, 0x96, 0x0b, 0xab, 0x98, 0x16, 0xde, 0xb3, 0x53, + 0x02, 0x1e, 0x1f, 0x99, 0xde, 0x7f, 0x04, 0xa6, 0x63, 0x52, 0x63, + 0xbe, 0xf8, 0xd1, 0x50, 0x52, 0xfa, 0xed, 0xef, 0x3e, 0xf4 }; static const uint8_t chiptest_fcf59b3113ef_scalar1_116[] = { 0x1b, 0x1b, 0x04, 0xf9, 0x37, 0x74, 0x8f, 0xd7, 0xf9, 0x6f, 0x61, - 0x3f, 0x8b, 0xbf, 0xf1, 0xa5, 0x0d, 0x69, 0x3c, 0x99, 0x58, 0x28, - 0xcf, 0xca, 0x4e, 0xfd, 0x3a, 0x51, 0x15, 0x49, 0x1c, 0x61 }; + 0x3f, 0x8b, 0xbf, 0xf1, 0xa5, 0x0d, 0x69, 0x3c, 0x99, 0x58, 0x28, + 0xcf, 0xca, 0x4e, 0xfd, 0x3a, 0x51, 0x15, 0x49, 0x1c, 0x61 }; static const uint8_t chiptest_fcf59b3113ef_point2_117[] = { 0x04, 0x2e, 0xf0, 0xaf, 0x10, 0xa1, 0x6c, 0xbf, 0x87, 0xa2, 0x3e, - 0x57, 0x3c, 0x33, 0xa6, 0x22, 0x51, 0x02, 0xc9, 0x34, 0x25, 0x8c, - 0xbe, 0x5b, 0x42, 0xac, 0x7d, 0x39, 0x3f, 0x9e, 0x40, 0x8b, 0x21, - 0xf1, 0x86, 0x97, 0x79, 0xc9, 0x66, 0x3d, 0xd5, 0xab, 0xaa, 0x1b, - 0x18, 0xac, 0x87, 0x27, 0x7a, 0xec, 0x19, 0x9b, 0x24, 0x07, 0x1d, - 0x6f, 0x41, 0x34, 0x80, 0x57, 0x2d, 0x11, 0x94, 0xf8, 0x28 }; + 0x57, 0x3c, 0x33, 0xa6, 0x22, 0x51, 0x02, 0xc9, 0x34, 0x25, 0x8c, + 0xbe, 0x5b, 0x42, 0xac, 0x7d, 0x39, 0x3f, 0x9e, 0x40, 0x8b, 0x21, + 0xf1, 0x86, 0x97, 0x79, 0xc9, 0x66, 0x3d, 0xd5, 0xab, 0xaa, 0x1b, + 0x18, 0xac, 0x87, 0x27, 0x7a, 0xec, 0x19, 0x9b, 0x24, 0x07, 0x1d, + 0x6f, 0x41, 0x34, 0x80, 0x57, 0x2d, 0x11, 0x94, 0xf8, 0x28 }; static const uint8_t chiptest_fcf59b3113ef_scalar2_118[] = { 0xfc, 0x90, 0x80, 0x01, 0xad, 0x4e, 0x8a, 0xfb, 0x17, 0xf7, 0x7a, - 0x51, 0x14, 0xfd, 0x19, 0x41, 0xf9, 0x7a, 0x16, 0x87, 0x78, 0xe8, - 0x24, 0x5c, 0x48, 0xf7, 0x4b, 0xdb, 0x31, 0xe6, 0x45, 0x2a }; + 0x51, 0x14, 0xfd, 0x19, 0x41, 0xf9, 0x7a, 0x16, 0x87, 0x78, 0xe8, + 0x24, 0x5c, 0x48, 0xf7, 0x4b, 0xdb, 0x31, 0xe6, 0x45, 0x2a }; static const uint8_t chiptest_fcf59b3113ef_out_point_119[] = { 0x04, 0x85, 0x16, 0xf2, 0x66, 0xd4, 0x10, 0x63, 0xed, 0xb8, 0xe1, 0x2c, 0x1f, 0x31, 0x13, 0xcb, 0xa0, 0x6f, 0xa9, 0xbd, 0x4e, 0x0b, 0x11, 0x94, 0xab, 0x88, 0x5a, 0x53, 0xc4, 0xdb, 0x7b, 0x35, 0x72, diff --git a/src/crypto/tests/SPAKE2P_POINT_MUL_test_vectors.h b/src/crypto/tests/SPAKE2P_POINT_MUL_test_vectors.h index fca6caa99ce7db..5d1b782a61a5be 100644 --- a/src/crypto/tests/SPAKE2P_POINT_MUL_test_vectors.h +++ b/src/crypto/tests/SPAKE2P_POINT_MUL_test_vectors.h @@ -36,14 +36,14 @@ struct spake2p_point_mul_tv }; static const uint8_t chiptest_0fd26a42aa63_point_1[] = { 0x04, 0x11, 0xc6, 0x0f, 0x3c, 0x30, 0x72, 0x47, 0x4f, 0xec, 0x46, - 0x86, 0x68, 0xe6, 0x92, 0xc2, 0xfe, 0xd2, 0x32, 0x75, 0x57, 0x03, - 0x9b, 0x74, 0xc1, 0x03, 0x56, 0xff, 0x4a, 0x4f, 0xa2, 0x09, 0x88, - 0x7e, 0xca, 0xfa, 0xd1, 0xe7, 0x05, 0x10, 0xb8, 0x0e, 0x89, 0x30, - 0xb9, 0x8b, 0x09, 0x69, 0x02, 0x09, 0x6c, 0x5a, 0x16, 0x50, 0x7b, - 0xf7, 0x02, 0x24, 0x5c, 0x8f, 0x56, 0xef, 0xcf, 0xdf, 0xf3 }; + 0x86, 0x68, 0xe6, 0x92, 0xc2, 0xfe, 0xd2, 0x32, 0x75, 0x57, 0x03, + 0x9b, 0x74, 0xc1, 0x03, 0x56, 0xff, 0x4a, 0x4f, 0xa2, 0x09, 0x88, + 0x7e, 0xca, 0xfa, 0xd1, 0xe7, 0x05, 0x10, 0xb8, 0x0e, 0x89, 0x30, + 0xb9, 0x8b, 0x09, 0x69, 0x02, 0x09, 0x6c, 0x5a, 0x16, 0x50, 0x7b, + 0xf7, 0x02, 0x24, 0x5c, 0x8f, 0x56, 0xef, 0xcf, 0xdf, 0xf3 }; static const uint8_t chiptest_0fd26a42aa63_scalar_2[] = { 0xa4, 0xce, 0x40, 0x79, 0x0c, 0x1a, 0xf0, 0xcd, 0xa9, 0x67, 0xac, - 0xb6, 0x66, 0x28, 0xa6, 0x65, 0xd3, 0x4e, 0x2f, 0x1c, 0xd4, 0xe8, - 0x06, 0xe4, 0x8f, 0x6d, 0xc9, 0x30, 0x0b, 0x3b, 0xc3, 0xb6 }; + 0xb6, 0x66, 0x28, 0xa6, 0x65, 0xd3, 0x4e, 0x2f, 0x1c, 0xd4, 0xe8, + 0x06, 0xe4, 0x8f, 0x6d, 0xc9, 0x30, 0x0b, 0x3b, 0xc3, 0xb6 }; static const uint8_t chiptest_0fd26a42aa63_out_point_3[] = { 0x04, 0xc4, 0x1e, 0x45, 0x5d, 0x9b, 0xf8, 0xe2, 0x71, 0x40, 0xe4, 0x4d, 0x86, 0xd3, 0xa3, 0xc3, 0xa2, 0x84, 0xda, 0x30, 0xd1, 0xae, 0x41, 0x48, 0x2c, 0x1d, 0x6c, 0xa4, 0x96, 0x02, 0x81, 0xf1, 0xb8, @@ -59,14 +59,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_4 = { .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_5[] = { 0x04, 0xed, 0x09, 0x15, 0x95, 0x7b, 0x1a, 0x2b, 0x71, 0x31, 0x54, - 0x9c, 0xa5, 0x23, 0x5c, 0x9b, 0x0e, 0x00, 0x4d, 0x84, 0x7d, 0xa1, - 0x52, 0xfb, 0x3d, 0xc3, 0x58, 0xa3, 0xfd, 0x53, 0x5a, 0x31, 0x28, - 0x67, 0x10, 0xf7, 0x69, 0x10, 0xab, 0x7b, 0xfa, 0xfa, 0x2f, 0xce, - 0x55, 0x6d, 0x1e, 0x1e, 0x09, 0x17, 0x49, 0x46, 0x0e, 0xcb, 0x67, - 0xb4, 0x44, 0x83, 0x08, 0x98, 0x4b, 0xe5, 0xc9, 0xc4, 0x28 }; + 0x9c, 0xa5, 0x23, 0x5c, 0x9b, 0x0e, 0x00, 0x4d, 0x84, 0x7d, 0xa1, + 0x52, 0xfb, 0x3d, 0xc3, 0x58, 0xa3, 0xfd, 0x53, 0x5a, 0x31, 0x28, + 0x67, 0x10, 0xf7, 0x69, 0x10, 0xab, 0x7b, 0xfa, 0xfa, 0x2f, 0xce, + 0x55, 0x6d, 0x1e, 0x1e, 0x09, 0x17, 0x49, 0x46, 0x0e, 0xcb, 0x67, + 0xb4, 0x44, 0x83, 0x08, 0x98, 0x4b, 0xe5, 0xc9, 0xc4, 0x28 }; static const uint8_t chiptest_0fd26a42aa63_scalar_6[] = { 0x14, 0x96, 0x87, 0x7b, 0xed, 0x29, 0x11, 0xa8, 0x58, 0xf2, 0xd8, - 0x5f, 0x45, 0xcd, 0xff, 0x9c, 0xfd, 0xcf, 0x8e, 0xc4, 0x8e, 0xd2, - 0x86, 0xa1, 0xd1, 0xb2, 0x13, 0x52, 0x0f, 0x59, 0xdb, 0x68 }; + 0x5f, 0x45, 0xcd, 0xff, 0x9c, 0xfd, 0xcf, 0x8e, 0xc4, 0x8e, 0xd2, + 0x86, 0xa1, 0xd1, 0xb2, 0x13, 0x52, 0x0f, 0x59, 0xdb, 0x68 }; static const uint8_t chiptest_0fd26a42aa63_out_point_7[] = { 0x04, 0x09, 0x4f, 0x3f, 0xf6, 0xc4, 0x88, 0x74, 0x15, 0x87, 0x67, 0xf1, 0x0e, 0x8e, 0x51, 0x7c, 0x46, 0x79, 0x86, 0xe7, 0x17, 0x19, 0x1f, 0x06, 0xec, 0xa2, 0x66, 0x6d, 0x45, 0x3a, 0xb5, 0xf9, 0xce, @@ -82,14 +82,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_8 = { .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_9[] = { 0x04, 0xc5, 0xf5, 0x1e, 0x3c, 0x06, 0x56, 0x19, 0x9d, 0xae, 0xcf, - 0x7f, 0xad, 0x11, 0x1b, 0x77, 0xa0, 0xa5, 0xd2, 0xb4, 0x1a, 0x7e, - 0xea, 0xc6, 0xf3, 0x0e, 0x96, 0xb8, 0x2a, 0x90, 0xd7, 0x51, 0x73, - 0x9e, 0x9d, 0x1d, 0x75, 0xf3, 0xbb, 0xa2, 0xe9, 0xff, 0x53, 0x18, - 0xb1, 0x3c, 0xa8, 0x1d, 0xea, 0x52, 0x33, 0x59, 0x3f, 0x43, 0x65, - 0xea, 0x88, 0x9c, 0x2a, 0x02, 0xe3, 0x2e, 0xb7, 0x2a, 0xd8 }; + 0x7f, 0xad, 0x11, 0x1b, 0x77, 0xa0, 0xa5, 0xd2, 0xb4, 0x1a, 0x7e, + 0xea, 0xc6, 0xf3, 0x0e, 0x96, 0xb8, 0x2a, 0x90, 0xd7, 0x51, 0x73, + 0x9e, 0x9d, 0x1d, 0x75, 0xf3, 0xbb, 0xa2, 0xe9, 0xff, 0x53, 0x18, + 0xb1, 0x3c, 0xa8, 0x1d, 0xea, 0x52, 0x33, 0x59, 0x3f, 0x43, 0x65, + 0xea, 0x88, 0x9c, 0x2a, 0x02, 0xe3, 0x2e, 0xb7, 0x2a, 0xd8 }; static const uint8_t chiptest_0fd26a42aa63_scalar_10[] = { 0x24, 0x6c, 0xf5, 0xef, 0x60, 0xfa, 0x9f, 0x72, 0xef, 0xce, 0x30, - 0x8e, 0xaa, 0x04, 0x3e, 0x07, 0x69, 0x49, 0xff, 0xfc, 0x94, 0x0a, - 0xf5, 0xe3, 0xcd, 0x24, 0x66, 0x5e, 0x7b, 0x8d, 0x3a, 0x3b }; + 0x8e, 0xaa, 0x04, 0x3e, 0x07, 0x69, 0x49, 0xff, 0xfc, 0x94, 0x0a, + 0xf5, 0xe3, 0xcd, 0x24, 0x66, 0x5e, 0x7b, 0x8d, 0x3a, 0x3b }; static const uint8_t chiptest_0fd26a42aa63_out_point_11[] = { 0x04, 0x01, 0x1b, 0xb4, 0xf0, 0x69, 0xbf, 0x57, 0xee, 0x07, 0x48, 0xb9, 0x4a, 0x39, 0x2d, 0x15, 0xb7, 0x16, 0x99, 0xa4, 0xce, 0x15, 0x75, 0xcf, 0x7b, 0xd0, 0xd6, 0x63, 0xde, 0x06, 0xc0, 0x2d, 0x4e, @@ -105,14 +105,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_12 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_13[] = { 0x04, 0xb3, 0x54, 0xc6, 0x21, 0x42, 0xa2, 0xbb, 0xd8, 0x8e, 0x53, - 0xb1, 0x11, 0x62, 0x7b, 0x60, 0xcd, 0xff, 0xc5, 0xf1, 0x98, 0x61, - 0x26, 0x7b, 0x01, 0x8a, 0x64, 0x3b, 0x0b, 0x69, 0x77, 0x88, 0x90, - 0x50, 0x3b, 0x73, 0xef, 0x3a, 0xb8, 0x05, 0xb4, 0x48, 0x6b, 0xc5, - 0x28, 0xb9, 0xff, 0x37, 0xef, 0xc6, 0xa8, 0xc2, 0x77, 0x62, 0xbf, - 0x8d, 0x2c, 0x3d, 0x40, 0x83, 0x13, 0x01, 0xeb, 0x75, 0x65 }; + 0xb1, 0x11, 0x62, 0x7b, 0x60, 0xcd, 0xff, 0xc5, 0xf1, 0x98, 0x61, + 0x26, 0x7b, 0x01, 0x8a, 0x64, 0x3b, 0x0b, 0x69, 0x77, 0x88, 0x90, + 0x50, 0x3b, 0x73, 0xef, 0x3a, 0xb8, 0x05, 0xb4, 0x48, 0x6b, 0xc5, + 0x28, 0xb9, 0xff, 0x37, 0xef, 0xc6, 0xa8, 0xc2, 0x77, 0x62, 0xbf, + 0x8d, 0x2c, 0x3d, 0x40, 0x83, 0x13, 0x01, 0xeb, 0x75, 0x65 }; static const uint8_t chiptest_0fd26a42aa63_scalar_14[] = { 0x56, 0x14, 0xeb, 0xa3, 0xe4, 0x92, 0x02, 0x34, 0xd0, 0x07, 0x7d, - 0x79, 0x7c, 0xe7, 0xec, 0xec, 0x06, 0x7f, 0x11, 0x89, 0xb6, 0x38, - 0x0b, 0xbb, 0x1b, 0x70, 0xed, 0xed, 0xf2, 0x65, 0xd7, 0x03 }; + 0x79, 0x7c, 0xe7, 0xec, 0xec, 0x06, 0x7f, 0x11, 0x89, 0xb6, 0x38, + 0x0b, 0xbb, 0x1b, 0x70, 0xed, 0xed, 0xf2, 0x65, 0xd7, 0x03 }; static const uint8_t chiptest_0fd26a42aa63_out_point_15[] = { 0x04, 0xf6, 0x7a, 0x2f, 0x66, 0x9e, 0xa9, 0xb5, 0xbc, 0xf4, 0x42, 0x80, 0x9c, 0xc5, 0xf2, 0x08, 0xa4, 0xe2, 0x05, 0x64, 0xdd, 0x23, 0x8a, 0x3e, 0x60, 0xaa, 0x66, 0xd6, 0xe6, 0x4e, 0x11, 0x51, 0x32, @@ -128,14 +128,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_16 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_17[] = { 0x04, 0xf9, 0xf7, 0x75, 0xbb, 0xe4, 0x94, 0x87, 0xa4, 0x53, 0x0b, - 0xe8, 0xff, 0x52, 0xfd, 0x14, 0x6d, 0x06, 0xe8, 0x6a, 0xae, 0x7e, - 0xa4, 0x97, 0xf6, 0xfb, 0x71, 0x15, 0x16, 0x69, 0x68, 0x56, 0xab, - 0xce, 0xb1, 0xa6, 0x76, 0x54, 0xc3, 0xd0, 0xeb, 0x54, 0x04, 0x6c, - 0x87, 0x95, 0x92, 0xd3, 0x6d, 0xa2, 0x9a, 0xba, 0xbc, 0x9f, 0x2f, - 0x0d, 0xc0, 0xc7, 0xcc, 0x5f, 0xeb, 0x2b, 0x35, 0x24, 0x22 }; + 0xe8, 0xff, 0x52, 0xfd, 0x14, 0x6d, 0x06, 0xe8, 0x6a, 0xae, 0x7e, + 0xa4, 0x97, 0xf6, 0xfb, 0x71, 0x15, 0x16, 0x69, 0x68, 0x56, 0xab, + 0xce, 0xb1, 0xa6, 0x76, 0x54, 0xc3, 0xd0, 0xeb, 0x54, 0x04, 0x6c, + 0x87, 0x95, 0x92, 0xd3, 0x6d, 0xa2, 0x9a, 0xba, 0xbc, 0x9f, 0x2f, + 0x0d, 0xc0, 0xc7, 0xcc, 0x5f, 0xeb, 0x2b, 0x35, 0x24, 0x22 }; static const uint8_t chiptest_0fd26a42aa63_scalar_18[] = { 0x4c, 0xc3, 0xec, 0x10, 0x2d, 0x90, 0x9b, 0xdf, 0xf8, 0xb5, 0x1b, - 0xa3, 0x78, 0x77, 0x93, 0x90, 0xb9, 0xcf, 0x89, 0x4f, 0xcd, 0x00, - 0x3b, 0xe0, 0x12, 0x78, 0xe0, 0xb8, 0xd6, 0x75, 0x53, 0xe7 }; + 0xa3, 0x78, 0x77, 0x93, 0x90, 0xb9, 0xcf, 0x89, 0x4f, 0xcd, 0x00, + 0x3b, 0xe0, 0x12, 0x78, 0xe0, 0xb8, 0xd6, 0x75, 0x53, 0xe7 }; static const uint8_t chiptest_0fd26a42aa63_out_point_19[] = { 0x04, 0x91, 0xdb, 0xa2, 0x99, 0xe1, 0xbc, 0xb4, 0x6b, 0xfb, 0xde, 0x5b, 0x39, 0x86, 0xdf, 0x8c, 0xd6, 0x55, 0xbe, 0x57, 0x9e, 0xd6, 0xf8, 0x21, 0x8f, 0xcb, 0x62, 0x3a, 0x6b, 0x3c, 0x1f, 0xaf, 0xaa, @@ -151,14 +151,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_20 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_21[] = { 0x04, 0xf5, 0xb1, 0xbe, 0x11, 0xd3, 0xa8, 0x01, 0xac, 0xc6, 0xf3, - 0x53, 0xe1, 0xf9, 0x6e, 0xce, 0x70, 0xe2, 0x42, 0x0a, 0xa4, 0x1f, - 0xf4, 0x55, 0xc7, 0xff, 0xfc, 0xef, 0xa5, 0xb0, 0x96, 0x15, 0x2e, - 0x7f, 0x2f, 0x81, 0x44, 0xe1, 0xa0, 0xb6, 0xac, 0x03, 0xb3, 0x39, - 0x83, 0x5b, 0x94, 0xfd, 0x82, 0x52, 0x89, 0x93, 0xe3, 0xf7, 0x42, - 0xb0, 0xad, 0xe8, 0x6b, 0x95, 0xdf, 0xc5, 0x1c, 0x48, 0xc2 }; + 0x53, 0xe1, 0xf9, 0x6e, 0xce, 0x70, 0xe2, 0x42, 0x0a, 0xa4, 0x1f, + 0xf4, 0x55, 0xc7, 0xff, 0xfc, 0xef, 0xa5, 0xb0, 0x96, 0x15, 0x2e, + 0x7f, 0x2f, 0x81, 0x44, 0xe1, 0xa0, 0xb6, 0xac, 0x03, 0xb3, 0x39, + 0x83, 0x5b, 0x94, 0xfd, 0x82, 0x52, 0x89, 0x93, 0xe3, 0xf7, 0x42, + 0xb0, 0xad, 0xe8, 0x6b, 0x95, 0xdf, 0xc5, 0x1c, 0x48, 0xc2 }; static const uint8_t chiptest_0fd26a42aa63_scalar_22[] = { 0x14, 0x88, 0x89, 0x3b, 0x0d, 0x4e, 0xe0, 0x83, 0x58, 0xae, 0x99, - 0x20, 0x66, 0x92, 0x79, 0x5f, 0xb8, 0x05, 0x44, 0x77, 0xbc, 0x88, - 0xfa, 0x81, 0xae, 0xfe, 0xd2, 0x17, 0x91, 0xa9, 0xfe, 0xbf }; + 0x20, 0x66, 0x92, 0x79, 0x5f, 0xb8, 0x05, 0x44, 0x77, 0xbc, 0x88, + 0xfa, 0x81, 0xae, 0xfe, 0xd2, 0x17, 0x91, 0xa9, 0xfe, 0xbf }; static const uint8_t chiptest_0fd26a42aa63_out_point_23[] = { 0x04, 0x7a, 0x85, 0x1b, 0xcf, 0x5f, 0xc1, 0x1a, 0xa5, 0x93, 0x9d, 0xda, 0xd4, 0xc1, 0xa3, 0x9c, 0x94, 0xad, 0xe2, 0x0c, 0x0a, 0x96, 0x5c, 0xd8, 0xde, 0x5d, 0x15, 0xae, 0x8b, 0x2d, 0x28, 0xa4, 0xe8, @@ -174,14 +174,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_24 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_25[] = { 0x04, 0x7f, 0x34, 0x22, 0x9b, 0xbd, 0x59, 0xa1, 0xff, 0xf3, 0x37, - 0xd8, 0x5d, 0xe5, 0xf3, 0x57, 0xe9, 0xed, 0xdf, 0xf4, 0x81, 0xbe, - 0xfa, 0xd2, 0x65, 0x3e, 0xfd, 0x62, 0xac, 0x9c, 0x56, 0x22, 0x1b, - 0x14, 0xb7, 0x36, 0xf8, 0x9a, 0x0a, 0x53, 0x10, 0xc0, 0x7a, 0x3f, - 0x3a, 0xf0, 0xf0, 0x24, 0x2b, 0xef, 0xa5, 0x0c, 0xfa, 0xbe, 0xf4, - 0xc3, 0x21, 0x97, 0x35, 0xf5, 0x4c, 0xd3, 0x09, 0x31, 0x75 }; + 0xd8, 0x5d, 0xe5, 0xf3, 0x57, 0xe9, 0xed, 0xdf, 0xf4, 0x81, 0xbe, + 0xfa, 0xd2, 0x65, 0x3e, 0xfd, 0x62, 0xac, 0x9c, 0x56, 0x22, 0x1b, + 0x14, 0xb7, 0x36, 0xf8, 0x9a, 0x0a, 0x53, 0x10, 0xc0, 0x7a, 0x3f, + 0x3a, 0xf0, 0xf0, 0x24, 0x2b, 0xef, 0xa5, 0x0c, 0xfa, 0xbe, 0xf4, + 0xc3, 0x21, 0x97, 0x35, 0xf5, 0x4c, 0xd3, 0x09, 0x31, 0x75 }; static const uint8_t chiptest_0fd26a42aa63_scalar_26[] = { 0x73, 0x8b, 0xe1, 0x07, 0xb1, 0x92, 0xba, 0x31, 0x15, 0x4e, 0xde, - 0x86, 0xe9, 0xa3, 0x4c, 0x03, 0xb1, 0x86, 0x21, 0x1c, 0xaa, 0x6b, - 0xfc, 0xcd, 0x7c, 0xc0, 0xc9, 0x1d, 0xf4, 0xb6, 0x07, 0x97 }; + 0x86, 0xe9, 0xa3, 0x4c, 0x03, 0xb1, 0x86, 0x21, 0x1c, 0xaa, 0x6b, + 0xfc, 0xcd, 0x7c, 0xc0, 0xc9, 0x1d, 0xf4, 0xb6, 0x07, 0x97 }; static const uint8_t chiptest_0fd26a42aa63_out_point_27[] = { 0x04, 0x01, 0x46, 0xd9, 0x17, 0xe7, 0xdd, 0x36, 0x4e, 0xc3, 0x2a, 0x77, 0xa9, 0x38, 0xa2, 0xd7, 0xcc, 0xda, 0x2a, 0x3d, 0xba, 0x33, 0xd0, 0x85, 0x28, 0xc7, 0x9f, 0x39, 0xb7, 0xbc, 0xaf, 0x4c, 0x1f, @@ -197,14 +197,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_28 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_29[] = { 0x04, 0xd6, 0x55, 0x49, 0x55, 0xcd, 0x8c, 0x16, 0xc6, 0x67, 0xb2, - 0x44, 0xb0, 0xc0, 0x81, 0xb0, 0x98, 0x38, 0xc4, 0x39, 0x47, 0x9f, - 0x7e, 0x37, 0x55, 0x32, 0x5d, 0x81, 0x47, 0x0a, 0xdd, 0x89, 0x1b, - 0x0d, 0x78, 0x69, 0x7d, 0xc2, 0xb7, 0xa7, 0x90, 0x96, 0xf2, 0x14, - 0xbe, 0x6d, 0x51, 0x3f, 0xab, 0xc8, 0x7b, 0x90, 0x10, 0xe0, 0x4d, - 0x59, 0xf3, 0xb7, 0x44, 0x89, 0x0b, 0x46, 0x8a, 0x73, 0x0d }; + 0x44, 0xb0, 0xc0, 0x81, 0xb0, 0x98, 0x38, 0xc4, 0x39, 0x47, 0x9f, + 0x7e, 0x37, 0x55, 0x32, 0x5d, 0x81, 0x47, 0x0a, 0xdd, 0x89, 0x1b, + 0x0d, 0x78, 0x69, 0x7d, 0xc2, 0xb7, 0xa7, 0x90, 0x96, 0xf2, 0x14, + 0xbe, 0x6d, 0x51, 0x3f, 0xab, 0xc8, 0x7b, 0x90, 0x10, 0xe0, 0x4d, + 0x59, 0xf3, 0xb7, 0x44, 0x89, 0x0b, 0x46, 0x8a, 0x73, 0x0d }; static const uint8_t chiptest_0fd26a42aa63_scalar_30[] = { 0x18, 0xe4, 0x86, 0x61, 0xb8, 0x9c, 0x90, 0x5d, 0x79, 0x82, 0x63, - 0x49, 0xfe, 0x40, 0xca, 0xff, 0xda, 0x53, 0xcd, 0x24, 0xee, 0x6f, - 0xa2, 0xbe, 0x9a, 0xb6, 0x73, 0xd3, 0x74, 0x63, 0xb4, 0xf1 }; + 0x49, 0xfe, 0x40, 0xca, 0xff, 0xda, 0x53, 0xcd, 0x24, 0xee, 0x6f, + 0xa2, 0xbe, 0x9a, 0xb6, 0x73, 0xd3, 0x74, 0x63, 0xb4, 0xf1 }; static const uint8_t chiptest_0fd26a42aa63_out_point_31[] = { 0x04, 0xa3, 0xd5, 0x6e, 0xa9, 0x72, 0x53, 0xae, 0x05, 0x8a, 0xb5, 0xa2, 0xac, 0x86, 0x36, 0x80, 0x53, 0xd8, 0x93, 0xca, 0xfe, 0xec, 0x14, 0x76, 0x8a, 0x97, 0x34, 0x1a, 0xe2, 0x82, 0xc6, 0x20, 0x78, @@ -220,14 +220,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_32 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_33[] = { 0x04, 0x0d, 0x49, 0xad, 0x9f, 0xb0, 0x45, 0x7b, 0x61, 0x85, 0x41, - 0x32, 0x19, 0xc0, 0x51, 0x4d, 0x90, 0x23, 0x78, 0x71, 0x23, 0xde, - 0x56, 0x22, 0x2b, 0xc2, 0x02, 0xa1, 0x72, 0x5c, 0x74, 0x51, 0x08, - 0x5c, 0x51, 0x99, 0x93, 0x60, 0x83, 0x9a, 0x4c, 0x05, 0x66, 0x1f, - 0x6f, 0x04, 0x50, 0xd3, 0x27, 0x92, 0x44, 0x08, 0x3d, 0x8d, 0x8d, - 0xee, 0xd7, 0x29, 0x1b, 0xb5, 0x82, 0xd1, 0x37, 0x9f, 0xb6 }; + 0x32, 0x19, 0xc0, 0x51, 0x4d, 0x90, 0x23, 0x78, 0x71, 0x23, 0xde, + 0x56, 0x22, 0x2b, 0xc2, 0x02, 0xa1, 0x72, 0x5c, 0x74, 0x51, 0x08, + 0x5c, 0x51, 0x99, 0x93, 0x60, 0x83, 0x9a, 0x4c, 0x05, 0x66, 0x1f, + 0x6f, 0x04, 0x50, 0xd3, 0x27, 0x92, 0x44, 0x08, 0x3d, 0x8d, 0x8d, + 0xee, 0xd7, 0x29, 0x1b, 0xb5, 0x82, 0xd1, 0x37, 0x9f, 0xb6 }; static const uint8_t chiptest_0fd26a42aa63_scalar_34[] = { 0x1b, 0x86, 0x6d, 0x87, 0x31, 0x79, 0x68, 0x37, 0x4e, 0xa1, 0xb2, - 0xa4, 0x61, 0x36, 0x71, 0x24, 0x2a, 0xc7, 0x0d, 0x2a, 0x36, 0x79, - 0x46, 0x4e, 0x42, 0x89, 0x9b, 0x89, 0x76, 0xc2, 0x90, 0xa3 }; + 0xa4, 0x61, 0x36, 0x71, 0x24, 0x2a, 0xc7, 0x0d, 0x2a, 0x36, 0x79, + 0x46, 0x4e, 0x42, 0x89, 0x9b, 0x89, 0x76, 0xc2, 0x90, 0xa3 }; static const uint8_t chiptest_0fd26a42aa63_out_point_35[] = { 0x04, 0xc0, 0xd3, 0x40, 0x8f, 0x67, 0x35, 0xab, 0x47, 0xb5, 0x82, 0x3c, 0xb7, 0x08, 0x92, 0x7a, 0xe2, 0xb3, 0x46, 0x6d, 0x4e, 0x77, 0xca, 0xee, 0xb8, 0x62, 0x79, 0x2e, 0xc4, 0xa1, 0xc2, 0x99, 0xcb, @@ -243,14 +243,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_36 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_37[] = { 0x04, 0x38, 0x44, 0x33, 0x8d, 0x85, 0x5a, 0xe4, 0x6c, 0xfc, 0xc8, - 0x0f, 0x07, 0xc9, 0x26, 0xb5, 0xd6, 0x42, 0x72, 0x38, 0x8e, 0xcb, - 0x4c, 0xee, 0x2f, 0x43, 0xe9, 0x83, 0x74, 0xdc, 0xdb, 0x8a, 0x4d, - 0x9b, 0xbc, 0xd2, 0x8e, 0xeb, 0x3a, 0xea, 0x62, 0x09, 0x4c, 0x9d, - 0x98, 0xcc, 0xab, 0x78, 0xfc, 0xa8, 0xa1, 0x7b, 0x35, 0xf4, 0x7a, - 0x63, 0x7c, 0x9f, 0x3e, 0xd3, 0x19, 0xb3, 0x15, 0x3b, 0x87 }; + 0x0f, 0x07, 0xc9, 0x26, 0xb5, 0xd6, 0x42, 0x72, 0x38, 0x8e, 0xcb, + 0x4c, 0xee, 0x2f, 0x43, 0xe9, 0x83, 0x74, 0xdc, 0xdb, 0x8a, 0x4d, + 0x9b, 0xbc, 0xd2, 0x8e, 0xeb, 0x3a, 0xea, 0x62, 0x09, 0x4c, 0x9d, + 0x98, 0xcc, 0xab, 0x78, 0xfc, 0xa8, 0xa1, 0x7b, 0x35, 0xf4, 0x7a, + 0x63, 0x7c, 0x9f, 0x3e, 0xd3, 0x19, 0xb3, 0x15, 0x3b, 0x87 }; static const uint8_t chiptest_0fd26a42aa63_scalar_38[] = { 0xd0, 0x41, 0x88, 0x24, 0xfe, 0x36, 0x62, 0x81, 0xd7, 0xaa, 0xde, - 0xfb, 0x34, 0x41, 0x98, 0x7f, 0x13, 0x2f, 0x8b, 0x15, 0x94, 0xbc, - 0x11, 0xc3, 0x41, 0xff, 0xa0, 0xd6, 0x31, 0x7f, 0x22, 0x23 }; + 0xfb, 0x34, 0x41, 0x98, 0x7f, 0x13, 0x2f, 0x8b, 0x15, 0x94, 0xbc, + 0x11, 0xc3, 0x41, 0xff, 0xa0, 0xd6, 0x31, 0x7f, 0x22, 0x23 }; static const uint8_t chiptest_0fd26a42aa63_out_point_39[] = { 0x04, 0x9e, 0xee, 0x22, 0xab, 0x31, 0x46, 0x78, 0xaf, 0xeb, 0xb6, 0x70, 0x10, 0xdd, 0x02, 0x12, 0x75, 0x4a, 0x86, 0xad, 0x3f, 0x32, 0xe9, 0xb0, 0xd1, 0x2f, 0x65, 0x25, 0x0e, 0x75, 0xbd, 0x51, 0x20, @@ -266,14 +266,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_40 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_41[] = { 0x04, 0x47, 0x90, 0x7a, 0xea, 0xc9, 0x01, 0xd6, 0x9f, 0xc3, 0xeb, - 0x67, 0x03, 0x4f, 0x1a, 0x79, 0x13, 0xde, 0x15, 0x69, 0x24, 0x04, - 0x9c, 0x4d, 0x9b, 0x78, 0x58, 0x9d, 0x31, 0x88, 0xbb, 0x90, 0x43, - 0x28, 0x4c, 0x35, 0x58, 0xa6, 0x46, 0xf1, 0x4d, 0xb0, 0x6b, 0xc4, - 0xf2, 0x43, 0x93, 0x8d, 0xfc, 0x74, 0x12, 0xaa, 0x53, 0x39, 0x75, - 0x97, 0xee, 0x9e, 0xe8, 0xe4, 0x45, 0x20, 0x68, 0x7c, 0x2f }; + 0x67, 0x03, 0x4f, 0x1a, 0x79, 0x13, 0xde, 0x15, 0x69, 0x24, 0x04, + 0x9c, 0x4d, 0x9b, 0x78, 0x58, 0x9d, 0x31, 0x88, 0xbb, 0x90, 0x43, + 0x28, 0x4c, 0x35, 0x58, 0xa6, 0x46, 0xf1, 0x4d, 0xb0, 0x6b, 0xc4, + 0xf2, 0x43, 0x93, 0x8d, 0xfc, 0x74, 0x12, 0xaa, 0x53, 0x39, 0x75, + 0x97, 0xee, 0x9e, 0xe8, 0xe4, 0x45, 0x20, 0x68, 0x7c, 0x2f }; static const uint8_t chiptest_0fd26a42aa63_scalar_42[] = { 0x86, 0xb9, 0xb0, 0xfd, 0x6b, 0x95, 0x63, 0xed, 0x69, 0xf8, 0x64, - 0x7e, 0x42, 0xa1, 0xf5, 0x32, 0x67, 0x1c, 0x84, 0xbd, 0x19, 0x05, - 0xa9, 0xa2, 0x57, 0x88, 0xa1, 0x6e, 0x56, 0x5a, 0xf6, 0xe1 }; + 0x7e, 0x42, 0xa1, 0xf5, 0x32, 0x67, 0x1c, 0x84, 0xbd, 0x19, 0x05, + 0xa9, 0xa2, 0x57, 0x88, 0xa1, 0x6e, 0x56, 0x5a, 0xf6, 0xe1 }; static const uint8_t chiptest_0fd26a42aa63_out_point_43[] = { 0x04, 0x17, 0x34, 0x86, 0xf5, 0xc9, 0x20, 0xbf, 0x0f, 0x3e, 0x99, 0x6e, 0x65, 0xd4, 0xe4, 0xf3, 0xbe, 0x6e, 0xf2, 0x5a, 0x72, 0x27, 0xff, 0xfd, 0x09, 0xf8, 0x0b, 0x11, 0x04, 0xad, 0x35, 0x7a, 0x1c, @@ -289,14 +289,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_44 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_45[] = { 0x04, 0x5b, 0x87, 0x49, 0x93, 0x82, 0x19, 0x18, 0x75, 0xc7, 0x98, - 0x29, 0x78, 0x75, 0x4c, 0x96, 0x2e, 0xf7, 0xbe, 0x02, 0x16, 0x70, - 0xfc, 0xd2, 0xf0, 0x19, 0x2f, 0xd0, 0x5b, 0xc7, 0xe5, 0xde, 0xbc, - 0x94, 0xbb, 0x48, 0x68, 0x4b, 0x22, 0xe5, 0xc9, 0xec, 0x75, 0xef, - 0xa5, 0x2d, 0xab, 0x72, 0xfd, 0xbe, 0xb9, 0x6e, 0xb2, 0xe4, 0x18, - 0xf8, 0x41, 0x94, 0xb1, 0x28, 0x0c, 0x00, 0xcc, 0x82, 0x40 }; + 0x29, 0x78, 0x75, 0x4c, 0x96, 0x2e, 0xf7, 0xbe, 0x02, 0x16, 0x70, + 0xfc, 0xd2, 0xf0, 0x19, 0x2f, 0xd0, 0x5b, 0xc7, 0xe5, 0xde, 0xbc, + 0x94, 0xbb, 0x48, 0x68, 0x4b, 0x22, 0xe5, 0xc9, 0xec, 0x75, 0xef, + 0xa5, 0x2d, 0xab, 0x72, 0xfd, 0xbe, 0xb9, 0x6e, 0xb2, 0xe4, 0x18, + 0xf8, 0x41, 0x94, 0xb1, 0x28, 0x0c, 0x00, 0xcc, 0x82, 0x40 }; static const uint8_t chiptest_0fd26a42aa63_scalar_46[] = { 0xf3, 0x6b, 0x85, 0x87, 0xbb, 0xc1, 0xab, 0x8d, 0x8a, 0xee, 0x77, - 0xdf, 0xac, 0x70, 0x49, 0xf5, 0xf8, 0xaa, 0x9d, 0x8c, 0x65, 0x2a, - 0x08, 0x4c, 0xab, 0x74, 0x6e, 0xdd, 0xfe, 0x9b, 0x02, 0x99 }; + 0xdf, 0xac, 0x70, 0x49, 0xf5, 0xf8, 0xaa, 0x9d, 0x8c, 0x65, 0x2a, + 0x08, 0x4c, 0xab, 0x74, 0x6e, 0xdd, 0xfe, 0x9b, 0x02, 0x99 }; static const uint8_t chiptest_0fd26a42aa63_out_point_47[] = { 0x04, 0xa4, 0x46, 0x6f, 0x1e, 0xf7, 0x91, 0xe4, 0x6e, 0xb4, 0xd0, 0xd6, 0xb5, 0xec, 0x55, 0x11, 0x4b, 0xe3, 0xa0, 0x45, 0x18, 0x0d, 0x90, 0xe5, 0xc7, 0x6e, 0x81, 0xa2, 0xd7, 0xe1, 0x6a, 0x5c, 0xb9, @@ -312,14 +312,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_48 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_49[] = { 0x04, 0x25, 0xe9, 0xbf, 0x00, 0x4b, 0x69, 0x97, 0x29, 0xf7, 0x08, - 0x4d, 0x3a, 0x78, 0x31, 0x7c, 0x2c, 0x79, 0x0e, 0x67, 0x13, 0x55, - 0x9c, 0xd3, 0x5f, 0xeb, 0xa0, 0xd1, 0x43, 0x8b, 0x81, 0x83, 0x76, - 0xa5, 0x92, 0x38, 0x0c, 0xff, 0xd4, 0x05, 0x10, 0xd2, 0xe0, 0xfc, - 0x9f, 0xc4, 0xc6, 0x4a, 0x41, 0x03, 0x83, 0xeb, 0x41, 0x25, 0x63, - 0xa1, 0x7d, 0x47, 0xf4, 0x13, 0xab, 0x1c, 0x7b, 0x46, 0x78 }; + 0x4d, 0x3a, 0x78, 0x31, 0x7c, 0x2c, 0x79, 0x0e, 0x67, 0x13, 0x55, + 0x9c, 0xd3, 0x5f, 0xeb, 0xa0, 0xd1, 0x43, 0x8b, 0x81, 0x83, 0x76, + 0xa5, 0x92, 0x38, 0x0c, 0xff, 0xd4, 0x05, 0x10, 0xd2, 0xe0, 0xfc, + 0x9f, 0xc4, 0xc6, 0x4a, 0x41, 0x03, 0x83, 0xeb, 0x41, 0x25, 0x63, + 0xa1, 0x7d, 0x47, 0xf4, 0x13, 0xab, 0x1c, 0x7b, 0x46, 0x78 }; static const uint8_t chiptest_0fd26a42aa63_scalar_50[] = { 0xd1, 0x02, 0x6d, 0x19, 0x7f, 0x73, 0x70, 0x3b, 0x16, 0x74, 0x15, - 0xe1, 0x99, 0x96, 0x31, 0xc0, 0x51, 0x87, 0x22, 0xd0, 0x7c, 0x35, - 0x6b, 0xd5, 0x84, 0x4e, 0x5e, 0x56, 0xa9, 0xb9, 0xb4, 0xdb }; + 0xe1, 0x99, 0x96, 0x31, 0xc0, 0x51, 0x87, 0x22, 0xd0, 0x7c, 0x35, + 0x6b, 0xd5, 0x84, 0x4e, 0x5e, 0x56, 0xa9, 0xb9, 0xb4, 0xdb }; static const uint8_t chiptest_0fd26a42aa63_out_point_51[] = { 0x04, 0x4d, 0x12, 0x56, 0x20, 0x34, 0x90, 0xc2, 0x7e, 0xb7, 0x9f, 0xfe, 0xf7, 0x22, 0x8f, 0x77, 0xa4, 0xe9, 0xa2, 0x7f, 0x87, 0x9a, 0xe5, 0x45, 0x40, 0xe9, 0x24, 0x90, 0x72, 0xcf, 0x8a, 0x02, 0xae, @@ -335,14 +335,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_52 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_53[] = { 0x04, 0xbf, 0xee, 0x0a, 0x98, 0x12, 0x05, 0xf4, 0xb2, 0x2d, 0xa6, - 0x16, 0x66, 0x63, 0x3d, 0x32, 0x45, 0x2a, 0x5e, 0xa9, 0x0a, 0x1f, - 0x0f, 0x77, 0x55, 0x4d, 0x15, 0xd7, 0x25, 0x34, 0x70, 0x34, 0x16, - 0xae, 0x2f, 0x1f, 0xd3, 0x42, 0x3a, 0x0a, 0xb4, 0x25, 0xd4, 0x2b, - 0xbb, 0xf4, 0x4f, 0xaa, 0xe6, 0x85, 0x72, 0x3d, 0x07, 0xa1, 0xd1, - 0xfb, 0x95, 0x17, 0xd4, 0xd4, 0xd0, 0x52, 0xa3, 0xb4, 0x73 }; + 0x16, 0x66, 0x63, 0x3d, 0x32, 0x45, 0x2a, 0x5e, 0xa9, 0x0a, 0x1f, + 0x0f, 0x77, 0x55, 0x4d, 0x15, 0xd7, 0x25, 0x34, 0x70, 0x34, 0x16, + 0xae, 0x2f, 0x1f, 0xd3, 0x42, 0x3a, 0x0a, 0xb4, 0x25, 0xd4, 0x2b, + 0xbb, 0xf4, 0x4f, 0xaa, 0xe6, 0x85, 0x72, 0x3d, 0x07, 0xa1, 0xd1, + 0xfb, 0x95, 0x17, 0xd4, 0xd4, 0xd0, 0x52, 0xa3, 0xb4, 0x73 }; static const uint8_t chiptest_0fd26a42aa63_scalar_54[] = { 0x14, 0x75, 0x36, 0xe4, 0x65, 0xa7, 0xcf, 0x82, 0x9d, 0x42, 0xe3, - 0xba, 0x15, 0x1f, 0xce, 0x6e, 0x0e, 0xd1, 0xcc, 0xfb, 0x34, 0x84, - 0x8c, 0x54, 0x72, 0x6f, 0xfd, 0x9b, 0xa7, 0xed, 0x64, 0x8e }; + 0xba, 0x15, 0x1f, 0xce, 0x6e, 0x0e, 0xd1, 0xcc, 0xfb, 0x34, 0x84, + 0x8c, 0x54, 0x72, 0x6f, 0xfd, 0x9b, 0xa7, 0xed, 0x64, 0x8e }; static const uint8_t chiptest_0fd26a42aa63_out_point_55[] = { 0x04, 0x33, 0x27, 0x79, 0xda, 0x78, 0xff, 0x41, 0x68, 0xc0, 0x36, 0x55, 0xcd, 0x8a, 0xff, 0x9d, 0x95, 0x43, 0xe6, 0xd4, 0xbe, 0x3a, 0x53, 0x28, 0x23, 0x4f, 0x3f, 0x47, 0x5d, 0x16, 0x44, 0x3e, 0xc8, @@ -358,14 +358,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_56 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_57[] = { 0x04, 0xfc, 0x03, 0x05, 0xd4, 0x05, 0x52, 0xd0, 0x0f, 0x5d, 0xb9, - 0xcd, 0x43, 0xa5, 0x1c, 0x54, 0xf7, 0x9a, 0x98, 0x98, 0x9a, 0xac, - 0x15, 0x77, 0x02, 0x8c, 0xcd, 0x9e, 0x92, 0x99, 0xca, 0x76, 0x53, - 0x53, 0x54, 0x46, 0x57, 0x27, 0x56, 0x0a, 0x31, 0xe0, 0xc3, 0x4f, - 0xdd, 0x3c, 0xf2, 0xae, 0xe7, 0x5d, 0x9d, 0x74, 0x5d, 0xbc, 0x01, - 0x47, 0x62, 0x1d, 0x99, 0x60, 0x53, 0x5c, 0x45, 0x97, 0x8f }; + 0xcd, 0x43, 0xa5, 0x1c, 0x54, 0xf7, 0x9a, 0x98, 0x98, 0x9a, 0xac, + 0x15, 0x77, 0x02, 0x8c, 0xcd, 0x9e, 0x92, 0x99, 0xca, 0x76, 0x53, + 0x53, 0x54, 0x46, 0x57, 0x27, 0x56, 0x0a, 0x31, 0xe0, 0xc3, 0x4f, + 0xdd, 0x3c, 0xf2, 0xae, 0xe7, 0x5d, 0x9d, 0x74, 0x5d, 0xbc, 0x01, + 0x47, 0x62, 0x1d, 0x99, 0x60, 0x53, 0x5c, 0x45, 0x97, 0x8f }; static const uint8_t chiptest_0fd26a42aa63_scalar_58[] = { 0x1d, 0x10, 0xa9, 0xc9, 0x0f, 0x54, 0x6b, 0xab, 0x00, 0xea, 0xc5, - 0xe1, 0xf0, 0xcd, 0xc5, 0xbc, 0x60, 0xe0, 0x9e, 0x1b, 0xfc, 0x15, - 0x91, 0xd0, 0x8d, 0x80, 0x8c, 0xeb, 0x0a, 0x21, 0x21, 0xef }; + 0xe1, 0xf0, 0xcd, 0xc5, 0xbc, 0x60, 0xe0, 0x9e, 0x1b, 0xfc, 0x15, + 0x91, 0xd0, 0x8d, 0x80, 0x8c, 0xeb, 0x0a, 0x21, 0x21, 0xef }; static const uint8_t chiptest_0fd26a42aa63_out_point_59[] = { 0x04, 0xec, 0xf6, 0xb5, 0xb2, 0x36, 0x33, 0x86, 0x94, 0x43, 0x21, 0x86, 0xdd, 0x68, 0xa0, 0xe8, 0xf7, 0xbf, 0xeb, 0x19, 0x0c, 0x4a, 0x1d, 0x3b, 0xdd, 0xe9, 0x5f, 0x3d, 0x3a, 0xd0, 0xed, 0x45, 0x44, @@ -381,14 +381,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_60 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_61[] = { 0x04, 0x4a, 0x7d, 0xcd, 0xcf, 0xe2, 0x5b, 0x5f, 0x03, 0xca, 0x29, - 0x01, 0xdc, 0x3c, 0xad, 0xb8, 0x2e, 0xe0, 0x5a, 0xda, 0x6e, 0x31, - 0xa9, 0x58, 0x97, 0x78, 0x65, 0xc0, 0x22, 0x36, 0xda, 0x9a, 0xe5, - 0xda, 0x56, 0x42, 0x00, 0xd0, 0x1b, 0x5d, 0x11, 0xd2, 0xc6, 0x7b, - 0x59, 0x8a, 0xeb, 0xf3, 0x6c, 0xc4, 0x81, 0x12, 0x77, 0xe8, 0x62, - 0x49, 0x95, 0x14, 0xce, 0xe3, 0x95, 0x21, 0xb2, 0x37, 0xf6 }; + 0x01, 0xdc, 0x3c, 0xad, 0xb8, 0x2e, 0xe0, 0x5a, 0xda, 0x6e, 0x31, + 0xa9, 0x58, 0x97, 0x78, 0x65, 0xc0, 0x22, 0x36, 0xda, 0x9a, 0xe5, + 0xda, 0x56, 0x42, 0x00, 0xd0, 0x1b, 0x5d, 0x11, 0xd2, 0xc6, 0x7b, + 0x59, 0x8a, 0xeb, 0xf3, 0x6c, 0xc4, 0x81, 0x12, 0x77, 0xe8, 0x62, + 0x49, 0x95, 0x14, 0xce, 0xe3, 0x95, 0x21, 0xb2, 0x37, 0xf6 }; static const uint8_t chiptest_0fd26a42aa63_scalar_62[] = { 0x0c, 0xb6, 0x5f, 0xfd, 0x13, 0xf6, 0x43, 0xf9, 0xe0, 0xc1, 0xd0, - 0xf4, 0x1d, 0xbc, 0x61, 0x11, 0x12, 0x89, 0xac, 0xe0, 0xd1, 0x92, - 0xfc, 0x7e, 0x0d, 0xa4, 0x0b, 0x25, 0xc1, 0xa8, 0xa8, 0xf0 }; + 0xf4, 0x1d, 0xbc, 0x61, 0x11, 0x12, 0x89, 0xac, 0xe0, 0xd1, 0x92, + 0xfc, 0x7e, 0x0d, 0xa4, 0x0b, 0x25, 0xc1, 0xa8, 0xa8, 0xf0 }; static const uint8_t chiptest_0fd26a42aa63_out_point_63[] = { 0x04, 0xfe, 0x72, 0xdb, 0xe8, 0xac, 0x31, 0x9b, 0xfd, 0xfd, 0x08, 0xbc, 0x97, 0xd3, 0x8c, 0x7d, 0xd5, 0x67, 0xf7, 0x41, 0xe4, 0x49, 0x8f, 0x09, 0xc4, 0xc1, 0x55, 0x8a, 0xdc, 0xe1, 0x95, 0x91, 0x43, @@ -404,14 +404,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_64 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_65[] = { 0x04, 0x6f, 0x8e, 0x8b, 0x9b, 0x50, 0x49, 0x2c, 0xcc, 0x34, 0xd8, - 0x24, 0x19, 0x9e, 0x1d, 0x68, 0x54, 0x0e, 0xb2, 0x7e, 0x98, 0xc3, - 0xfd, 0x9f, 0xf0, 0x9a, 0xbb, 0xa2, 0xc4, 0xe0, 0x8b, 0x3f, 0x06, - 0xd7, 0x93, 0xc4, 0x4d, 0x3e, 0xf6, 0x22, 0xbb, 0x2a, 0x57, 0x17, - 0x69, 0xeb, 0x20, 0x4c, 0xae, 0x46, 0xcd, 0x15, 0x12, 0xf1, 0x55, - 0x01, 0x4a, 0x70, 0x7e, 0xf2, 0x30, 0x43, 0x7c, 0x5e, 0x18 }; + 0x24, 0x19, 0x9e, 0x1d, 0x68, 0x54, 0x0e, 0xb2, 0x7e, 0x98, 0xc3, + 0xfd, 0x9f, 0xf0, 0x9a, 0xbb, 0xa2, 0xc4, 0xe0, 0x8b, 0x3f, 0x06, + 0xd7, 0x93, 0xc4, 0x4d, 0x3e, 0xf6, 0x22, 0xbb, 0x2a, 0x57, 0x17, + 0x69, 0xeb, 0x20, 0x4c, 0xae, 0x46, 0xcd, 0x15, 0x12, 0xf1, 0x55, + 0x01, 0x4a, 0x70, 0x7e, 0xf2, 0x30, 0x43, 0x7c, 0x5e, 0x18 }; static const uint8_t chiptest_0fd26a42aa63_scalar_66[] = { 0x7c, 0xe6, 0xe2, 0x6a, 0x2a, 0x0e, 0x0c, 0x5b, 0x9e, 0x19, 0x59, - 0x55, 0x1e, 0x73, 0x7f, 0x38, 0xf6, 0x10, 0xdd, 0x79, 0xd2, 0x75, - 0xcd, 0xf5, 0x6d, 0x3d, 0x7e, 0xd4, 0x65, 0x4c, 0x74, 0xbb }; + 0x55, 0x1e, 0x73, 0x7f, 0x38, 0xf6, 0x10, 0xdd, 0x79, 0xd2, 0x75, + 0xcd, 0xf5, 0x6d, 0x3d, 0x7e, 0xd4, 0x65, 0x4c, 0x74, 0xbb }; static const uint8_t chiptest_0fd26a42aa63_out_point_67[] = { 0x04, 0xcd, 0x05, 0x21, 0xb5, 0xc9, 0x8b, 0x52, 0x8a, 0xb6, 0x87, 0x35, 0x5a, 0x21, 0xa4, 0xe9, 0x5b, 0xa0, 0x17, 0xf9, 0x6b, 0x46, 0x77, 0x8d, 0x6f, 0x89, 0xaf, 0xb7, 0xa4, 0x8f, 0x9f, 0xf6, 0x37, @@ -427,14 +427,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_68 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_69[] = { 0x04, 0xef, 0xaa, 0xe4, 0x27, 0xe3, 0x17, 0xc7, 0xc3, 0x2b, 0x8a, - 0xdc, 0x31, 0x5e, 0xdc, 0x7c, 0xa1, 0xa5, 0x79, 0x8b, 0xef, 0x0d, - 0xf9, 0x28, 0xdb, 0x3a, 0x02, 0xcf, 0x45, 0x75, 0x48, 0x4a, 0xd9, - 0x4c, 0xf3, 0xee, 0x79, 0x38, 0x72, 0xfb, 0x6a, 0xfd, 0xe8, 0x80, - 0x73, 0x24, 0xa5, 0x19, 0x92, 0x7b, 0x6e, 0xe5, 0x9c, 0xcc, 0x4c, - 0xd3, 0x5a, 0x4b, 0x41, 0x80, 0x52, 0xcf, 0xb7, 0x64, 0x32 }; + 0xdc, 0x31, 0x5e, 0xdc, 0x7c, 0xa1, 0xa5, 0x79, 0x8b, 0xef, 0x0d, + 0xf9, 0x28, 0xdb, 0x3a, 0x02, 0xcf, 0x45, 0x75, 0x48, 0x4a, 0xd9, + 0x4c, 0xf3, 0xee, 0x79, 0x38, 0x72, 0xfb, 0x6a, 0xfd, 0xe8, 0x80, + 0x73, 0x24, 0xa5, 0x19, 0x92, 0x7b, 0x6e, 0xe5, 0x9c, 0xcc, 0x4c, + 0xd3, 0x5a, 0x4b, 0x41, 0x80, 0x52, 0xcf, 0xb7, 0x64, 0x32 }; static const uint8_t chiptest_0fd26a42aa63_scalar_70[] = { 0xae, 0x96, 0x62, 0x8a, 0xae, 0xe5, 0xb5, 0x46, 0x95, 0xae, 0xcf, - 0xa0, 0x79, 0x1b, 0xf9, 0x36, 0x0d, 0xd5, 0xbc, 0x34, 0x01, 0x78, - 0xe8, 0x14, 0x6a, 0xe0, 0xce, 0xde, 0xe6, 0x5b, 0x31, 0xa0 }; + 0xa0, 0x79, 0x1b, 0xf9, 0x36, 0x0d, 0xd5, 0xbc, 0x34, 0x01, 0x78, + 0xe8, 0x14, 0x6a, 0xe0, 0xce, 0xde, 0xe6, 0x5b, 0x31, 0xa0 }; static const uint8_t chiptest_0fd26a42aa63_out_point_71[] = { 0x04, 0x2c, 0x31, 0x70, 0x0b, 0x5b, 0x71, 0x20, 0x4c, 0xcc, 0x73, 0xe6, 0x14, 0xb7, 0x6f, 0xef, 0x7c, 0xc7, 0x12, 0x88, 0xcc, 0x50, 0x36, 0x1f, 0xb6, 0x47, 0xca, 0x97, 0xc9, 0x37, 0x20, 0x5e, 0x11, @@ -450,14 +450,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_72 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_73[] = { 0x04, 0x52, 0x90, 0x95, 0x7e, 0x15, 0x3d, 0x11, 0x56, 0x9b, 0x92, - 0xb8, 0x8c, 0x96, 0x32, 0x37, 0x66, 0xc7, 0x2e, 0x63, 0x88, 0x88, - 0x1e, 0x1f, 0x6e, 0x98, 0x2d, 0x9b, 0x1c, 0xa0, 0x1e, 0x6b, 0x4c, - 0xdc, 0x4f, 0xe6, 0xf2, 0x6e, 0x9c, 0x26, 0xfd, 0x5f, 0x5e, 0x3f, - 0x7f, 0xc1, 0xc1, 0xc0, 0x07, 0xb2, 0x24, 0xb1, 0xb3, 0xe3, 0x24, - 0x4c, 0xfc, 0x8c, 0x5b, 0x65, 0xa6, 0x7a, 0xbd, 0x1e, 0x37 }; + 0xb8, 0x8c, 0x96, 0x32, 0x37, 0x66, 0xc7, 0x2e, 0x63, 0x88, 0x88, + 0x1e, 0x1f, 0x6e, 0x98, 0x2d, 0x9b, 0x1c, 0xa0, 0x1e, 0x6b, 0x4c, + 0xdc, 0x4f, 0xe6, 0xf2, 0x6e, 0x9c, 0x26, 0xfd, 0x5f, 0x5e, 0x3f, + 0x7f, 0xc1, 0xc1, 0xc0, 0x07, 0xb2, 0x24, 0xb1, 0xb3, 0xe3, 0x24, + 0x4c, 0xfc, 0x8c, 0x5b, 0x65, 0xa6, 0x7a, 0xbd, 0x1e, 0x37 }; static const uint8_t chiptest_0fd26a42aa63_scalar_74[] = { 0x2f, 0xc1, 0xb4, 0xd5, 0x5b, 0xc9, 0x81, 0x01, 0xda, 0x97, 0x10, - 0x23, 0xf5, 0x9b, 0xb0, 0x3d, 0xb3, 0x63, 0xc1, 0x0b, 0xa8, 0x84, - 0x5a, 0x17, 0x4d, 0xb5, 0xa3, 0xe8, 0x6c, 0x22, 0x47, 0x7f }; + 0x23, 0xf5, 0x9b, 0xb0, 0x3d, 0xb3, 0x63, 0xc1, 0x0b, 0xa8, 0x84, + 0x5a, 0x17, 0x4d, 0xb5, 0xa3, 0xe8, 0x6c, 0x22, 0x47, 0x7f }; static const uint8_t chiptest_0fd26a42aa63_out_point_75[] = { 0x04, 0x94, 0xdf, 0x0b, 0x77, 0x2f, 0x24, 0x00, 0x63, 0x8f, 0x46, 0x7c, 0x39, 0xdd, 0xa5, 0x42, 0xe0, 0xc4, 0x0e, 0x7e, 0x7d, 0xc7, 0x63, 0x4a, 0x2d, 0x6b, 0x31, 0xfd, 0x08, 0x39, 0x6a, 0xe5, 0xd4, @@ -473,14 +473,14 @@ static const struct spake2p_point_mul_tv chiptest_0fd26a42aa63_test_vector_76 = .out_point_len = 65, }; static const uint8_t chiptest_0fd26a42aa63_point_77[] = { 0x04, 0x88, 0x44, 0x05, 0x46, 0xf0, 0xc1, 0xf8, 0x10, 0xeb, 0x18, - 0xfc, 0xcb, 0xce, 0x50, 0x8d, 0xc8, 0x63, 0xf3, 0x9f, 0x27, 0xe3, - 0x4c, 0x15, 0x07, 0x17, 0xf6, 0x56, 0xba, 0x8d, 0x8a, 0xea, 0x78, - 0x4e, 0x7b, 0xcb, 0x3d, 0xd3, 0xf9, 0xb5, 0xff, 0xbd, 0xba, 0x22, - 0xb9, 0xaa, 0x3d, 0xa6, 0xbf, 0x3d, 0x30, 0xe1, 0x85, 0x4f, 0x8a, - 0xdd, 0x35, 0x5e, 0x0d, 0x8a, 0x52, 0xfc, 0x58, 0x96, 0x33 }; + 0xfc, 0xcb, 0xce, 0x50, 0x8d, 0xc8, 0x63, 0xf3, 0x9f, 0x27, 0xe3, + 0x4c, 0x15, 0x07, 0x17, 0xf6, 0x56, 0xba, 0x8d, 0x8a, 0xea, 0x78, + 0x4e, 0x7b, 0xcb, 0x3d, 0xd3, 0xf9, 0xb5, 0xff, 0xbd, 0xba, 0x22, + 0xb9, 0xaa, 0x3d, 0xa6, 0xbf, 0x3d, 0x30, 0xe1, 0x85, 0x4f, 0x8a, + 0xdd, 0x35, 0x5e, 0x0d, 0x8a, 0x52, 0xfc, 0x58, 0x96, 0x33 }; static const uint8_t chiptest_0fd26a42aa63_scalar_78[] = { 0x03, 0xac, 0xd3, 0xb0, 0x2e, 0x9a, 0x26, 0xa0, 0x14, 0x2b, 0x64, - 0xd7, 0x1e, 0x56, 0x8f, 0x85, 0x39, 0xd6, 0x94, 0xee, 0xf1, 0x15, - 0x37, 0xff, 0xd7, 0x8b, 0x23, 0x94, 0x5d, 0x33, 0x44, 0x8f }; + 0xd7, 0x1e, 0x56, 0x8f, 0x85, 0x39, 0xd6, 0x94, 0xee, 0xf1, 0x15, + 0x37, 0xff, 0xd7, 0x8b, 0x23, 0x94, 0x5d, 0x33, 0x44, 0x8f }; static const uint8_t chiptest_0fd26a42aa63_out_point_79[] = { 0x04, 0xab, 0x9b, 0xb7, 0x08, 0x43, 0x9d, 0xec, 0xf1, 0xb1, 0x3b, 0x3f, 0xf4, 0x4a, 0xa9, 0x94, 0x40, 0x41, 0x3c, 0x57, 0x2c, 0x90, 0x5f, 0x33, 0x6a, 0x21, 0xe2, 0xc7, 0x20, 0xbc, 0x50, 0x74, 0x26, diff --git a/src/crypto/tests/SPAKE2P_RFC_test_vectors.h b/src/crypto/tests/SPAKE2P_RFC_test_vectors.h index 8d1efd5149b158..7b8b0eb44903d6 100644 --- a/src/crypto/tests/SPAKE2P_RFC_test_vectors.h +++ b/src/crypto/tests/SPAKE2P_RFC_test_vectors.h @@ -65,50 +65,50 @@ struct spake2p_rfc_tv }; static const uint8_t chiptest_e4836c3b50dd_w0_1[] = { 0xe6, 0x88, 0x7c, 0xf9, 0xbd, 0xfb, 0x75, 0x79, 0xc6, 0x9b, 0xf4, - 0x79, 0x28, 0xa8, 0x45, 0x14, 0xb5, 0xe3, 0x55, 0xac, 0x03, 0x48, - 0x63, 0xf7, 0xff, 0xaf, 0x43, 0x90, 0xe6, 0x7d, 0x79, 0x8c }; + 0x79, 0x28, 0xa8, 0x45, 0x14, 0xb5, 0xe3, 0x55, 0xac, 0x03, 0x48, + 0x63, 0xf7, 0xff, 0xaf, 0x43, 0x90, 0xe6, 0x7d, 0x79, 0x8c }; static const uint8_t chiptest_e4836c3b50dd_w1_2[] = { 0x24, 0xb5, 0xae, 0x4a, 0xbd, 0xa8, 0x68, 0xec, 0x93, 0x36, 0xff, - 0xc3, 0xb7, 0x8e, 0xe3, 0x1c, 0x57, 0x55, 0xbe, 0xf1, 0x75, 0x92, - 0x27, 0xef, 0x53, 0x72, 0xca, 0x13, 0x9b, 0x94, 0xe5, 0x12 }; + 0xc3, 0xb7, 0x8e, 0xe3, 0x1c, 0x57, 0x55, 0xbe, 0xf1, 0x75, 0x92, + 0x27, 0xef, 0x53, 0x72, 0xca, 0x13, 0x9b, 0x94, 0xe5, 0x12 }; static const uint8_t chiptest_e4836c3b50dd_L_3[] = { 0x04, 0x95, 0x64, 0x5c, 0xfb, 0x74, 0xdf, 0x6e, 0x58, 0xf9, 0x74, 0x8b, 0xb8, - 0x3a, 0x86, 0x62, 0x0b, 0xab, 0x7c, 0x82, 0xe1, 0x07, 0xf5, 0x7d, 0x68, 0x70, - 0xda, 0x8c, 0xbc, 0xb2, 0xff, 0x9f, 0x70, 0x63, 0xa1, 0x4b, 0x64, 0x02, 0xc6, - 0x2f, 0x99, 0xaf, 0xcb, 0x97, 0x06, 0xa4, 0xd1, 0xa1, 0x43, 0x27, 0x32, 0x59, - 0xfe, 0x76, 0xf1, 0xc6, 0x05, 0xa3, 0x63, 0x97, 0x45, 0xa9, 0x21, 0x54, 0xb9 }; + 0x3a, 0x86, 0x62, 0x0b, 0xab, 0x7c, 0x82, 0xe1, 0x07, 0xf5, 0x7d, 0x68, 0x70, + 0xda, 0x8c, 0xbc, 0xb2, 0xff, 0x9f, 0x70, 0x63, 0xa1, 0x4b, 0x64, 0x02, 0xc6, + 0x2f, 0x99, 0xaf, 0xcb, 0x97, 0x06, 0xa4, 0xd1, 0xa1, 0x43, 0x27, 0x32, 0x59, + 0xfe, 0x76, 0xf1, 0xc6, 0x05, 0xa3, 0x63, 0x97, 0x45, 0xa9, 0x21, 0x54, 0xb9 }; static const uint8_t chiptest_e4836c3b50dd_x_4[] = { 0x8b, 0x0f, 0x3f, 0x38, 0x39, 0x05, 0xcf, 0x3a, 0x3b, 0xb9, 0x55, - 0xef, 0x8f, 0xb6, 0x2e, 0x24, 0x84, 0x9d, 0xd3, 0x49, 0xa0, 0x5c, - 0xa7, 0x9a, 0xaf, 0xb1, 0x80, 0x41, 0xd3, 0x0c, 0xbd, 0xb6 }; + 0xef, 0x8f, 0xb6, 0x2e, 0x24, 0x84, 0x9d, 0xd3, 0x49, 0xa0, 0x5c, + 0xa7, 0x9a, 0xaf, 0xb1, 0x80, 0x41, 0xd3, 0x0c, 0xbd, 0xb6 }; static const uint8_t chiptest_e4836c3b50dd_X_5[] = { 0x04, 0xaf, 0x09, 0x98, 0x7a, 0x59, 0x3d, 0x3b, 0xac, 0x86, 0x94, 0xb1, 0x23, - 0x83, 0x94, 0x22, 0xc3, 0xcc, 0x87, 0xe3, 0x7d, 0x6b, 0x41, 0xc1, 0xd6, 0x30, - 0xf0, 0x00, 0xdd, 0x64, 0x98, 0x0e, 0x53, 0x7a, 0xe7, 0x04, 0xbc, 0xed, 0xe0, - 0x4e, 0xa3, 0xbe, 0xc9, 0xb7, 0x47, 0x5b, 0x32, 0xfa, 0x2c, 0xa3, 0xb6, 0x84, - 0xbe, 0x14, 0xd1, 0x16, 0x45, 0xe3, 0x8e, 0xa6, 0x60, 0x9e, 0xb3, 0x9e, 0x7e }; + 0x83, 0x94, 0x22, 0xc3, 0xcc, 0x87, 0xe3, 0x7d, 0x6b, 0x41, 0xc1, 0xd6, 0x30, + 0xf0, 0x00, 0xdd, 0x64, 0x98, 0x0e, 0x53, 0x7a, 0xe7, 0x04, 0xbc, 0xed, 0xe0, + 0x4e, 0xa3, 0xbe, 0xc9, 0xb7, 0x47, 0x5b, 0x32, 0xfa, 0x2c, 0xa3, 0xb6, 0x84, + 0xbe, 0x14, 0xd1, 0x16, 0x45, 0xe3, 0x8e, 0xa6, 0x60, 0x9e, 0xb3, 0x9e, 0x7e }; static const uint8_t chiptest_e4836c3b50dd_y_6[] = { 0x2e, 0x08, 0x95, 0xb0, 0xe7, 0x63, 0xd6, 0xd5, 0xa9, 0x56, 0x44, - 0x33, 0xe6, 0x4a, 0xc3, 0xca, 0xc7, 0x4f, 0xf8, 0x97, 0xf6, 0xc3, - 0x44, 0x52, 0x47, 0xba, 0x1b, 0xab, 0x40, 0x08, 0x2a, 0x91 }; + 0x33, 0xe6, 0x4a, 0xc3, 0xca, 0xc7, 0x4f, 0xf8, 0x97, 0xf6, 0xc3, + 0x44, 0x52, 0x47, 0xba, 0x1b, 0xab, 0x40, 0x08, 0x2a, 0x91 }; static const uint8_t chiptest_e4836c3b50dd_Y_7[] = { 0x04, 0x41, 0x75, 0x92, 0x62, 0x0a, 0xeb, 0xf9, 0xfd, 0x20, 0x36, 0x16, 0xbb, - 0xb9, 0xf1, 0x21, 0xb7, 0x30, 0xc2, 0x58, 0xb2, 0x86, 0xf8, 0x90, 0xc5, 0xf1, - 0x9f, 0xea, 0x83, 0x3a, 0x9c, 0x90, 0x0c, 0xbe, 0x90, 0x57, 0xbc, 0x54, 0x9a, - 0x3e, 0x19, 0x97, 0x5b, 0xe9, 0x92, 0x7f, 0x0e, 0x76, 0x14, 0xf0, 0x8d, 0x1f, - 0x0a, 0x10, 0x8e, 0xed, 0xe5, 0xfd, 0x7e, 0xb5, 0x62, 0x45, 0x84, 0xa4, 0xf4 }; + 0xb9, 0xf1, 0x21, 0xb7, 0x30, 0xc2, 0x58, 0xb2, 0x86, 0xf8, 0x90, 0xc5, 0xf1, + 0x9f, 0xea, 0x83, 0x3a, 0x9c, 0x90, 0x0c, 0xbe, 0x90, 0x57, 0xbc, 0x54, 0x9a, + 0x3e, 0x19, 0x97, 0x5b, 0xe9, 0x92, 0x7f, 0x0e, 0x76, 0x14, 0xf0, 0x8d, 0x1f, + 0x0a, 0x10, 0x8e, 0xed, 0xe5, 0xfd, 0x7e, 0xb5, 0x62, 0x45, 0x84, 0xa4, 0xf4 }; static const uint8_t chiptest_e4836c3b50dd_Z_8[] = { 0x04, 0x71, 0xa3, 0x52, 0x82, 0xd2, 0x02, 0x6f, 0x36, 0xbf, 0x3c, 0xeb, 0x38, - 0xfc, 0xf8, 0x7e, 0x31, 0x12, 0xa4, 0x45, 0x2f, 0x46, 0xe9, 0xf7, 0xb4, 0x7f, - 0xd7, 0x69, 0xcf, 0xb5, 0x70, 0x14, 0x5b, 0x62, 0x58, 0x9c, 0x76, 0xb7, 0xaa, - 0x1e, 0xb6, 0x08, 0x0a, 0x83, 0x2e, 0x53, 0x32, 0xc3, 0x68, 0x98, 0x42, 0x69, - 0x12, 0xe2, 0x9c, 0x40, 0xef, 0x9e, 0x9c, 0x74, 0x2e, 0xee, 0x82, 0xbf, 0x30 }; + 0xfc, 0xf8, 0x7e, 0x31, 0x12, 0xa4, 0x45, 0x2f, 0x46, 0xe9, 0xf7, 0xb4, 0x7f, + 0xd7, 0x69, 0xcf, 0xb5, 0x70, 0x14, 0x5b, 0x62, 0x58, 0x9c, 0x76, 0xb7, 0xaa, + 0x1e, 0xb6, 0x08, 0x0a, 0x83, 0x2e, 0x53, 0x32, 0xc3, 0x68, 0x98, 0x42, 0x69, + 0x12, 0xe2, 0x9c, 0x40, 0xef, 0x9e, 0x9c, 0x74, 0x2e, 0xee, 0x82, 0xbf, 0x30 }; static const uint8_t chiptest_e4836c3b50dd_V_9[] = { 0x04, 0x67, 0x18, 0x98, 0x1b, 0xf1, 0x5b, 0xc4, 0xdb, 0x53, 0x8f, 0xc1, 0xf1, - 0xc1, 0xd0, 0x58, 0xcb, 0x0e, 0xec, 0xec, 0xf1, 0xdb, 0xe1, 0xb1, 0xea, 0x08, - 0xa4, 0xe2, 0x52, 0x75, 0xd3, 0x82, 0xe8, 0x2b, 0x34, 0x8c, 0x81, 0x31, 0xd8, - 0xed, 0x66, 0x9d, 0x16, 0x9c, 0x2e, 0x03, 0xa8, 0x58, 0xdb, 0x7c, 0xf6, 0xca, - 0x28, 0x53, 0xa4, 0x07, 0x12, 0x51, 0xa3, 0x9f, 0xbe, 0x8c, 0xfc, 0x39, 0xbc }; + 0xc1, 0xd0, 0x58, 0xcb, 0x0e, 0xec, 0xec, 0xf1, 0xdb, 0xe1, 0xb1, 0xea, 0x08, + 0xa4, 0xe2, 0x52, 0x75, 0xd3, 0x82, 0xe8, 0x2b, 0x34, 0x8c, 0x81, 0x31, 0xd8, + 0xed, 0x66, 0x9d, 0x16, 0x9c, 0x2e, 0x03, 0xa8, 0x58, 0xdb, 0x7c, 0xf6, 0xca, + 0x28, 0x53, 0xa4, 0x07, 0x12, 0x51, 0xa3, 0x9f, 0xbe, 0x8c, 0xfc, 0x39, 0xbc }; static const uint8_t chiptest_e4836c3b50dd_Ka_10[] = { 0xf9, 0xca, 0xb9, 0xad, 0xcc, 0x0e, 0xd8, 0xe5, 0xa4, 0xdb, 0x11, 0xa8, 0x50, 0x59, 0x14, 0xb2 }; static const uint8_t chiptest_e4836c3b50dd_Ke_11[] = { 0x80, 0x1d, 0xb2, 0x97, 0x65, 0x48, 0x16, 0xeb, 0x4f, 0x02, 0x86, 0x81, 0x29, 0xb9, 0xdc, 0x89 }; static const uint8_t chiptest_e4836c3b50dd_KcA_12[] = { 0x0d, 0x24, 0x8d, 0x7d, 0x19, 0x23, 0x4f, 0x14, - 0x86, 0xb2, 0xef, 0xba, 0x51, 0x79, 0xc5, 0x2d }; + 0x86, 0xb2, 0xef, 0xba, 0x51, 0x79, 0xc5, 0x2d }; static const uint8_t chiptest_e4836c3b50dd_KcB_13[] = { 0x55, 0x62, 0x91, 0xdf, 0x26, 0xd7, 0x05, 0xa2, - 0xca, 0xed, 0xd6, 0x47, 0x4d, 0xd0, 0x07, 0x9b }; + 0xca, 0xed, 0xd6, 0x47, 0x4d, 0xd0, 0x07, 0x9b }; static const uint8_t chiptest_e4836c3b50dd_MAC_KcA_14[] = { 0xd4, 0x37, 0x6f, 0x2d, 0xa9, 0xc7, 0x22, 0x26, 0xdd, 0x15, 0x1b, 0x77, 0xc2, 0x91, 0x90, 0x71, 0x15, 0x5f, 0xc2, 0x2a, 0x20, 0x68, 0xd9, 0x0b, 0x5f, 0xaa, 0x6c, 0x78, 0xc1, 0x1e, 0x77, 0xdd }; @@ -196,13 +196,13 @@ static const uint8_t chiptest_e4836c3b50dd_V_25[] = { 0x0f, 0x59, 0x56, 0x15, 0x60, 0x23, 0xd9, 0x6e, 0x0f, 0x93, 0xd2, 0x75, 0xbf, 0x50 }; static const uint8_t chiptest_e4836c3b50dd_Ka_26[] = { 0xe2, 0xcb, 0xee, 0x3a, 0xe1, 0x9a, 0x4d, 0xbe, - 0x9f, 0x14, 0x6b, 0xe6, 0xbe, 0xe9, 0xbf, 0xa1 }; + 0x9f, 0x14, 0x6b, 0xe6, 0xbe, 0xe9, 0xbf, 0xa1 }; static const uint8_t chiptest_e4836c3b50dd_Ke_27[] = { 0x69, 0x89, 0xd8, 0xf9, 0x17, 0x7e, 0xf7, 0xdf, - 0x67, 0xda, 0x43, 0x79, 0x87, 0xf0, 0x72, 0x55 }; + 0x67, 0xda, 0x43, 0x79, 0x87, 0xf0, 0x72, 0x55 }; static const uint8_t chiptest_e4836c3b50dd_KcA_28[] = { 0x2f, 0x9e, 0x0b, 0xb6, 0x69, 0xd2, 0xc2, 0x26, - 0x45, 0xbc, 0xe3, 0x4d, 0xa0, 0x4a, 0xc1, 0x6a }; + 0x45, 0xbc, 0xe3, 0x4d, 0xa0, 0x4a, 0xc1, 0x6a }; static const uint8_t chiptest_e4836c3b50dd_KcB_29[] = { 0xeb, 0x7a, 0x35, 0x16, 0x87, 0x59, 0xdd, 0x8e, - 0x9c, 0xe4, 0x4e, 0x4d, 0xc5, 0x12, 0x77, 0xce }; + 0x9c, 0xe4, 0x4e, 0x4d, 0xc5, 0x12, 0x77, 0xce }; static const uint8_t chiptest_e4836c3b50dd_MAC_KcA_30[] = { 0xe1, 0xb9, 0x25, 0x88, 0x07, 0xba, 0x47, 0x50, 0xda, 0xe1, 0xd7, 0xf3, 0xc3, 0xc2, 0x94, 0xf1, 0x3d, 0xc4, 0xfa, 0x60, 0xcd, 0xe3, 0x46, 0xd5, 0xde, 0x7d, 0x20, 0x0e, 0x2f, 0x8f, 0xd3, 0xfc }; @@ -290,13 +290,13 @@ static const uint8_t chiptest_e4836c3b50dd_V_41[] = { 0x33, 0xae, 0x94, 0x4e, 0x3b, 0x1f, 0x31, 0x8d, 0x76, 0xe3, 0x6f, 0xea, 0x99, 0x66 }; static const uint8_t chiptest_e4836c3b50dd_Ka_42[] = { 0xec, 0x8d, 0x19, 0xb8, 0x07, 0xff, 0xb1, 0xd1, - 0xee, 0xa8, 0x1a, 0x93, 0xba, 0x35, 0xcd, 0xfe }; + 0xee, 0xa8, 0x1a, 0x93, 0xba, 0x35, 0xcd, 0xfe }; static const uint8_t chiptest_e4836c3b50dd_Ke_43[] = { 0x2e, 0xa4, 0x0e, 0x4b, 0xad, 0xfa, 0x54, 0x52, - 0xb5, 0x74, 0x4d, 0xc5, 0x98, 0x3e, 0x99, 0xba }; + 0xb5, 0x74, 0x4d, 0xc5, 0x98, 0x3e, 0x99, 0xba }; static const uint8_t chiptest_e4836c3b50dd_KcA_44[] = { 0x66, 0xde, 0x53, 0x4d, 0x9b, 0xf1, 0xe4, 0x4e, - 0x96, 0xa5, 0x3a, 0x4b, 0x48, 0xd6, 0xb3, 0x53 }; + 0x96, 0xa5, 0x3a, 0x4b, 0x48, 0xd6, 0xb3, 0x53 }; static const uint8_t chiptest_e4836c3b50dd_KcB_45[] = { 0x49, 0x45, 0xc3, 0x8b, 0xb4, 0x76, 0xcb, 0x0f, - 0x34, 0x7f, 0x32, 0x22, 0xbe, 0x9b, 0x64, 0xa2 }; + 0x34, 0x7f, 0x32, 0x22, 0xbe, 0x9b, 0x64, 0xa2 }; static const uint8_t chiptest_e4836c3b50dd_MAC_KcA_46[] = { 0xe5, 0x64, 0xc9, 0x3b, 0x30, 0x15, 0xef, 0xb9, 0x46, 0xdc, 0x16, 0xd6, 0x42, 0xbb, 0xe7, 0xd1, 0xc8, 0xda, 0x5b, 0xe1, 0x64, 0xed, 0x9f, 0xc3, 0xba, 0xe4, 0xe0, 0xff, 0x86, 0xe1, 0xbd, 0x3c }; @@ -384,13 +384,13 @@ static const uint8_t chiptest_e4836c3b50dd_V_57[] = { 0x92, 0x99, 0xf3, 0x40, 0xea, 0x80, 0xfb, 0x90, 0xa9, 0xba, 0xd0, 0x94, 0xe1, 0xa6 }; static const uint8_t chiptest_e4836c3b50dd_Ka_58[] = { 0x59, 0x29, 0xa3, 0xce, 0x98, 0x22, 0xc8, 0x14, - 0x01, 0xbf, 0x0f, 0x76, 0x4f, 0x69, 0xaf, 0x08 }; + 0x01, 0xbf, 0x0f, 0x76, 0x4f, 0x69, 0xaf, 0x08 }; static const uint8_t chiptest_e4836c3b50dd_Ke_59[] = { 0xea, 0x32, 0x76, 0xd6, 0x83, 0x34, 0x57, 0x60, - 0x97, 0xe0, 0x4b, 0x19, 0xee, 0x5a, 0x3a, 0x8b }; + 0x97, 0xe0, 0x4b, 0x19, 0xee, 0x5a, 0x3a, 0x8b }; static const uint8_t chiptest_e4836c3b50dd_KcA_60[] = { 0x7f, 0x84, 0xb9, 0x39, 0xd6, 0x00, 0x11, 0x72, - 0x56, 0xb0, 0xc8, 0xa6, 0xd4, 0x0c, 0xf1, 0x81 }; + 0x56, 0xb0, 0xc8, 0xa6, 0xd4, 0x0c, 0xf1, 0x81 }; static const uint8_t chiptest_e4836c3b50dd_KcB_61[] = { 0xf7, 0xd7, 0x54, 0x7c, 0xed, 0x93, 0xf6, 0x81, - 0xe8, 0xdf, 0x4c, 0x25, 0x8c, 0x45, 0x16, 0xfd }; + 0xe8, 0xdf, 0x4c, 0x25, 0x8c, 0x45, 0x16, 0xfd }; static const uint8_t chiptest_e4836c3b50dd_MAC_KcA_62[] = { 0x71, 0xd9, 0x41, 0x27, 0x79, 0xb6, 0xc4, 0x5a, 0x2c, 0x61, 0x5c, 0x9d, 0xf3, 0xf1, 0xfd, 0x93, 0xdc, 0x0a, 0xaf, 0x63, 0x10, 0x4d, 0xa8, 0xec, 0xe4, 0xaa, 0x1b, 0x5a, 0x3a, 0x41, 0x5f, 0xea }; diff --git a/src/darwin/Framework/CHIP/MTRBaseClusterUtils.h b/src/darwin/Framework/CHIP/MTRBaseClusterUtils.h index 36a7687e8b1a25..b74c1855762dfa 100644 --- a/src/darwin/Framework/CHIP/MTRBaseClusterUtils.h +++ b/src/darwin/Framework/CHIP/MTRBaseClusterUtils.h @@ -266,7 +266,8 @@ void MTRReadAttribute(MTRReadParams * _Nonnull params, /** * Utility functions base clusters use for doing commands. */ -template class MTRInvokeCallback : public chip::app::CommandSender::Callback { +template +class MTRInvokeCallback : public chip::app::CommandSender::Callback { public: MTRInvokeCallback(InvokeBridgeType * _Nonnull bridge, typename InvokeBridgeType::SuccessCallbackType _Nonnull onResponse, MTRErrorCallback _Nonnull onError) diff --git a/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h b/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h index 42350a51cadbae..a64e8d1fe6d5cf 100644 --- a/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h +++ b/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h @@ -119,10 +119,12 @@ class MTRBaseSubscriptionCallback : public chip::app::ClusterStateCache::Callbac // OnEventData and OnAttributeData must be implemented by subclasses. void OnEventData(const chip::app::EventHeader & aEventHeader, chip::TLV::TLVReader * apData, - const chip::app::StatusIB * apStatus) override = 0; + const chip::app::StatusIB * apStatus) override + = 0; void OnAttributeData(const chip::app::ConcreteDataAttributePath & aPath, chip::TLV::TLVReader * apData, - const chip::app::StatusIB & aStatus) override = 0; + const chip::app::StatusIB & aStatus) override + = 0; void OnError(CHIP_ERROR aError) override; diff --git a/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h b/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h index 9f2f6170327b94..e1f81b101bc88e 100644 --- a/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h +++ b/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h @@ -277,7 +277,8 @@ class MTRCallbackBridge : public MTRCallbackBridgeBase, static void DispatchFailure(void * context, NSError * error) { DispatchCallbackResult(context, error, nil); } - template static void SetAttestationChallengeIfNeeded(void * context, ResponseType * _Nonnull response) + template + static void SetAttestationChallengeIfNeeded(void * context, ResponseType * _Nonnull response) { if constexpr (HaveAttestationChallenge()) { auto * self = static_cast(context); diff --git a/src/include/platform/BuildTime.h b/src/include/platform/BuildTime.h index 979f8c6bbd5e84..bf33681cda5764 100644 --- a/src/include/platform/BuildTime.h +++ b/src/include/platform/BuildTime.h @@ -46,22 +46,19 @@ #define BUILD_MONTH_IS_DEC(_date) ((_date)[0] == 'D') #define COMPUTE_BUILD_MONTH(_date) \ - ((BUILD_MONTH_IS_JAN(_date)) \ - ? 1 \ + ((BUILD_MONTH_IS_JAN(_date)) ? 1 \ : (BUILD_MONTH_IS_FEB(_date)) ? 2 \ - : (BUILD_MONTH_IS_MAR(_date)) ? 3 \ - : (BUILD_MONTH_IS_APR(_date)) ? 4 \ - : (BUILD_MONTH_IS_MAY(_date)) \ - ? 5 \ - : (BUILD_MONTH_IS_JUN(_date)) ? 6 \ - : (BUILD_MONTH_IS_JUL(_date)) ? 7 \ - : (BUILD_MONTH_IS_AUG(_date)) \ - ? 8 \ - : (BUILD_MONTH_IS_SEP(_date)) ? 9 \ - : (BUILD_MONTH_IS_OCT(_date)) ? 10 \ - : (BUILD_MONTH_IS_NOV(_date)) \ - ? 11 \ - : (BUILD_MONTH_IS_DEC(_date)) ? 12 : /* error default */ 99) + : (BUILD_MONTH_IS_MAR(_date)) ? 3 \ + : (BUILD_MONTH_IS_APR(_date)) ? 4 \ + : (BUILD_MONTH_IS_MAY(_date)) ? 5 \ + : (BUILD_MONTH_IS_JUN(_date)) ? 6 \ + : (BUILD_MONTH_IS_JUL(_date)) ? 7 \ + : (BUILD_MONTH_IS_AUG(_date)) ? 8 \ + : (BUILD_MONTH_IS_SEP(_date)) ? 9 \ + : (BUILD_MONTH_IS_OCT(_date)) ? 10 \ + : (BUILD_MONTH_IS_NOV(_date)) ? 11 \ + : (BUILD_MONTH_IS_DEC(_date)) ? 12 \ + : /* error default */ 99) #define COMPUTE_BUILD_HOUR(_time) static_cast(((_time)[0] - '0') * 10 + (_time)[1] - '0') #define COMPUTE_BUILD_MIN(_time) static_cast(((_time)[3] - '0') * 10 + (_time)[4] - '0') diff --git a/src/include/platform/CommissionableDataProvider.h b/src/include/platform/CommissionableDataProvider.h index 95fa3faf5d99d4..d3f3b23726a670 100644 --- a/src/include/platform/CommissionableDataProvider.h +++ b/src/include/platform/CommissionableDataProvider.h @@ -36,7 +36,7 @@ class CommissionableDataProvider virtual ~CommissionableDataProvider() = default; // Not copyable - CommissionableDataProvider(const CommissionableDataProvider &) = delete; + CommissionableDataProvider(const CommissionableDataProvider &) = delete; CommissionableDataProvider & operator=(const CommissionableDataProvider &) = delete; /** diff --git a/src/include/platform/ConfigurationManager.h b/src/include/platform/ConfigurationManager.h index c9174d97f854c1..e846e420f5dc79 100644 --- a/src/include/platform/ConfigurationManager.h +++ b/src/include/platform/ConfigurationManager.h @@ -171,8 +171,8 @@ class ConfigurationManager virtual ~ConfigurationManager() = default; // No copy, move or assignment. - ConfigurationManager(const ConfigurationManager &) = delete; - ConfigurationManager(const ConfigurationManager &&) = delete; + ConfigurationManager(const ConfigurationManager &) = delete; + ConfigurationManager(const ConfigurationManager &&) = delete; ConfigurationManager & operator=(const ConfigurationManager &) = delete; }; diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h old mode 100755 new mode 100644 index cdacf50b663979..d1bbd22a93a3a2 --- a/src/include/platform/ConnectivityManager.h +++ b/src/include/platform/ConnectivityManager.h @@ -260,8 +260,8 @@ class ConnectivityManager ~ConnectivityManager() = default; // No copy, move or assignment. - ConnectivityManager(const ConnectivityManager &) = delete; - ConnectivityManager(const ConnectivityManager &&) = delete; + ConnectivityManager(const ConnectivityManager &) = delete; + ConnectivityManager(const ConnectivityManager &&) = delete; ConnectivityManager & operator=(const ConnectivityManager &) = delete; }; diff --git a/src/include/platform/DeviceControlServer.h b/src/include/platform/DeviceControlServer.h index 34c91401e4e5a5..ce98110c2154d4 100644 --- a/src/include/platform/DeviceControlServer.h +++ b/src/include/platform/DeviceControlServer.h @@ -49,8 +49,8 @@ class DeviceControlServer final ~DeviceControlServer() = default; // No copy, move or assignment. - DeviceControlServer(const DeviceControlServer &) = delete; - DeviceControlServer(const DeviceControlServer &&) = delete; + DeviceControlServer(const DeviceControlServer &) = delete; + DeviceControlServer(const DeviceControlServer &&) = delete; DeviceControlServer & operator=(const DeviceControlServer &) = delete; }; diff --git a/src/include/platform/DeviceInfoProvider.h b/src/include/platform/DeviceInfoProvider.h index 7b3206eb5c5aad..59920f64d700f7 100644 --- a/src/include/platform/DeviceInfoProvider.h +++ b/src/include/platform/DeviceInfoProvider.h @@ -79,7 +79,7 @@ class DeviceInfoProvider virtual ~DeviceInfoProvider() = default; // Not copyable - DeviceInfoProvider(const DeviceInfoProvider &) = delete; + DeviceInfoProvider(const DeviceInfoProvider &) = delete; DeviceInfoProvider & operator=(const DeviceInfoProvider &) = delete; /** diff --git a/src/include/platform/DiagnosticDataProvider.h b/src/include/platform/DiagnosticDataProvider.h index b6f44ee7e93e2a..338c43947fb472 100644 --- a/src/include/platform/DiagnosticDataProvider.h +++ b/src/include/platform/DiagnosticDataProvider.h @@ -241,8 +241,8 @@ class DiagnosticDataProvider WiFiDiagnosticsDelegate * mWiFiDiagnosticsDelegate = nullptr; // No copy, move or assignment. - DiagnosticDataProvider(const DiagnosticDataProvider &) = delete; - DiagnosticDataProvider(const DiagnosticDataProvider &&) = delete; + DiagnosticDataProvider(const DiagnosticDataProvider &) = delete; + DiagnosticDataProvider(const DiagnosticDataProvider &&) = delete; DiagnosticDataProvider & operator=(const DiagnosticDataProvider &) = delete; }; diff --git a/src/include/platform/KeyValueStoreManager.h b/src/include/platform/KeyValueStoreManager.h index 41a75e9e566a08..eb24efbb091763 100644 --- a/src/include/platform/KeyValueStoreManager.h +++ b/src/include/platform/KeyValueStoreManager.h @@ -179,8 +179,8 @@ class KeyValueStoreManager ~KeyValueStoreManager() = default; // No copy, move or assignment. - KeyValueStoreManager(const KeyValueStoreManager &) = delete; - KeyValueStoreManager(const KeyValueStoreManager &&) = delete; + KeyValueStoreManager(const KeyValueStoreManager &) = delete; + KeyValueStoreManager(const KeyValueStoreManager &&) = delete; KeyValueStoreManager & operator=(const KeyValueStoreManager &) = delete; }; diff --git a/src/include/platform/KvsPersistentStorageDelegate.h b/src/include/platform/KvsPersistentStorageDelegate.h index 0348e92bf2c08d..7df834b2895d75 100644 --- a/src/include/platform/KvsPersistentStorageDelegate.h +++ b/src/include/platform/KvsPersistentStorageDelegate.h @@ -35,8 +35,8 @@ class KvsPersistentStorageDelegate : public PersistentStorageDelegate virtual ~KvsPersistentStorageDelegate() = default; // No copy, move or assignment. - KvsPersistentStorageDelegate(const KvsPersistentStorageDelegate &) = delete; - KvsPersistentStorageDelegate(const KvsPersistentStorageDelegate &&) = delete; + KvsPersistentStorageDelegate(const KvsPersistentStorageDelegate &) = delete; + KvsPersistentStorageDelegate(const KvsPersistentStorageDelegate &&) = delete; KvsPersistentStorageDelegate & operator=(const KvsPersistentStorageDelegate &) = delete; CHIP_ERROR Init(DeviceLayer::PersistedStorage::KeyValueStoreManager * kvsManager) diff --git a/src/include/platform/NFCManager.h b/src/include/platform/NFCManager.h index 6028f8677c74be..08a0dbbb9ce82e 100644 --- a/src/include/platform/NFCManager.h +++ b/src/include/platform/NFCManager.h @@ -79,8 +79,8 @@ class NFCManager ~NFCManager() = default; // No copy, move or assignment. - NFCManager(const NFCManager &) = delete; - NFCManager(NFCManager &&) = delete; + NFCManager(const NFCManager &) = delete; + NFCManager(NFCManager &&) = delete; void operator=(const NFCManager &) = delete; // NFCManager implementation getters. diff --git a/src/include/platform/PlatformManager.h b/src/include/platform/PlatformManager.h index 41334a465b4549..a0f5abfec4e134 100644 --- a/src/include/platform/PlatformManager.h +++ b/src/include/platform/PlatformManager.h @@ -285,8 +285,8 @@ class PlatformManager ~PlatformManager() = default; // No copy, move or assignment. - PlatformManager(const PlatformManager &) = delete; - PlatformManager(const PlatformManager &&) = delete; + PlatformManager(const PlatformManager &) = delete; + PlatformManager(const PlatformManager &&) = delete; PlatformManager & operator=(const PlatformManager &) = delete; }; diff --git a/src/include/platform/ThreadStackManager.h b/src/include/platform/ThreadStackManager.h old mode 100755 new mode 100644 index bfd8875551a84b..b6c9a7e38dd7d5 --- a/src/include/platform/ThreadStackManager.h +++ b/src/include/platform/ThreadStackManager.h @@ -175,8 +175,8 @@ class ThreadStackManager ~ThreadStackManager() = default; // No copy, move or assignment. - ThreadStackManager(const ThreadStackManager &) = delete; - ThreadStackManager(const ThreadStackManager &&) = delete; + ThreadStackManager(const ThreadStackManager &) = delete; + ThreadStackManager(const ThreadStackManager &&) = delete; ThreadStackManager & operator=(const ThreadStackManager &) = delete; }; diff --git a/src/include/platform/internal/BLEManager.h b/src/include/platform/internal/BLEManager.h index f37f2f3eb00743..b57690e3060a72 100644 --- a/src/include/platform/internal/BLEManager.h +++ b/src/include/platform/internal/BLEManager.h @@ -71,8 +71,8 @@ class BLEManager ~BLEManager() = default; // No copy, move or assignment. - BLEManager(const BLEManager &) = delete; - BLEManager(const BLEManager &&) = delete; + BLEManager(const BLEManager &) = delete; + BLEManager(const BLEManager &&) = delete; BLEManager & operator=(const BLEManager &) = delete; }; diff --git a/src/inet/UDPEndPoint.h b/src/inet/UDPEndPoint.h index 9cea83fb3cbc88..04435ef17a8f0f 100644 --- a/src/inet/UDPEndPoint.h +++ b/src/inet/UDPEndPoint.h @@ -53,10 +53,10 @@ namespace Inet { class DLL_EXPORT UDPEndPoint : public EndPointBasis { public: - UDPEndPoint(const UDPEndPoint &) = delete; - UDPEndPoint(UDPEndPoint &&) = delete; + UDPEndPoint(const UDPEndPoint &) = delete; + UDPEndPoint(UDPEndPoint &&) = delete; UDPEndPoint & operator=(const UDPEndPoint &) = delete; - UDPEndPoint & operator=(UDPEndPoint &&) = delete; + UDPEndPoint & operator=(UDPEndPoint &&) = delete; /** * Type of message text reception event handling function. diff --git a/src/inet/arpa-inet-compatibility.h b/src/inet/arpa-inet-compatibility.h index ce4f2f923c7e73..232e4cdc1d9bba 100644 --- a/src/inet/arpa-inet-compatibility.h +++ b/src/inet/arpa-inet-compatibility.h @@ -68,7 +68,7 @@ #elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #ifndef htons -#define htons(x) ((u16_t)((((x) & (u16_t) 0x00ffU) << 8) | (((x) & (u16_t) 0xff00U) >> 8))) +#define htons(x) ((u16_t) ((((x) & (u16_t) 0x00ffU) << 8) | (((x) & (u16_t) 0xff00U) >> 8))) #endif #ifndef ntohs #define ntohs(x) htons(x) diff --git a/src/inet/tests/TestInetAddress.cpp b/src/inet/tests/TestInetAddress.cpp index a31bbb878efee9..f047f6dc751c12 100644 --- a/src/inet/tests/TestInetAddress.cpp +++ b/src/inet/tests/TestInetAddress.cpp @@ -1206,9 +1206,9 @@ void CheckFromSocket(nlTestSuite * inSuite, void * inContext) (void) inSuite; // This test is only supported for non LWIP stack. #else // INET_LWIP - const struct TestContext * lContext = static_cast(inContext); + const struct TestContext * lContext = static_cast(inContext); IPAddressExpandedContextIterator lCurrent = lContext->mIPAddressExpandedContextRange.mBegin; - IPAddressExpandedContextIterator lEnd = lContext->mIPAddressExpandedContextRange.mEnd; + IPAddressExpandedContextIterator lEnd = lContext->mIPAddressExpandedContextRange.mEnd; while (lCurrent != lEnd) { @@ -1381,25 +1381,25 @@ void CheckEncoding(nlTestSuite * inSuite, void * inContext) test_addr.WriteAddress(p); // buffer has address in network byte order - NL_TEST_ASSERT(inSuite, buffer[3] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[0])); - NL_TEST_ASSERT(inSuite, buffer[2] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[0] >> 8)); - NL_TEST_ASSERT(inSuite, buffer[1] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[0] >> 16)); - NL_TEST_ASSERT(inSuite, buffer[0] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[0] >> 24)); - - NL_TEST_ASSERT(inSuite, buffer[7] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[1])); - NL_TEST_ASSERT(inSuite, buffer[6] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[1] >> 8)); - NL_TEST_ASSERT(inSuite, buffer[5] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[1] >> 16)); - NL_TEST_ASSERT(inSuite, buffer[4] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[1] >> 24)); - - NL_TEST_ASSERT(inSuite, buffer[11] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[2])); - NL_TEST_ASSERT(inSuite, buffer[10] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[2] >> 8)); - NL_TEST_ASSERT(inSuite, buffer[9] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[2] >> 16)); - NL_TEST_ASSERT(inSuite, buffer[8] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[2] >> 24)); - - NL_TEST_ASSERT(inSuite, buffer[15] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[3])); - NL_TEST_ASSERT(inSuite, buffer[14] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[3] >> 8)); - NL_TEST_ASSERT(inSuite, buffer[13] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[3] >> 16)); - NL_TEST_ASSERT(inSuite, buffer[12] == (uint8_t)(lCurrent->mAddr.mAddrQuartets[3] >> 24)); + NL_TEST_ASSERT(inSuite, buffer[3] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[0])); + NL_TEST_ASSERT(inSuite, buffer[2] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[0] >> 8)); + NL_TEST_ASSERT(inSuite, buffer[1] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[0] >> 16)); + NL_TEST_ASSERT(inSuite, buffer[0] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[0] >> 24)); + + NL_TEST_ASSERT(inSuite, buffer[7] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[1])); + NL_TEST_ASSERT(inSuite, buffer[6] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[1] >> 8)); + NL_TEST_ASSERT(inSuite, buffer[5] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[1] >> 16)); + NL_TEST_ASSERT(inSuite, buffer[4] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[1] >> 24)); + + NL_TEST_ASSERT(inSuite, buffer[11] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[2])); + NL_TEST_ASSERT(inSuite, buffer[10] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[2] >> 8)); + NL_TEST_ASSERT(inSuite, buffer[9] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[2] >> 16)); + NL_TEST_ASSERT(inSuite, buffer[8] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[2] >> 24)); + + NL_TEST_ASSERT(inSuite, buffer[15] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[3])); + NL_TEST_ASSERT(inSuite, buffer[14] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[3] >> 8)); + NL_TEST_ASSERT(inSuite, buffer[13] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[3] >> 16)); + NL_TEST_ASSERT(inSuite, buffer[12] == (uint8_t) (lCurrent->mAddr.mAddrQuartets[3] >> 24)); ++lCurrent; } @@ -1775,43 +1775,43 @@ void CheckToLwIPAddr(nlTestSuite * inSuite, void * inContext) else #endif // INET_CONFIG_ENABLE_IPV4 if (lCurrent->mAddr.mAddrType == IPAddressType::kIPv6) - { - ip_addr_copy_from_ip6(lwip_expected_addr, test_addr.ToIPv6()); - lwip_check_addr = test_addr.ToLwIPAddr(); - NL_TEST_ASSERT(inSuite, sameLwIPAddress(lwip_expected_addr, lwip_check_addr)); + { + ip_addr_copy_from_ip6(lwip_expected_addr, test_addr.ToIPv6()); + lwip_check_addr = test_addr.ToLwIPAddr(); + NL_TEST_ASSERT(inSuite, sameLwIPAddress(lwip_expected_addr, lwip_check_addr)); - err = test_addr.ToLwIPAddr(IPAddressType::kAny, lwip_check_addr); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); - NL_TEST_ASSERT(inSuite, sameLwIPAddress(lwip_expected_addr, lwip_check_addr)); + err = test_addr.ToLwIPAddr(IPAddressType::kAny, lwip_check_addr); + NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + NL_TEST_ASSERT(inSuite, sameLwIPAddress(lwip_expected_addr, lwip_check_addr)); - err = test_addr.ToLwIPAddr(IPAddressType::kIPv6, lwip_check_addr); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); - NL_TEST_ASSERT(inSuite, sameLwIPAddress(lwip_expected_addr, lwip_check_addr)); + err = test_addr.ToLwIPAddr(IPAddressType::kIPv6, lwip_check_addr); + NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + NL_TEST_ASSERT(inSuite, sameLwIPAddress(lwip_expected_addr, lwip_check_addr)); #if INET_CONFIG_ENABLE_IPV4 - err = test_addr.ToLwIPAddr(IPAddressType::kIPv4, lwip_check_addr); - NL_TEST_ASSERT(inSuite, err == INET_ERROR_WRONG_ADDRESS_TYPE); + err = test_addr.ToLwIPAddr(IPAddressType::kIPv4, lwip_check_addr); + NL_TEST_ASSERT(inSuite, err == INET_ERROR_WRONG_ADDRESS_TYPE); #endif // INET_CONFIG_ENABLE_IPV4 - } - else if (lCurrent->mAddr.mAddrType == IPAddressType::kAny) - { - lwip_check_addr = test_addr.ToLwIPAddr(); - NL_TEST_ASSERT(inSuite, sameLwIPAddress(*IP6_ADDR_ANY, lwip_check_addr)); + } + else if (lCurrent->mAddr.mAddrType == IPAddressType::kAny) + { + lwip_check_addr = test_addr.ToLwIPAddr(); + NL_TEST_ASSERT(inSuite, sameLwIPAddress(*IP6_ADDR_ANY, lwip_check_addr)); - err = test_addr.ToLwIPAddr(IPAddressType::kAny, lwip_check_addr); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); - NL_TEST_ASSERT(inSuite, sameLwIPAddress(*IP6_ADDR_ANY, lwip_check_addr)); + err = test_addr.ToLwIPAddr(IPAddressType::kAny, lwip_check_addr); + NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + NL_TEST_ASSERT(inSuite, sameLwIPAddress(*IP6_ADDR_ANY, lwip_check_addr)); - err = test_addr.ToLwIPAddr(IPAddressType::kIPv6, lwip_check_addr); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); - NL_TEST_ASSERT(inSuite, sameLwIPAddress(*IP6_ADDR_ANY, lwip_check_addr)); + err = test_addr.ToLwIPAddr(IPAddressType::kIPv6, lwip_check_addr); + NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + NL_TEST_ASSERT(inSuite, sameLwIPAddress(*IP6_ADDR_ANY, lwip_check_addr)); #if INET_CONFIG_ENABLE_IPV4 - err = test_addr.ToLwIPAddr(IPAddressType::kIPv4, lwip_check_addr); - NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); - NL_TEST_ASSERT(inSuite, sameLwIPAddress(*IP4_ADDR_ANY, lwip_check_addr)); + err = test_addr.ToLwIPAddr(IPAddressType::kIPv4, lwip_check_addr); + NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); + NL_TEST_ASSERT(inSuite, sameLwIPAddress(*IP4_ADDR_ANY, lwip_check_addr)); #endif // INET_CONFIG_ENABLE_IPV4 - } + } ++lCurrent; } diff --git a/src/lib/address_resolve/AddressResolve.h b/src/lib/address_resolve/AddressResolve.h index 8034aed7c1f28a..c50d8c78d39d74 100644 --- a/src/lib/address_resolve/AddressResolve.h +++ b/src/lib/address_resolve/AddressResolve.h @@ -75,7 +75,7 @@ class NodeLookupHandleBase : public IntrusiveListNodeBase<> // While active, resolve handles are maintained in an internal list // to be processed, so copying their values (i.e. pointers) is not // allowed. - NodeLookupHandleBase(const NodeLookupHandleBase &) = delete; + NodeLookupHandleBase(const NodeLookupHandleBase &) = delete; NodeLookupHandleBase & operator=(const NodeLookupHandleBase &) = delete; void SetListener(NodeListener * listener) { mListener = listener; } @@ -97,7 +97,7 @@ class NodeLookupRequest NodeLookupRequest() {} NodeLookupRequest(const PeerId & peerId) : mPeerId(peerId) {} - NodeLookupRequest(const NodeLookupRequest &) = default; + NodeLookupRequest(const NodeLookupRequest &) = default; NodeLookupRequest & operator=(const NodeLookupRequest &) = default; const PeerId & GetPeerId() const { return mPeerId; } diff --git a/src/lib/asn1/tests/TestASN1.cpp b/src/lib/asn1/tests/TestASN1.cpp index da719fcc202c04..2552aa0b5a3427 100644 --- a/src/lib/asn1/tests/TestASN1.cpp +++ b/src/lib/asn1/tests/TestASN1.cpp @@ -143,7 +143,10 @@ static CHIP_ERROR EncodeASN1TestData(ASN1Writer & writer) ASN1_START_SEQUENCE { ASN1_ENCODE_OBJECT_ID(kTestVal_23_OID); - ASN1_START_BIT_STRING_ENCAPSULATED { ASN1_ENCODE_INTEGER(kTestVal_24_Int); } + ASN1_START_BIT_STRING_ENCAPSULATED + { + ASN1_ENCODE_INTEGER(kTestVal_24_Int); + } ASN1_END_ENCAPSULATED; } ASN1_END_SEQUENCE; diff --git a/src/lib/core/TLVData.h b/src/lib/core/TLVData.h index 343203783b0246..361474d7489029 100644 --- a/src/lib/core/TLVData.h +++ b/src/lib/core/TLVData.h @@ -37,49 +37,49 @@ * * @note Integral truncate would take the least significant bits, regardless of hardware endianness. */ -#define CHIP_TLV_GetLower32From64(v) ((uint32_t)(((uint64_t)(v) >> 0) & 0xFFFFFFFFUL)) +#define CHIP_TLV_GetLower32From64(v) ((uint32_t) (((uint64_t) (v) >> 0) & 0xFFFFFFFFUL)) /* * @brief Integral truncate argument X to the next least significant 32-bit * * @note Right bit shift gets rid of the least significant bits, regardless of hardware endianness. */ -#define CHIP_TLV_GetUpper32From64(v) ((uint32_t)(((uint64_t)(v) >> 32) & 0xFFFFFFFFUL)) +#define CHIP_TLV_GetUpper32From64(v) ((uint32_t) (((uint64_t) (v) >> 32) & 0xFFFFFFFFUL)) /* * @brief Integral truncate L to the least significant 16-bit * * @note Integral truncate would take the least significant bits, regardless of hardware endianness. */ -#define CHIP_TLV_GetLower16From32(v) ((uint16_t)(((uint32_t)(v) >> 0) & 0xFFFFU)) +#define CHIP_TLV_GetLower16From32(v) ((uint16_t) (((uint32_t) (v) >> 0) & 0xFFFFU)) /* * @brief Integral truncate argument X to the next least significant 16-bit * * @note Right bit shift gets rid of the least significant bits, regardless of hardware endianness. */ -#define CHIP_TLV_GetUpper16From32(v) ((uint16_t)(((uint32_t)(v) >> 16) & 0xFFFFU)) +#define CHIP_TLV_GetUpper16From32(v) ((uint16_t) (((uint32_t) (v) >> 16) & 0xFFFFU)) /* * @brief Integral truncate L to the least significant 8-bit * * @note Integral truncate would take the least significant bits, regardless of hardware endianness. */ -#define CHIP_TLV_GetLower8From16(v) ((uint8_t)(((uint16_t)(v) >> 0) & 0xFFU)) +#define CHIP_TLV_GetLower8From16(v) ((uint8_t) (((uint16_t) (v) >> 0) & 0xFFU)) /* * @brief Integral truncate argument X to the next least significant 8-bit * * @note Right bit shift gets rid of the least significant bits, regardless of hardware endianness. */ -#define CHIP_TLV_GetUpper8From16(v) ((uint8_t)(((uint16_t)(v) >> 8) & 0xFFU)) +#define CHIP_TLV_GetUpper8From16(v) ((uint8_t) (((uint16_t) (v) >> 8) & 0xFFU)) /* * @brief Integral truncate argument v to 8-bit * * @note Integral truncate would take the least significant bits, regardless of hardware endianness. */ -#define CHIP_TLV_Serialize8(v) ((uint8_t)(v)) +#define CHIP_TLV_Serialize8(v) ((uint8_t) (v)) /* * @brief Integral truncate argument v to 16-bit, and then serialize it using CHIP standard Little Endian order @@ -265,28 +265,28 @@ * @param TagSpec Should be filled with macros begin with CHIP_TLV_TAG_ * @param Value Would be first converted to (uint8_t), and then serialized */ -#define CHIP_TLV_UINT8(TagSpec, Value) chip::TLV::TLVElementType::UInt8 | TagSpec, CHIP_TLV_Serialize8((uint8_t)(Value)) +#define CHIP_TLV_UINT8(TagSpec, Value) chip::TLV::TLVElementType::UInt8 | TagSpec, CHIP_TLV_Serialize8((uint8_t) (Value)) /* * @brief Specifies a 16-bit Unsigned Integer TLV element * @param TagSpec Should be filled with macros begin with CHIP_TLV_TAG_ * @param Value Would be first converted to (uint16_t), and then serialized */ -#define CHIP_TLV_UINT16(TagSpec, Value) chip::TLV::TLVElementType::UInt16 | TagSpec, CHIP_TLV_Serialize16((uint16_t)(Value)) +#define CHIP_TLV_UINT16(TagSpec, Value) chip::TLV::TLVElementType::UInt16 | TagSpec, CHIP_TLV_Serialize16((uint16_t) (Value)) /* * @brief Specifies a 32-bit Unsigned Integer TLV element * @param TagSpec Should be filled with macros begin with CHIP_TLV_TAG_ * @param Value Would be first converted to (uint32_t), and then serialized */ -#define CHIP_TLV_UINT32(TagSpec, Value) chip::TLV::TLVElementType::UInt32 | TagSpec, CHIP_TLV_Serialize32((uint32_t)(Value)) +#define CHIP_TLV_UINT32(TagSpec, Value) chip::TLV::TLVElementType::UInt32 | TagSpec, CHIP_TLV_Serialize32((uint32_t) (Value)) /* * @brief Specifies a 64-bit Unsigned Integer TLV element * @param TagSpec Should be filled with macros begin with CHIP_TLV_TAG_ * @param Value Would be first converted to (uint64_t), and then serialized */ -#define CHIP_TLV_UINT64(TagSpec, Value) chip::TLV::TLVElementType::UInt64 | TagSpec, CHIP_TLV_Serialize64((uint64_t)(Value)) +#define CHIP_TLV_UINT64(TagSpec, Value) chip::TLV::TLVElementType::UInt64 | TagSpec, CHIP_TLV_Serialize64((uint64_t) (Value)) /** * @brief @@ -299,7 +299,7 @@ * @param ... Bytes representing the string characters to serialize */ #define CHIP_TLV_UTF8_STRING_1ByteLength(TagSpec, StringLength, ...) \ - chip::TLV::TLVElementType::UTF8String_1ByteLength | TagSpec, CHIP_TLV_Serialize8((uint8_t)(StringLength)), ##__VA_ARGS__ + chip::TLV::TLVElementType::UTF8String_1ByteLength | TagSpec, CHIP_TLV_Serialize8((uint8_t) (StringLength)), ##__VA_ARGS__ /** * @brief @@ -312,7 +312,7 @@ * @param ... Bytes representing the string characters to serialize */ #define CHIP_TLV_UTF8_STRING_2ByteLength(TagSpec, StringLength, ...) \ - chip::TLV::TLVElementType::UTF8String_2ByteLength | TagSpec, CHIP_TLV_Serialize16((uint16_t)(StringLength)), ##__VA_ARGS__ + chip::TLV::TLVElementType::UTF8String_2ByteLength | TagSpec, CHIP_TLV_Serialize16((uint16_t) (StringLength)), ##__VA_ARGS__ /** * @brief @@ -325,7 +325,7 @@ * @param ... Bytes representing the string characters to serialize */ #define CHIP_TLV_UTF8_STRING_4ByteLength(TagSpec, StringLength, ...) \ - chip::TLV::TLVElementType::UTF8String_4ByteLength | TagSpec, CHIP_TLV_Serialize32((uint32_t)(StringLength)), ##__VA_ARGS__ + chip::TLV::TLVElementType::UTF8String_4ByteLength | TagSpec, CHIP_TLV_Serialize32((uint32_t) (StringLength)), ##__VA_ARGS__ /** * @brief @@ -338,7 +338,7 @@ * @param ... Bytes representing the string characters to serialize */ #define CHIP_TLV_UTF8_STRING_8ByteLength(TagSpec, StringLength, ...) \ - chip::TLV::TLVElementType::UTF8String_8ByteLength | TagSpec, CHIP_TLV_Serialize64((uint64_t)(StringLength)), ##__VA_ARGS__ + chip::TLV::TLVElementType::UTF8String_8ByteLength | TagSpec, CHIP_TLV_Serialize64((uint64_t) (StringLength)), ##__VA_ARGS__ /** * @brief @@ -351,7 +351,7 @@ * @param ... Bytes to serialize */ #define CHIP_TLV_BYTE_STRING_1ByteLength(TagSpec, StringLength, ...) \ - chip::TLV::TLVElementType::ByteString_1ByteLength | TagSpec, CHIP_TLV_Serialize8((uint8_t)(StringLength)), ##__VA_ARGS__ + chip::TLV::TLVElementType::ByteString_1ByteLength | TagSpec, CHIP_TLV_Serialize8((uint8_t) (StringLength)), ##__VA_ARGS__ /** * @brief @@ -364,7 +364,7 @@ * @param ... Bytes to serialize */ #define CHIP_TLV_BYTE_STRING_2ByteLength(TagSpec, StringLength, ...) \ - chip::TLV::TLVElementType::ByteString_2ByteLength | TagSpec, CHIP_TLV_Serialize16((uint16_t)(StringLength)), ##__VA_ARGS__ + chip::TLV::TLVElementType::ByteString_2ByteLength | TagSpec, CHIP_TLV_Serialize16((uint16_t) (StringLength)), ##__VA_ARGS__ /** * @brief @@ -377,7 +377,7 @@ * @param ... Bytes to serialize */ #define CHIP_TLV_BYTE_STRING_4ByteLength(TagSpec, StringLength, ...) \ - chip::TLV::TLVElementType::ByteString_4ByteLength | TagSpec, CHIP_TLV_Serialize32((uint32_t)(StringLength)), ##__VA_ARGS__ + chip::TLV::TLVElementType::ByteString_4ByteLength | TagSpec, CHIP_TLV_Serialize32((uint32_t) (StringLength)), ##__VA_ARGS__ /** * @brief @@ -390,4 +390,4 @@ * @param ... Bytes to serialize */ #define CHIP_TLV_BYTE_STRING_8ByteLength(TagSpec, StringLength, ...) \ - chip::TLV::TLVElementType::ByteString_8ByteLength | TagSpec, CHIP_TLV_Serialize64((uint64_t)(StringLength)), ##__VA_ARGS__ + chip::TLV::TLVElementType::ByteString_8ByteLength | TagSpec, CHIP_TLV_Serialize64((uint64_t) (StringLength)), ##__VA_ARGS__ diff --git a/src/lib/core/TLVUtilities.cpp b/src/lib/core/TLVUtilities.cpp index 65a88a36bb18b2..6faf40b02be0ac 100644 --- a/src/lib/core/TLVUtilities.cpp +++ b/src/lib/core/TLVUtilities.cpp @@ -85,7 +85,7 @@ static CHIP_ERROR Iterate(TLVReader & aReader, size_t aDepth, IterateHandler aHa { const TLVType theType = aReader.GetType(); - ReturnErrorOnFailure((aHandler)(aReader, aDepth, aContext)); + ReturnErrorOnFailure((aHandler) (aReader, aDepth, aContext)); if (aRecurse && TLVTypeIsContainer(theType)) { diff --git a/src/lib/core/tests/TestOptional.cpp b/src/lib/core/tests/TestOptional.cpp index af4617856894c8..607829834a717f 100644 --- a/src/lib/core/tests/TestOptional.cpp +++ b/src/lib/core/tests/TestOptional.cpp @@ -64,10 +64,10 @@ struct CountMovable : public Count public: CountMovable(int i) : Count(i) {} - CountMovable(const CountMovable & o) = delete; + CountMovable(const CountMovable & o) = delete; CountMovable & operator=(const CountMovable &) = delete; - CountMovable(CountMovable && o) = default; + CountMovable(CountMovable && o) = default; CountMovable & operator=(CountMovable &&) = default; }; diff --git a/src/lib/dnssd/Discovery_ImplPlatform.h b/src/lib/dnssd/Discovery_ImplPlatform.h index 81db71c71b9c67..994112e9be1f8e 100644 --- a/src/lib/dnssd/Discovery_ImplPlatform.h +++ b/src/lib/dnssd/Discovery_ImplPlatform.h @@ -75,7 +75,7 @@ class DiscoveryImplPlatform : public ServiceAdvertiser, public Resolver DiscoveryImplPlatform() = default; - DiscoveryImplPlatform(const DiscoveryImplPlatform &) = delete; + DiscoveryImplPlatform(const DiscoveryImplPlatform &) = delete; DiscoveryImplPlatform & operator=(const DiscoveryImplPlatform &) = delete; CHIP_ERROR InitImpl(); diff --git a/src/lib/dnssd/minimal_mdns/Parser.h b/src/lib/dnssd/minimal_mdns/Parser.h index 879c6858a2912f..ed991ec2cf7ce0 100644 --- a/src/lib/dnssd/minimal_mdns/Parser.h +++ b/src/lib/dnssd/minimal_mdns/Parser.h @@ -29,7 +29,7 @@ class QueryData { public: QueryData() {} - QueryData(const QueryData &) = default; + QueryData(const QueryData &) = default; QueryData & operator=(const QueryData &) = default; QueryData(QType type, QClass klass, bool unicast) : mType(type), mClass(klass), mAnswerViaUnicast(unicast) {} @@ -77,7 +77,7 @@ class ResourceData public: ResourceData() {} - ResourceData(const ResourceData &) = default; + ResourceData(const ResourceData &) = default; ResourceData & operator=(const ResourceData &) = default; QType GetType() const { return mType; } diff --git a/src/lib/dnssd/minimal_mdns/core/DnsHeader.h b/src/lib/dnssd/minimal_mdns/core/DnsHeader.h index 5ab14837cc2702..86811b52abcf24 100644 --- a/src/lib/dnssd/minimal_mdns/core/DnsHeader.h +++ b/src/lib/dnssd/minimal_mdns/core/DnsHeader.h @@ -134,7 +134,7 @@ class HeaderRef : public ConstHeaderRef { public: HeaderRef(uint8_t * buffer) : ConstHeaderRef(buffer) {} - HeaderRef(const HeaderRef & other) = default; + HeaderRef(const HeaderRef & other) = default; HeaderRef & operator=(const HeaderRef & other) = default; HeaderRef & Clear() diff --git a/src/lib/dnssd/minimal_mdns/core/QName.h b/src/lib/dnssd/minimal_mdns/core/QName.h index e2dc6f54716f85..797ea55270e6a5 100644 --- a/src/lib/dnssd/minimal_mdns/core/QName.h +++ b/src/lib/dnssd/minimal_mdns/core/QName.h @@ -46,7 +46,7 @@ struct FullQName size_t nameCount; FullQName() : names(nullptr), nameCount(0) {} - FullQName(const FullQName &) = default; + FullQName(const FullQName &) = default; FullQName & operator=(const FullQName &) = default; template @@ -68,7 +68,7 @@ class SerializedQNameIterator { public: SerializedQNameIterator() : mLookBehindMax(0), mCurrentPosition(nullptr), mIsValid(false) {} - SerializedQNameIterator(const SerializedQNameIterator &) = default; + SerializedQNameIterator(const SerializedQNameIterator &) = default; SerializedQNameIterator & operator=(const SerializedQNameIterator &) = default; SerializedQNameIterator(const BytesRange validData, const uint8_t * position) : diff --git a/src/lib/dnssd/minimal_mdns/core/tests/TestFlatAllocatedQName.cpp b/src/lib/dnssd/minimal_mdns/core/tests/TestFlatAllocatedQName.cpp index 04cffc6bbc9c9a..eb523ac2c632ec 100644 --- a/src/lib/dnssd/minimal_mdns/core/tests/TestFlatAllocatedQName.cpp +++ b/src/lib/dnssd/minimal_mdns/core/tests/TestFlatAllocatedQName.cpp @@ -29,7 +29,7 @@ class AutoFreeBuffer AutoFreeBuffer(size_t n) { mBuffer = malloc(n); } ~AutoFreeBuffer() { free(mBuffer); } - AutoFreeBuffer(const AutoFreeBuffer &) = delete; + AutoFreeBuffer(const AutoFreeBuffer &) = delete; AutoFreeBuffer & operator=(const AutoFreeBuffer &) = delete; void * Buffer() { return mBuffer; } diff --git a/src/lib/dnssd/minimal_mdns/records/Srv.h b/src/lib/dnssd/minimal_mdns/records/Srv.h index 7587805313c141..e69b84cb1d2a2f 100644 --- a/src/lib/dnssd/minimal_mdns/records/Srv.h +++ b/src/lib/dnssd/minimal_mdns/records/Srv.h @@ -28,7 +28,7 @@ class SrvResourceRecord : public ResourceRecord SrvResourceRecord(const FullQName & qName, const FullQName & serverName, uint16_t port) : ResourceRecord(QType::SRV, qName), mServerName(serverName), mPort(port) {} - SrvResourceRecord(const SrvResourceRecord & other) = default; + SrvResourceRecord(const SrvResourceRecord & other) = default; SrvResourceRecord & operator=(const SrvResourceRecord & other) = default; FullQName GetServerName() const { return mServerName; } diff --git a/src/lib/dnssd/minimal_mdns/responders/QueryResponder.h b/src/lib/dnssd/minimal_mdns/responders/QueryResponder.h index e39bd32287e6ac..2027f12e1763b9 100644 --- a/src/lib/dnssd/minimal_mdns/responders/QueryResponder.h +++ b/src/lib/dnssd/minimal_mdns/responders/QueryResponder.h @@ -102,7 +102,7 @@ class QueryResponderRecordFilter public: /// Default contstructor accepts everything that is not null QueryResponderRecordFilter() {} - QueryResponderRecordFilter(const QueryResponderRecordFilter & other) = default; + QueryResponderRecordFilter(const QueryResponderRecordFilter & other) = default; QueryResponderRecordFilter & operator=(const QueryResponderRecordFilter & other) = default; /// Set if to include only items marked as 'additional reply' or everything. @@ -175,7 +175,7 @@ class QueryResponderIterator { SkipInvalid(); } - QueryResponderIterator(const QueryResponderIterator & other) = default; + QueryResponderIterator(const QueryResponderIterator & other) = default; QueryResponderIterator & operator=(const QueryResponderIterator & other) = default; QueryResponderIterator & operator++() diff --git a/src/lib/format/protocol_decoder.h b/src/lib/format/protocol_decoder.h index 3cf3cdb2183780..e8bfcb2980234e 100644 --- a/src/lib/format/protocol_decoder.h +++ b/src/lib/format/protocol_decoder.h @@ -45,7 +45,7 @@ class PayloadEntry kCommand, kEvent, }; - PayloadEntry(const PayloadEntry &) = default; + PayloadEntry(const PayloadEntry &) = default; PayloadEntry & operator=(const PayloadEntry &) = default; PayloadEntry() : mType(IMPayloadType::kNone), mName(""), mValue("") {} diff --git a/src/lib/format/tests/sample_data.cpp b/src/lib/format/tests/sample_data.cpp index 52bfb64a54c085..97361941249f2d 100644 --- a/src/lib/format/tests/sample_data.cpp +++ b/src/lib/format/tests/sample_data.cpp @@ -124,7 +124,7 @@ const uint8_t payload_1_5_multipress_event[] = { 0x15, 0x36, 0x02, 0x15, 0x35, 0 } // namespace const SamplePayload secure_channel_mrp_ack = { chip::Protocols::Id(VendorId::Common, 0), 16, - ByteSpan(payload_0_16, sizeof(payload_0_16)) }; + ByteSpan(payload_0_16, sizeof(payload_0_16)) }; const SamplePayload secure_channel_pkbdf_param_request = { chip::Protocols::Id(VendorId::Common, 0), 32, ByteSpan(payload_0_32) }; const SamplePayload secure_channel_pkbdf_param_response = { chip::Protocols::Id(VendorId::Common, 0), 33, ByteSpan(payload_0_33) }; const SamplePayload secure_channel_pase_pake1 = { chip::Protocols::Id(VendorId::Common, 0), 34, ByteSpan(payload_0_34) }; diff --git a/src/lib/shell/streamer_asr.cpp b/src/lib/shell/streamer_asr.cpp old mode 100755 new mode 100644 index dc5244c40ad7d8..2f850a3914c1ca --- a/src/lib/shell/streamer_asr.cpp +++ b/src/lib/shell/streamer_asr.cpp @@ -50,7 +50,7 @@ void shell_handle_uartirq(char ch) int streamer_asr_init(streamer_t * streamer) { (void) streamer; - duet_uart_set_callback(UART1_INDEX, (duet_uart_callback_func)(shell_handle_uartirq)); + duet_uart_set_callback(UART1_INDEX, (duet_uart_callback_func) (shell_handle_uartirq)); lega_rtos_init_queue(&hal_uart_buf_queue, "shell_buffer_queue", sizeof(char), HAL_UART_BUF_QUEUE_BYTES); return 0; } diff --git a/src/lib/shell/streamer_cc13x2_26x2.cpp b/src/lib/shell/streamer_cc13x2_26x2.cpp index 7e5aeeb57b0169..f6d256409dc492 100644 --- a/src/lib/shell/streamer_cc13x2_26x2.cpp +++ b/src/lib/shell/streamer_cc13x2_26x2.cpp @@ -105,7 +105,7 @@ streamer_t * streamer_get() return &streamer_cc13x2_26x2; } -#endif //#ifndef SHELL_STREAMER_APP_SPECIFIC +#endif // #ifndef SHELL_STREAMER_APP_SPECIFIC } // namespace Shell } // namespace chip diff --git a/src/lib/shell/streamer_cc13x4_26x4.cpp b/src/lib/shell/streamer_cc13x4_26x4.cpp index 259674a96e1fb7..079d50503fbfeb 100644 --- a/src/lib/shell/streamer_cc13x4_26x4.cpp +++ b/src/lib/shell/streamer_cc13x4_26x4.cpp @@ -103,7 +103,7 @@ streamer_t * streamer_get() return &streamer_cc13xx_26xx; } -#endif //#ifndef SHELL_STREAMER_APP_SPECIFIC +#endif // #ifndef SHELL_STREAMER_APP_SPECIFIC } // namespace Shell } // namespace chip diff --git a/src/lib/shell/streamer_mbed.cpp b/src/lib/shell/streamer_mbed.cpp index 07596580003580..89e783c6f9d379 100644 --- a/src/lib/shell/streamer_mbed.cpp +++ b/src/lib/shell/streamer_mbed.cpp @@ -56,7 +56,7 @@ streamer_t * streamer_get() return &streamer_stdio; } -#endif //#ifndef SHELL_STREAMER_APP_SPECIFIC +#endif // #ifndef SHELL_STREAMER_APP_SPECIFIC } // namespace Shell } // namespace chip diff --git a/src/lib/shell/streamer_mw320.cpp b/src/lib/shell/streamer_mw320.cpp index aef076cb705f01..35ee7b0cdd1573 100644 --- a/src/lib/shell/streamer_mw320.cpp +++ b/src/lib/shell/streamer_mw320.cpp @@ -104,4 +104,4 @@ streamer_t * streamer_get(void) } // namespace Shell } // namespace chip -#endif //#ifdef MW320_SHELL_STREAMER +#endif // #ifdef MW320_SHELL_STREAMER diff --git a/src/lib/shell/streamer_stdio.cpp b/src/lib/shell/streamer_stdio.cpp index 4e7be14e37f40c..88d904b45aa0fa 100644 --- a/src/lib/shell/streamer_stdio.cpp +++ b/src/lib/shell/streamer_stdio.cpp @@ -81,7 +81,7 @@ streamer_t * streamer_get() return &streamer_stdio; } -#endif //#ifndef SHELL_STREAMER_APP_SPECIFIC +#endif // #ifndef SHELL_STREAMER_APP_SPECIFIC } // namespace Shell } // namespace chip diff --git a/src/lib/support/BitFlags.h b/src/lib/support/BitFlags.h index 3d9d7e0ed18caf..ec64f19f5f9676 100644 --- a/src/lib/support/BitFlags.h +++ b/src/lib/support/BitFlags.h @@ -47,7 +47,7 @@ class BitFlags using IntegerType = StorageType; constexpr BitFlags() : mValue(0) {} - BitFlags(const BitFlags & other) = default; + BitFlags(const BitFlags & other) = default; BitFlags & operator=(const BitFlags &) = default; explicit BitFlags(FlagsEnum value) : mValue(static_cast(value)) {} diff --git a/src/lib/support/BufferWriter.h b/src/lib/support/BufferWriter.h index 351860e2fc20b0..64c22af21b43cf 100644 --- a/src/lib/support/BufferWriter.h +++ b/src/lib/support/BufferWriter.h @@ -37,7 +37,7 @@ class BufferWriter } } BufferWriter(MutableByteSpan buf) : BufferWriter(buf.data(), buf.size()) {} - BufferWriter(const BufferWriter & other) = default; + BufferWriter(const BufferWriter & other) = default; BufferWriter & operator=(const BufferWriter & other) = default; /// Append a null terminated string, exclude the null terminator @@ -141,7 +141,7 @@ class EndianBufferWriterBase : public BufferWriter protected: EndianBufferWriterBase(uint8_t * buf, size_t len) : BufferWriter(buf, len) {} EndianBufferWriterBase(MutableByteSpan buf) : BufferWriter(buf.data(), buf.size()) {} - EndianBufferWriterBase(const EndianBufferWriterBase & other) = default; + EndianBufferWriterBase(const EndianBufferWriterBase & other) = default; EndianBufferWriterBase & operator=(const EndianBufferWriterBase & other) = default; }; @@ -155,7 +155,7 @@ class BufferWriter : public EndianBufferWriterBase static_assert((-1 & 3) == 3, "LittleEndian::BufferWriter only works with 2's complement architectures."); } BufferWriter(MutableByteSpan buf) : EndianBufferWriterBase(buf) {} - BufferWriter(const BufferWriter & other) = default; + BufferWriter(const BufferWriter & other) = default; BufferWriter & operator=(const BufferWriter & other) = default; BufferWriter & EndianPut(uint64_t x, size_t size); BufferWriter & EndianPutSigned(int64_t x, size_t size); @@ -173,7 +173,7 @@ class BufferWriter : public EndianBufferWriterBase static_assert((-1 & 3) == 3, "BigEndian::BufferWriter only works with 2's complement architectures."); } BufferWriter(MutableByteSpan buf) : EndianBufferWriterBase(buf) {} - BufferWriter(const BufferWriter & other) = default; + BufferWriter(const BufferWriter & other) = default; BufferWriter & operator=(const BufferWriter & other) = default; BufferWriter & EndianPut(uint64_t x, size_t size); BufferWriter & EndianPutSigned(int64_t x, size_t size); diff --git a/src/lib/support/DefaultStorageKeyAllocator.h b/src/lib/support/DefaultStorageKeyAllocator.h index 65cd42c1a70063..6715f0298531f2 100644 --- a/src/lib/support/DefaultStorageKeyAllocator.h +++ b/src/lib/support/DefaultStorageKeyAllocator.h @@ -33,7 +33,7 @@ namespace chip { class StorageKeyName { public: - StorageKeyName(const StorageKeyName & other) = default; + StorageKeyName(const StorageKeyName & other) = default; StorageKeyName & operator=(const StorageKeyName & other) = default; ~StorageKeyName() { memset(mKeyNameBuffer, 0, sizeof(mKeyNameBuffer)); } diff --git a/src/lib/support/Defer.h b/src/lib/support/Defer.h index a576a60f139534..21c8ec904050f5 100644 --- a/src/lib/support/Defer.h +++ b/src/lib/support/Defer.h @@ -27,9 +27,9 @@ class Defer Defer(Function && function) : mFunction(std::move(function)) {} ~Defer() { mFunction(); } - Defer(Defer & that) = default; - Defer & operator=(Defer & that) = default; - Defer(Defer && that) = default; + Defer(Defer & that) = default; + Defer & operator=(Defer & that) = default; + Defer(Defer && that) = default; Defer & operator=(Defer && that) = default; private: diff --git a/src/lib/support/FixedBufferAllocator.h b/src/lib/support/FixedBufferAllocator.h index b3ebf98a9b2110..a87140a7be279b 100644 --- a/src/lib/support/FixedBufferAllocator.h +++ b/src/lib/support/FixedBufferAllocator.h @@ -86,7 +86,7 @@ class FixedBufferAllocator private: FixedBufferAllocator(const FixedBufferAllocator &) = delete; - void operator=(const FixedBufferAllocator &) = delete; + void operator=(const FixedBufferAllocator &) = delete; uint8_t * mBegin = nullptr; uint8_t * mEnd = nullptr; diff --git a/src/lib/support/IntrusiveList.h b/src/lib/support/IntrusiveList.h index 158c332b6965de..8bd0afb0daf71d 100644 --- a/src/lib/support/IntrusiveList.h +++ b/src/lib/support/IntrusiveList.h @@ -89,10 +89,10 @@ class IntrusiveListNodePrivateBase // Note: The copy construct/assignment is not provided because the list node state is not copyable. // The move construct/assignment is not provided because all modifications to the list shall go through the list object. - IntrusiveListNodePrivateBase(const IntrusiveListNodePrivateBase &) = delete; + IntrusiveListNodePrivateBase(const IntrusiveListNodePrivateBase &) = delete; IntrusiveListNodePrivateBase & operator=(const IntrusiveListNodePrivateBase &) = delete; IntrusiveListNodePrivateBase(IntrusiveListNodePrivateBase &&) = delete; - IntrusiveListNodePrivateBase & operator=(IntrusiveListNodePrivateBase &&) = delete; + IntrusiveListNodePrivateBase & operator=(IntrusiveListNodePrivateBase &&) = delete; bool IsInList() const { return (mPrev != nullptr && mNext != nullptr); } @@ -183,10 +183,10 @@ class IntrusiveListBase using difference_type = std::ptrdiff_t; using iterator_category = std::bidirectional_iterator_tag; - ConstIteratorBase(const ConstIteratorBase &) = default; - ConstIteratorBase(ConstIteratorBase &&) = default; + ConstIteratorBase(const ConstIteratorBase &) = default; + ConstIteratorBase(ConstIteratorBase &&) = default; ConstIteratorBase & operator=(const ConstIteratorBase &) = default; - ConstIteratorBase & operator=(ConstIteratorBase &&) = default; + ConstIteratorBase & operator=(ConstIteratorBase &&) = default; bool operator==(const ConstIteratorBase & that) const { return mCurrent == that.mCurrent; } bool operator!=(const ConstIteratorBase & that) const { return !(*this == that); } @@ -233,10 +233,10 @@ class IntrusiveListBase using difference_type = std::ptrdiff_t; using iterator_category = std::bidirectional_iterator_tag; - IteratorBase(const IteratorBase &) = default; - IteratorBase(IteratorBase &&) = default; + IteratorBase(const IteratorBase &) = default; + IteratorBase(IteratorBase &&) = default; IteratorBase & operator=(const IteratorBase &) = default; - IteratorBase & operator=(IteratorBase &&) = default; + IteratorBase & operator=(IteratorBase &&) = default; bool operator==(const IteratorBase & that) const { return mCurrent == that.mCurrent; } bool operator!=(const IteratorBase & that) const { return !(*this == that); } @@ -292,7 +292,7 @@ class IntrusiveListBase mNode.Remove(); } - IntrusiveListBase(const IntrusiveListBase &) = delete; + IntrusiveListBase(const IntrusiveListBase &) = delete; IntrusiveListBase & operator=(const IntrusiveListBase &) = delete; IntrusiveListBase(IntrusiveListBase && that) : mNode(&mNode, &mNode) { *this = std::move(that); } @@ -401,7 +401,7 @@ class IntrusiveList : public IntrusiveListBase public: IntrusiveList() : IntrusiveListBase() {} - IntrusiveList(IntrusiveList &&) = default; + IntrusiveList(IntrusiveList &&) = default; IntrusiveList & operator=(IntrusiveList &&) = default; class ConstIterator : public IntrusiveListBase::ConstIteratorBase diff --git a/src/lib/support/JniReferences.h b/src/lib/support/JniReferences.h index 5e323d93f46394..5886ae3f7b9b75 100644 --- a/src/lib/support/JniReferences.h +++ b/src/lib/support/JniReferences.h @@ -29,8 +29,8 @@ class JniReferences { public: // No copy, move or assignment. - JniReferences(const JniReferences &) = delete; - JniReferences(const JniReferences &&) = delete; + JniReferences(const JniReferences &) = delete; + JniReferences(const JniReferences &&) = delete; JniReferences & operator=(const JniReferences &) = delete; static JniReferences & GetInstance() diff --git a/src/lib/support/ReferenceCountedHandle.h b/src/lib/support/ReferenceCountedHandle.h index 726e780e2c698d..066e4d35486115 100644 --- a/src/lib/support/ReferenceCountedHandle.h +++ b/src/lib/support/ReferenceCountedHandle.h @@ -39,7 +39,7 @@ class ReferenceCountedHandle ReferenceCountedHandle(ReferenceCountedHandle && that) : mTarget(that.mTarget) { mTarget.Retain(); } ReferenceCountedHandle & operator=(const ReferenceCountedHandle & that) = delete; - ReferenceCountedHandle & operator=(ReferenceCountedHandle && that) = delete; + ReferenceCountedHandle & operator=(ReferenceCountedHandle && that) = delete; bool operator==(const ReferenceCountedHandle & that) const { return &mTarget == &that.mTarget; } bool operator!=(const ReferenceCountedHandle & that) const { return !(*this == that); } diff --git a/src/lib/support/ScopedBuffer.h b/src/lib/support/ScopedBuffer.h index 0158ad4acd0d5d..258b7f262935fb 100644 --- a/src/lib/support/ScopedBuffer.h +++ b/src/lib/support/ScopedBuffer.h @@ -47,7 +47,7 @@ class ScopedMemoryBufferBase { public: ScopedMemoryBufferBase() {} - ScopedMemoryBufferBase(const ScopedMemoryBufferBase &) = delete; + ScopedMemoryBufferBase(const ScopedMemoryBufferBase &) = delete; ScopedMemoryBufferBase & operator=(const ScopedMemoryBufferBase & other) = delete; ScopedMemoryBufferBase(ScopedMemoryBufferBase && other) { *this = std::move(other); } diff --git a/src/lib/support/logging/CHIPLogging.h b/src/lib/support/logging/CHIPLogging.h index ba13ac96f181ce..12b102f94c8f93 100644 --- a/src/lib/support/logging/CHIPLogging.h +++ b/src/lib/support/logging/CHIPLogging.h @@ -435,7 +435,7 @@ void HandleTokenizedLog(uint32_t levels, pw_tokenizer_Token token, pw_tokenizer_ if (chip::Logging::IsCategoryEnabled(CAT)) \ { \ PW_TOKENIZE_FORMAT_STRING(PW_TOKENIZER_DEFAULT_DOMAIN, UINT32_MAX, MSG, __VA_ARGS__); \ - ::chip::Logging::HandleTokenizedLog((uint32_t)((CAT << 8) | chip::Logging::kLogModule_##MOD), _pw_tokenizer_token, \ + ::chip::Logging::HandleTokenizedLog((uint32_t) ((CAT << 8) | chip::Logging::kLogModule_##MOD), _pw_tokenizer_token, \ PW_TOKENIZER_ARG_TYPES(__VA_ARGS__) PW_COMMA_ARGS(__VA_ARGS__)); \ } \ } while (0) diff --git a/src/lib/support/tests/TestJsonToTlvToJson.cpp b/src/lib/support/tests/TestJsonToTlvToJson.cpp index d494521b62537e..82edf02d3f6c3b 100644 --- a/src/lib/support/tests/TestJsonToTlvToJson.cpp +++ b/src/lib/support/tests/TestJsonToTlvToJson.cpp @@ -388,9 +388,9 @@ void TestConverter_Float_1third(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.Finalize()); - std::string jsonString = "{\n" - " \"100:FLOAT\" : 0.33333334\n" - "}\n"; + std::string jsonString = "{\n" + " \"100:FLOAT\" : 0.33333334\n" + "}\n"; std::string jsonExpected = "{\n" " \"100:FLOAT\" : 0.3333333432674408\n" "}\n"; @@ -414,9 +414,9 @@ void TestConverter_Float_17_9(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.Finalize()); - std::string jsonString = "{\n" - " \"101:FLOAT\" : 17.9\n" - "}\n"; + std::string jsonString = "{\n" + " \"101:FLOAT\" : 17.9\n" + "}\n"; std::string jsonExpected = "{\n" " \"101:FLOAT\" : 17.899999618530273\n" "}\n"; @@ -677,9 +677,9 @@ void TestConverter_Array_Empty_ImplicitProfileTag2(nlTestSuite * inSuite, void * NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.Finalize()); - std::string jsonString = "{\n" - " \"emptyarray:10000:ARRAY-?\" : []\n" - "}\n"; + std::string jsonString = "{\n" + " \"emptyarray:10000:ARRAY-?\" : []\n" + "}\n"; std::string jsonExpected = "{\n" " \"10000:ARRAY-?\" : []\n" "}\n"; @@ -867,18 +867,18 @@ void TestConverter_Array_IntsMinMax(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.Finalize()); - std::string jsonString = "{\n" - " \"0:ARRAY-INT\" : [\n" - " -128,\n" - " 127,\n" - " -32768,\n" - " 32767,\n" - " -2147483648,\n" - " 2147483647,\n" - " -9223372036854775808,\n" - " 9223372036854775807\n" - " ]\n" - "}\n"; + std::string jsonString = "{\n" + " \"0:ARRAY-INT\" : [\n" + " -128,\n" + " 127,\n" + " -32768,\n" + " 32767,\n" + " -2147483648,\n" + " 2147483647,\n" + " -9223372036854775808,\n" + " 9223372036854775807\n" + " ]\n" + "}\n"; std::string expectedString = "{\n" " \"0:ARRAY-INT\" : [\n" " -128,\n" @@ -950,14 +950,14 @@ void TestConverter_Array_UIntsMax(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.Finalize()); - std::string jsonString = "{\n" - " \"0:ARRAY-UINT\" : [\n" - " 255,\n" - " 65535,\n" - " 4294967295,\n" - " 18446744073709551615\n" - " ]\n" - "}\n"; + std::string jsonString = "{\n" + " \"0:ARRAY-UINT\" : [\n" + " 255,\n" + " 65535,\n" + " 4294967295,\n" + " 18446744073709551615\n" + " ]\n" + "}\n"; std::string expectedString = "{\n" " \"0:ARRAY-UINT\" : [\n" " 255,\n" @@ -991,13 +991,13 @@ void TestConverter_Array_Doubles(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.Finalize()); - std::string jsonString = "{\n" - " \"0:ARRAY-DOUBLE\" : [\n" - " 1.1,\n" - " 134.2763,\n" - " -12345.87\n" - " ]\n" - "}\n"; + std::string jsonString = "{\n" + " \"0:ARRAY-DOUBLE\" : [\n" + " 1.1,\n" + " 134.2763,\n" + " -12345.87\n" + " ]\n" + "}\n"; std::string expectedString = "{\n" " \"0:ARRAY-DOUBLE\" : [\n" " 1.1000000000000001,\n" @@ -1034,13 +1034,13 @@ void TestConverter_Array_Floats(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.Finalize()); - std::string jsonString = "{\n" - " \"1000:ARRAY-FLOAT\" : [\n" - " 1.1,\n" - " 134.2763,\n" - " -12345.87\n" - " ]\n" - "}\n"; + std::string jsonString = "{\n" + " \"1000:ARRAY-FLOAT\" : [\n" + " 1.1,\n" + " 134.2763,\n" + " -12345.87\n" + " ]\n" + "}\n"; std::string expectedString = "{\n" " \"1000:ARRAY-FLOAT\" : [\n" " 1.1000000238418579,\n" @@ -1169,11 +1169,11 @@ void TestConverter_Struct_UInt(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.Finalize()); - std::string jsonString = "{\n" - " \"value:0:STRUCT\" : {\n" - " \"name:255:UINT\" : 42\n" - " }\n" - "}\n"; + std::string jsonString = "{\n" + " \"value:0:STRUCT\" : {\n" + " \"name:255:UINT\" : 42\n" + " }\n" + "}\n"; std::string jsonExpected = "{\n" " \"0:STRUCT\" : {\n" " \"255:UINT\" : 42\n" @@ -1253,18 +1253,18 @@ void TestConverter_Struct_MixedElements(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.Finalize()); - std::string jsonString = "{\n" - " \"c:0:STRUCT\" : {\n" - " \"z:0:INT\" : 20,\n" - " \"b:1:BOOL\" : true,\n" - " \"2:UINT\" : 0,\n" - " \"abc:3:BYTES\" : \"VGVzdCBCeXRlU3RyaW5nIFZhbHVl\",\n" - " \"cc:4:STRING\" : \"hello\",\n" - " \"tt:5:INT\" : -500000,\n" - " \"AA:6:DOUBLE\" : 17.9,\n" - " \"B:7:FLOAT\" : 17.9\n" - " }\n" - "}\n"; + std::string jsonString = "{\n" + " \"c:0:STRUCT\" : {\n" + " \"z:0:INT\" : 20,\n" + " \"b:1:BOOL\" : true,\n" + " \"2:UINT\" : 0,\n" + " \"abc:3:BYTES\" : \"VGVzdCBCeXRlU3RyaW5nIFZhbHVl\",\n" + " \"cc:4:STRING\" : \"hello\",\n" + " \"tt:5:INT\" : -500000,\n" + " \"AA:6:DOUBLE\" : 17.9,\n" + " \"B:7:FLOAT\" : 17.9\n" + " }\n" + "}\n"; std::string expectedString = "{\n" " \"0:STRUCT\" : {\n" " \"0:INT\" : 20,\n" @@ -1332,30 +1332,30 @@ void TestConverter_Array_Structures(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.Finalize()); - std::string jsonString = "{\n" - " \"1000:ARRAY-STRUCT\": [\n" - " {\n" - " \"0:INT\" : 20,\n" - " \"1:BOOL\" : true,\n" - " \"2:UINT\" : 0,\n" - " \"3:BYTES\" : \"VGVzdCBCeXRlU3RyaW5nIFZhbHVlIDE=\",\n" - " \"4:STRING\" : \"hello1\",\n" - " \"5:INT\" : -500000,\n" - " \"6:DOUBLE\" : 17.9,\n" - " \"7:FLOAT\" : 17.9\n" - " },\n" - " {\n" - " \"0:INT\" : -10,\n" - " \"1:BOOL\" : false,\n" - " \"2:UINT\" : 128,\n" - " \"3:BYTES\" : \"VGVzdCBCeXRlU3RyaW5nIFZhbHVlIDI=\",\n" - " \"4:STRING\" : \"hello2\",\n" - " \"5:INT\" : \"40000000000\",\n" - " \"6:DOUBLE\" : -1754.923,\n" - " \"7:FLOAT\" : 97.945\n" - " }\n" - " ]\n" - "}\n"; + std::string jsonString = "{\n" + " \"1000:ARRAY-STRUCT\": [\n" + " {\n" + " \"0:INT\" : 20,\n" + " \"1:BOOL\" : true,\n" + " \"2:UINT\" : 0,\n" + " \"3:BYTES\" : \"VGVzdCBCeXRlU3RyaW5nIFZhbHVlIDE=\",\n" + " \"4:STRING\" : \"hello1\",\n" + " \"5:INT\" : -500000,\n" + " \"6:DOUBLE\" : 17.9,\n" + " \"7:FLOAT\" : 17.9\n" + " },\n" + " {\n" + " \"0:INT\" : -10,\n" + " \"1:BOOL\" : false,\n" + " \"2:UINT\" : 128,\n" + " \"3:BYTES\" : \"VGVzdCBCeXRlU3RyaW5nIFZhbHVlIDI=\",\n" + " \"4:STRING\" : \"hello2\",\n" + " \"5:INT\" : \"40000000000\",\n" + " \"6:DOUBLE\" : -1754.923,\n" + " \"7:FLOAT\" : 97.945\n" + " }\n" + " ]\n" + "}\n"; std::string expectedString = "{\n" " \"1000:ARRAY-STRUCT\": [\n" " {\n" @@ -1432,35 +1432,35 @@ void TestConverter_TopLevel_MixedElements(nlTestSuite * inSuite, void * inContex NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.Finalize()); - std::string jsonString = "{\n" - " \"value:0:INT\": 42,\n" - " \"value:1:BYTES\": \"VGVzdCBhcnJheSBtZW1iZXIgMA==\",\n" - " \"value:2:DOUBLE\": 156.398,\n" - " \"value:3:UINT\": \"73709551615\",\n" - " \"value:4:BOOL\": true,\n" - " \"value:5:NULL\": null,\n" - " \"value:6:STRUCT\": {\n" - " \"name:1:STRING\": \"John\",\n" - " \"age:2:UINT\": 34,\n" - " \"approved:3:BOOL\": true,\n" - " \"kids:4:ARRAY-INT\": [\n" - " 5,\n" - " 9,\n" - " 10\n" - " ],\n" - " \"names:5:ARRAY-STRING\": [\n" - " \"Ammy\",\n" - " \"David\",\n" - " \"Larry\"\n" - " ],\n" - " \"6:ARRAY-BOOL\": [\n" - " true,\n" - " false,\n" - " true\n" - " ]\n" - " },\n" - " \"value:7:FLOAT\": 0.0\n" - "}\n"; + std::string jsonString = "{\n" + " \"value:0:INT\": 42,\n" + " \"value:1:BYTES\": \"VGVzdCBhcnJheSBtZW1iZXIgMA==\",\n" + " \"value:2:DOUBLE\": 156.398,\n" + " \"value:3:UINT\": \"73709551615\",\n" + " \"value:4:BOOL\": true,\n" + " \"value:5:NULL\": null,\n" + " \"value:6:STRUCT\": {\n" + " \"name:1:STRING\": \"John\",\n" + " \"age:2:UINT\": 34,\n" + " \"approved:3:BOOL\": true,\n" + " \"kids:4:ARRAY-INT\": [\n" + " 5,\n" + " 9,\n" + " 10\n" + " ],\n" + " \"names:5:ARRAY-STRING\": [\n" + " \"Ammy\",\n" + " \"David\",\n" + " \"Larry\"\n" + " ],\n" + " \"6:ARRAY-BOOL\": [\n" + " true,\n" + " false,\n" + " true\n" + " ]\n" + " },\n" + " \"value:7:FLOAT\": 0.0\n" + "}\n"; std::string jsonExpected = "{\n" " \"0:INT\": 42,\n" " \"1:BYTES\": \"VGVzdCBhcnJheSBtZW1iZXIgMA==\",\n" @@ -1559,49 +1559,49 @@ void TestConverter_Structure_FromReadme(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType2)); NL_TEST_ASSERT(gSuite, CHIP_NO_ERROR == writer.EndContainer(containerType)); - std::string jsonString = "{\n" - " \"0:ARRAY-STRUCT\" : [\n" - " {\n" - " \"0:INT\" : 8,\n" - " \"1:BOOL\" : true\n" - " }\n" - " ],\n" - " \"1:STRUCT\" : {\n" - " \"0:INT\" : 12,\n" - " \"1:BOOL\" : false,\n" - " \"2:STRING\" : \"example\"\n" - " },\n" - " \"2:INT\" : \"40000000000\",\n" - " \"isQualified:3:BOOL\" : true,\n" - " \"4:ARRAY-?\" : [],\n" - " \"5:ARRAY-DOUBLE\" : [\n" - " 1.1000000000000001,\n" - " 134.27629999999999,\n" - " -12345.870000000001,\n" - " \"Infinity\",\n" - " 62534.0,\n" - " -62534.0\n" - " ],\n" - " \"6:ARRAY-BYTES\" : [\n" - " \"AAECAwQ=\",\n" - " \"/w==\",\n" - " \"Su+I\"\n" - " ],\n" - " \"7:BYTES\" : \"VGVzdCBCeXRlcw==\",\n" - " \"8:DOUBLE\" : 17.899999999999999,\n" - " \"9:FLOAT\" : 17.899999618530273,\n" - " \"10:FLOAT\" : \"-Infinity\",\n" - " \"contact:11:STRUCT\" : {\n" - " \"name:1:STRING\" : \"John\",\n" - " \"age:2:UINT\" : 34,\n" - " \"approved:3:BOOL\" : true,\n" - " \"kids:4:ARRAY-INT\" : [\n" - " 5,\n" - " 9,\n" - " 10\n" - " ]\n" - " }\n" - "}\n"; + std::string jsonString = "{\n" + " \"0:ARRAY-STRUCT\" : [\n" + " {\n" + " \"0:INT\" : 8,\n" + " \"1:BOOL\" : true\n" + " }\n" + " ],\n" + " \"1:STRUCT\" : {\n" + " \"0:INT\" : 12,\n" + " \"1:BOOL\" : false,\n" + " \"2:STRING\" : \"example\"\n" + " },\n" + " \"2:INT\" : \"40000000000\",\n" + " \"isQualified:3:BOOL\" : true,\n" + " \"4:ARRAY-?\" : [],\n" + " \"5:ARRAY-DOUBLE\" : [\n" + " 1.1000000000000001,\n" + " 134.27629999999999,\n" + " -12345.870000000001,\n" + " \"Infinity\",\n" + " 62534.0,\n" + " -62534.0\n" + " ],\n" + " \"6:ARRAY-BYTES\" : [\n" + " \"AAECAwQ=\",\n" + " \"/w==\",\n" + " \"Su+I\"\n" + " ],\n" + " \"7:BYTES\" : \"VGVzdCBCeXRlcw==\",\n" + " \"8:DOUBLE\" : 17.899999999999999,\n" + " \"9:FLOAT\" : 17.899999618530273,\n" + " \"10:FLOAT\" : \"-Infinity\",\n" + " \"contact:11:STRUCT\" : {\n" + " \"name:1:STRING\" : \"John\",\n" + " \"age:2:UINT\" : 34,\n" + " \"approved:3:BOOL\" : true,\n" + " \"kids:4:ARRAY-INT\" : [\n" + " 5,\n" + " 9,\n" + " 10\n" + " ]\n" + " }\n" + "}\n"; std::string jsonExpected = "{\n" " \"0:ARRAY-STRUCT\" : [\n" " {\n" diff --git a/src/lib/support/tests/TestTlvToJson.cpp b/src/lib/support/tests/TestTlvToJson.cpp index 5e4bb77cb9ef13..36231be5020c60 100644 --- a/src/lib/support/tests/TestTlvToJson.cpp +++ b/src/lib/support/tests/TestTlvToJson.cpp @@ -141,8 +141,8 @@ void TestConverter(nlTestSuite * inSuite, void * inContext) CharSpan charSpan = CharSpan::fromCharString("hello"); jsonString = "{\n" - " \"1:STRING\" : \"hello\"\n" - "}\n"; + " \"1:STRING\" : \"hello\"\n" + "}\n"; EncodeAndValidate(charSpan, jsonString); // Validated using https://base64.guru/converter/encode/hex diff --git a/src/lib/support/tests/TestVariant.cpp b/src/lib/support/tests/TestVariant.cpp index 3360251453359a..54adee04363b8b 100644 --- a/src/lib/support/tests/TestVariant.cpp +++ b/src/lib/support/tests/TestVariant.cpp @@ -43,10 +43,10 @@ struct Movable { Movable(int v1, int v2) : m1(v1), m2(v2) {} - Movable(Movable &) = delete; + Movable(Movable &) = delete; Movable & operator=(Movable &) = delete; - Movable(Movable &&) = default; + Movable(Movable &&) = default; Movable & operator=(Movable &&) = default; int m1; diff --git a/src/lwip/cc13xx_26xx/arch/cc.h b/src/lwip/cc13xx_26xx/arch/cc.h index d4a265e590914c..3d8de7fd3bef27 100644 --- a/src/lwip/cc13xx_26xx/arch/cc.h +++ b/src/lwip/cc13xx_26xx/arch/cc.h @@ -37,7 +37,7 @@ #include -//#include "app_error.h" +// #include "app_error.h" #if __cplusplus extern "C" { diff --git a/src/lwip/cc32xx/arch/cc.h b/src/lwip/cc32xx/arch/cc.h index 91174cc16f219e..960345845ea92e 100644 --- a/src/lwip/cc32xx/arch/cc.h +++ b/src/lwip/cc32xx/arch/cc.h @@ -38,7 +38,7 @@ #include -//#include "app_error.h" +// #include "app_error.h" #if __cplusplus extern "C" { diff --git a/src/lwip/mt793x/arch/cc.h b/src/lwip/mt793x/arch/cc.h index dea2a5c640177b..6667304f025172 100644 --- a/src/lwip/mt793x/arch/cc.h +++ b/src/lwip/mt793x/arch/cc.h @@ -48,7 +48,7 @@ #define LWIP_PLATFORM_BYTESWAP 0 /** @todo fix some warnings: don't use #pragma if compiling with cygwin gcc */ -//#ifndef __GNUC__ +// #ifndef __GNUC__ #if (!defined(__ICCARM__)) && (!defined(__GNUC__)) && (!defined(__CC_ARM)) #include #pragma warning(disable : 4244) /* disable conversion warning (implicit integer promotion!) */ @@ -57,7 +57,7 @@ #pragma warning(disable : 4103) /* structure packing changed by including file */ #endif -//#define LWIP_PROVIDE_ERRNO +// #define LWIP_PROVIDE_ERRNO #if (!defined(__CC_ARM)) && (!defined(__ICCARM__)) #define LWIP_TIMEVAL_PRIVATE 0 @@ -91,7 +91,7 @@ typedef u32_t sys_prot_t; #define PACK_STRUCT_STRUCT __attribute__((packed)) #endif -//#define LWIP_DEBUG_USE_PRINTF +// #define LWIP_DEBUG_USE_PRINTF #ifdef LWIP_DEBUG_USE_PRINTF /* Plaform specific diagnostic output */ @@ -101,7 +101,7 @@ typedef u32_t sys_prot_t; printf x; \ } while (0) #else -//#define LWIP_PLATFORM_DIAG(x) do { LWIP_LOGI x; } while(0) +// #define LWIP_PLATFORM_DIAG(x) do { LWIP_LOGI x; } while(0) void filogic_log_print(const char * fmt, ...); #define LWIP_PLATFORM_DIAG(x) \ do \ @@ -163,7 +163,7 @@ void filogic_log_print(const char * fmt, ...); #endif /* C runtime functions redefined */ -//#define snprintf _snprintf //2015-07-22 Cheng Liu @132663 +// #define snprintf _snprintf //2015-07-22 Cheng Liu @132663 u32_t dns_lookup_external_hosts_file(const char * name); diff --git a/src/lwip/mt793x/lwipopts.h b/src/lwip/mt793x/lwipopts.h index 36971e36231f11..903ce139c556bd 100644 --- a/src/lwip/mt793x/lwipopts.h +++ b/src/lwip/mt793x/lwipopts.h @@ -176,7 +176,7 @@ a lot of data that needs to be copied, this should be set high. */ #define PBUF_POOL_SIZE 10 /* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */ -//#define PBUF_POOL_BUFSIZE 1536 +// #define PBUF_POOL_BUFSIZE 1536 /* packet of MT7687 IOT has extra TXD header and packet offset */ #define PBUF_POOL_BUFSIZE 1664 diff --git a/src/lwip/standalone/sys_arch.c b/src/lwip/standalone/sys_arch.c index 3db0da06974c10..98fd9b7e619361 100644 --- a/src/lwip/standalone/sys_arch.c +++ b/src/lwip/standalone/sys_arch.c @@ -581,7 +581,7 @@ u32_t sys_now(void) u32_t msec; gettimeofday(&tv, NULL); - msec = (u32_t)((tv.tv_sec - starttime.tv_sec) * 1000 + (tv.tv_usec - starttime.tv_usec) / 1000); + msec = (u32_t) ((tv.tv_sec - starttime.tv_sec) * 1000 + (tv.tv_usec - starttime.tv_usec) / 1000); return msec; } diff --git a/src/messaging/ExchangeMgr.h b/src/messaging/ExchangeMgr.h index c21c0d040de4c5..48c6f8df673fb6 100644 --- a/src/messaging/ExchangeMgr.h +++ b/src/messaging/ExchangeMgr.h @@ -54,7 +54,7 @@ class DLL_EXPORT ExchangeManager : public SessionMessageDelegate public: ExchangeManager(); - ExchangeManager(const ExchangeManager &) = delete; + ExchangeManager(const ExchangeManager &) = delete; ExchangeManager operator=(const ExchangeManager &) = delete; /** diff --git a/src/platform/ASR/BLEAppSvc.cpp b/src/platform/ASR/BLEAppSvc.cpp index 0b9735ba60afd4..124a58a3c5a188 100644 --- a/src/platform/ASR/BLEAppSvc.cpp +++ b/src/platform/ASR/BLEAppSvc.cpp @@ -67,26 +67,26 @@ ble_gatt_att_reg_t matter_csvc_atts[CSVC_IDX_NB] = { // ATT_DECL_CHARACTERISTIC (Write) [CSVC_IDX_RX_CHAR] = { { { 0X03, 0X28, 0 }, PRD_NA, 0, 0 }, { 0, 0 } }, [CSVC_IDX_RX_VAL] = { { { 0x11, 0x9D, 0x9F, 0x42, 0x9C, 0x4F, 0x9F, 0x95, 0x59, 0x45, 0x3D, 0x26, 0xF5, 0x2E, 0xEE, 0x18 }, - PWR_NA, - 247, - PRI | SONATA_PERM(UUID_LEN, UUID_128) }, - { matter_rx_char_write_cb, 0 } }, + PWR_NA, + 247, + PRI | SONATA_PERM(UUID_LEN, UUID_128) }, + { matter_rx_char_write_cb, 0 } }, // ATT_DECL_CHARACTERISTIC (Read,Notify) [CSVC_IDX_TX_CHAR] = { { { 0X03, 0X28, 0 }, PRD_NA, 0, 0 }, { 0, 0 } }, [CSVC_IDX_TX_VAL] = { { { 0x12, 0x9D, 0x9F, 0x42, 0x9C, 0x4F, 0x9F, 0x95, 0x59, 0x45, 0x3D, 0x26, 0xF5, 0x2E, 0xEE, 0x18 }, - PRD_NA | PNTF_NA | PIND_NA, - 247, - SONATA_PERM(UUID_LEN, UUID_128) }, - { 0, 0 } }, + PRD_NA | PNTF_NA | PIND_NA, + 247, + SONATA_PERM(UUID_LEN, UUID_128) }, + { 0, 0 } }, [CSVC_IDX_TX_CFG] = { { { 0X02, 0X29, 0 }, PRD_NA | PWR_NA, 2, PRI }, { matter_tx_CCCD_write_cb, matter_tx_CCCD_read_cb } }, #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING [CSVC_IDX_C3_CHAR] = { { { 0X03, 0X28, 0 }, PRD_NA, 0, 0 }, { 0, 0 } }, [CSVC_IDX_C3_VAL] = { { { 0x04, 0x8F, 0x21, 0x83, 0x8A, 0x74, 0x7D, 0xB8, 0xF2, 0x45, 0x72, 0x87, 0x38, 0x02, 0x63, 0x64 }, - PRD_NA, - 512, - PRI | SONATA_PERM(UUID_LEN, UUID_128) }, - { 0, matter_c3_char_read_cb } }, + PRD_NA, + 512, + PRI | SONATA_PERM(UUID_LEN, UUID_128) }, + { 0, matter_c3_char_read_cb } }, #endif }; /* diff --git a/src/platform/ASR/CHIPDevicePlatformEvent.h b/src/platform/ASR/CHIPDevicePlatformEvent.h old mode 100755 new mode 100644 index b222ec17308236..8c8056135ef4a8 --- a/src/platform/ASR/CHIPDevicePlatformEvent.h +++ b/src/platform/ASR/CHIPDevicePlatformEvent.h @@ -24,8 +24,7 @@ namespace chip { namespace DeviceLayer { -namespace DeviceEventType { -} // namespace DeviceEventType +namespace DeviceEventType {} // namespace DeviceEventType /** * Represents platform-specific event information for the ASR platform. diff --git a/src/platform/ASR/NetworkCommissioningDriver.h b/src/platform/ASR/NetworkCommissioningDriver.h index 7fc9e0c10b49ad..5a028042d88d1a 100644 --- a/src/platform/ASR/NetworkCommissioningDriver.h +++ b/src/platform/ASR/NetworkCommissioningDriver.h @@ -56,7 +56,7 @@ class ASRScanResponseIterator : public Iterator // copy the available information into WiFiScanResponse struct, which will be copied to the result to be sent item.security.SetRaw(mpScanResults->ap_list[mIternum].security); item.ssidLen = static_cast(strnlen(reinterpret_cast(mpScanResults->ap_list[mIternum].ssid), - chip::DeviceLayer::Internal::kMaxWiFiSSIDLength)); + chip::DeviceLayer::Internal::kMaxWiFiSSIDLength)); item.channel = mpScanResults->ap_list[mIternum].channel; item.wiFiBand = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4; item.rssi = mpScanResults->ap_list[mIternum].ap_power; diff --git a/src/platform/ASR/NetworkCommissioningWiFiDriver.cpp b/src/platform/ASR/NetworkCommissioningWiFiDriver.cpp index a3cdc40dcbae4e..b63cda26d5dc02 100644 --- a/src/platform/ASR/NetworkCommissioningWiFiDriver.cpp +++ b/src/platform/ASR/NetworkCommissioningWiFiDriver.cpp @@ -170,7 +170,7 @@ void ASRWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callbac VerifyOrExit(mpConnectCallback == nullptr, networkingStatus = Status::kUnknownError); ChipLogProgress(NetworkProvisioning, "ASR NetworkCommissioningDelegate: SSID: %s", StringOrNullMarker(mStagingNetwork.ssid)); err = ConnectWiFiNetwork(reinterpret_cast(mStagingNetwork.ssid), mStagingNetwork.ssidLen, - reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); + reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); mpConnectCallback = callback; exit: if (err != CHIP_NO_ERROR) diff --git a/src/platform/Ameba/BLEManagerImpl.cpp b/src/platform/Ameba/BLEManagerImpl.cpp index b45c314446e095..969febfffb5842 100644 --- a/src/platform/Ameba/BLEManagerImpl.cpp +++ b/src/platform/Ameba/BLEManagerImpl.cpp @@ -54,7 +54,7 @@ #include "rtk_coex.h" #include "trace_app.h" #include "wifi_conf.h" -//#include "complete_ble_service.h" +// #include "complete_ble_service.h" #include "app_msg.h" #endif /******************************************************************************* @@ -153,11 +153,11 @@ CHIP_ERROR BLEManagerImpl::_Init() VerifyOrExit(!mFlags.Has(Flags::kAMEBABLEStackInitialized), err = CHIP_ERROR_INCORRECT_STATE); #if defined(CONFIG_MATTER_BLEMGR_ADAPTER) && CONFIG_MATTER_BLEMGR_ADAPTER - matter_blemgr_set_callback_func((matter_blemgr_callback)(matter_blemgr_callback_dispatcher), this); + matter_blemgr_set_callback_func((matter_blemgr_callback) (matter_blemgr_callback_dispatcher), this); err = MapBLEError(matter_blemgr_init()); #else err = MapBLEError(bt_matter_adapter_init()); - chip_blemgr_set_callback_func((chip_blemgr_callback)(ble_callback_dispatcher), this); + chip_blemgr_set_callback_func((chip_blemgr_callback) (ble_callback_dispatcher), this); #endif SuccessOrExit(err); @@ -214,8 +214,8 @@ void BLEManagerImpl::HandleTXCharCCCDWrite(int conn_id, int indicationsEnabled, // whether the client is enabling or disabling indications. { ChipDeviceEvent event; - event.Type = (indicationsEnabled || notificationsEnabled) ? DeviceEventType::kCHIPoBLESubscribe - : DeviceEventType::kCHIPoBLEUnsubscribe; + event.Type = (indicationsEnabled || notificationsEnabled) ? DeviceEventType::kCHIPoBLESubscribe + : DeviceEventType::kCHIPoBLEUnsubscribe; event.CHIPoBLESubscribe.ConId = conn_id; PlatformMgr().PostEventOrDie(&event); } diff --git a/src/platform/Ameba/CHIPDevicePlatformConfig.h b/src/platform/Ameba/CHIPDevicePlatformConfig.h index 9a447727d3c438..04d510c8f54c31 100644 --- a/src/platform/Ameba/CHIPDevicePlatformConfig.h +++ b/src/platform/Ameba/CHIPDevicePlatformConfig.h @@ -69,4 +69,4 @@ #define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART 0 #define CONFIG_RENDEZVOUS_MODE 6 #define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE 1 -//#define CHIP_DEVICE_CONFIG_UNIQUE_ID "00112233445566778899AABBCCDDEEFF" +// #define CHIP_DEVICE_CONFIG_UNIQUE_ID "00112233445566778899AABBCCDDEEFF" diff --git a/src/platform/Ameba/ConnectivityManagerImpl.cpp b/src/platform/Ameba/ConnectivityManagerImpl.cpp index 61bd22281513ef..28618f99079614 100644 --- a/src/platform/Ameba/ConnectivityManagerImpl.cpp +++ b/src/platform/Ameba/ConnectivityManagerImpl.cpp @@ -80,7 +80,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init() mFlags.SetRaw(0); // Set callback functions from chip_porting - chip_connmgr_set_callback_func((chip_connmgr_callback)(conn_callback_dispatcher), this); + chip_connmgr_set_callback_func((chip_connmgr_callback) (conn_callback_dispatcher), this); // Register WiFi event handlers wifi_reg_event_handler(WIFI_EVENT_CONNECT, ConnectivityManagerImpl::RtkWiFiStationConnectedHandler, NULL); diff --git a/src/platform/Ameba/NetworkCommissioningWiFiDriver.cpp b/src/platform/Ameba/NetworkCommissioningWiFiDriver.cpp index 914e4f337f6688..7d7b1ade12847d 100644 --- a/src/platform/Ameba/NetworkCommissioningWiFiDriver.cpp +++ b/src/platform/Ameba/NetworkCommissioningWiFiDriver.cpp @@ -182,7 +182,7 @@ void AmebaWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callb ChipLogProgress(NetworkProvisioning, "Ameba NetworkCommissioningDelegate: SSID: %s", mStagingNetwork.ssid); err = ConnectWiFiNetwork(reinterpret_cast(mStagingNetwork.ssid), mStagingNetwork.ssidLen, - reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); + reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); mpConnectCallback = callback; exit: if (err != CHIP_NO_ERROR) diff --git a/src/platform/Beken/BLEManagerImpl.cpp b/src/platform/Beken/BLEManagerImpl.cpp index 569aef135a8870..3437a16acfdb79 100644 --- a/src/platform/Beken/BLEManagerImpl.cpp +++ b/src/platform/Beken/BLEManagerImpl.cpp @@ -83,14 +83,15 @@ static const uint8_t _svc_uuid[16] = { 0xF6, 0xFF, 0, 0, 0x0, 0x0, 0, 0, { \ 0x11, 0x9D, 0x9F, 0x42, 0x9C, 0x4F, 0x9F, 0x95, 0x59, 0x45, 0x3D, 0x26, 0xF5, 0x2E, 0xEE, 0x18 \ } -//#define UUID_CHIPoBLECharact_RX { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42, 0x9F, 0x9D, 0x11 -//} +// #define UUID_CHIPoBLECharact_RX { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42, 0x9F, 0x9D, +// 0x11 +// } #define ChipUUID_CHIPoBLECharact_TX \ { \ 0x12, 0x9D, 0x9F, 0x42, 0x9C, 0x4F, 0x9F, 0x95, 0x59, 0x45, 0x3D, 0x26, 0xF5, 0x2E, 0xEE, 0x18 \ } -//#define ChipUUID_CHIPoBLECharact_TX { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42, 0x9F, 0x9D, -// 0x12 } +// #define ChipUUID_CHIPoBLECharact_TX { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42, 0x9F, 0x9D, +// 0x12 } #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING #define UUID_CHIPoBLEChar_C3 \ { \ @@ -268,8 +269,8 @@ void BLEManagerImpl::HandleTXCharCCCDWrite(int conn_id, int notificationsEnabled // whether the client is enabling or disabling indications. { ChipDeviceEvent event; - event.Type = (indicationsEnabled || notificationsEnabled) ? DeviceEventType::kCHIPoBLESubscribe - : DeviceEventType::kCHIPoBLEUnsubscribe; + event.Type = (indicationsEnabled || notificationsEnabled) ? DeviceEventType::kCHIPoBLESubscribe + : DeviceEventType::kCHIPoBLEUnsubscribe; event.CHIPoBLESubscribe.ConId = conn_id; PlatformMgr().PostEventOrDie(&event); } diff --git a/src/platform/Beken/CHIPMem-Platform.cpp b/src/platform/Beken/CHIPMem-Platform.cpp index 09830b5d5d9a4e..17bc87f8e2b927 100644 --- a/src/platform/Beken/CHIPMem-Platform.cpp +++ b/src/platform/Beken/CHIPMem-Platform.cpp @@ -23,7 +23,7 @@ * */ -//#include +// #include #include "matter_pal.h" #include #include diff --git a/src/platform/Beken/NetworkCommissioningWiFiDriver.cpp b/src/platform/Beken/NetworkCommissioningWiFiDriver.cpp index 94f8b4e9110ef2..9a8c111100ed04 100644 --- a/src/platform/Beken/NetworkCommissioningWiFiDriver.cpp +++ b/src/platform/Beken/NetworkCommissioningWiFiDriver.cpp @@ -185,7 +185,7 @@ void BekenWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callb VerifyOrExit(mpConnectCallback == nullptr, networkingStatus = Status::kUnknownError); err = ConnectWiFiNetwork(reinterpret_cast(mStagingNetwork.ssid), mStagingNetwork.ssidLen, - reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); + reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); mpConnectCallback = callback; exit: if (err != CHIP_NO_ERROR) diff --git a/src/platform/Darwin/DnssdHostNameRegistrar.h b/src/platform/Darwin/DnssdHostNameRegistrar.h index 68de1407298dfb..7071f573df99fa 100644 --- a/src/platform/Darwin/DnssdHostNameRegistrar.h +++ b/src/platform/Darwin/DnssdHostNameRegistrar.h @@ -46,7 +46,8 @@ namespace Dnssd { private: bool IsLocalOnly() const { return mInterfaceId == kDNSServiceInterfaceIndexLocalOnly; }; - template void RegisterInterfaces(std::vector> interfaces, uint16_t type) + template + void RegisterInterfaces(std::vector> interfaces, uint16_t type) { for (auto & interface : interfaces) { auto interfaceId = interface.first; @@ -55,7 +56,8 @@ namespace Dnssd { } } - template CHIP_ERROR RegisterInterface(uint32_t interfaceId, const T & interfaceAddress, uint16_t type) + template + CHIP_ERROR RegisterInterface(uint32_t interfaceId, const T & interfaceAddress, uint16_t type) { auto interfaceAddressLen = sizeof(interfaceAddress); diff --git a/src/platform/Darwin/DnssdImpl.h b/src/platform/Darwin/DnssdImpl.h index 7bd6cdba8a7008..69ed0859b01f38 100644 --- a/src/platform/Darwin/DnssdImpl.h +++ b/src/platform/Darwin/DnssdImpl.h @@ -63,7 +63,7 @@ struct ResolveContext; class MdnsContexts { public: - MdnsContexts(const MdnsContexts &) = delete; + MdnsContexts(const MdnsContexts &) = delete; MdnsContexts & operator=(const MdnsContexts &) = delete; ~MdnsContexts(); static MdnsContexts & GetInstance() { return sInstance.get(); } diff --git a/src/platform/DeviceSafeQueue.h b/src/platform/DeviceSafeQueue.h index 6591a179409482..b7c339c83ab89f 100644 --- a/src/platform/DeviceSafeQueue.h +++ b/src/platform/DeviceSafeQueue.h @@ -58,7 +58,7 @@ class DeviceSafeQueue std::queue mEventQueue; std::mutex mEventQueueLock; - DeviceSafeQueue(const DeviceSafeQueue &) = delete; + DeviceSafeQueue(const DeviceSafeQueue &) = delete; DeviceSafeQueue & operator=(const DeviceSafeQueue &) = delete; }; diff --git a/src/platform/ESP32/ChipDeviceScanner.h b/src/platform/ESP32/ChipDeviceScanner.h index 8856dd3d160629..a7718d09a8188f 100644 --- a/src/platform/ESP32/ChipDeviceScanner.h +++ b/src/platform/ESP32/ChipDeviceScanner.h @@ -64,8 +64,8 @@ class ChipDeviceScannerDelegate class ChipDeviceScanner { public: - ChipDeviceScanner(ChipDeviceScanner &&) = delete; - ChipDeviceScanner(const ChipDeviceScanner &) = delete; + ChipDeviceScanner(ChipDeviceScanner &&) = delete; + ChipDeviceScanner(const ChipDeviceScanner &) = delete; ChipDeviceScanner & operator=(const ChipDeviceScanner &) = delete; ~ChipDeviceScanner() = default; diff --git a/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp b/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp index b18ca5d9e7b997..06c95b3b45f153 100644 --- a/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp +++ b/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp @@ -91,12 +91,12 @@ const uint8_t UUID_PrimaryService[] = { 0x00, 0x28 }; const uint8_t UUID_CharDecl[] = { 0x03, 0x28 }; const uint8_t UUID_ClientCharConfigDesc[] = { 0x02, 0x29 }; const uint8_t UUID_CHIPoBLEService[] = { 0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80, - 0x00, 0x10, 0x00, 0x00, 0xF6, 0xFF, 0x00, 0x00 }; + 0x00, 0x10, 0x00, 0x00, 0xF6, 0xFF, 0x00, 0x00 }; const uint8_t ShortUUID_CHIPoBLEService[] = { 0xF6, 0xFF }; const uint8_t UUID_CHIPoBLEChar_RX[] = { 0x11, 0x9D, 0x9F, 0x42, 0x9C, 0x4F, 0x9F, 0x95, - 0x59, 0x45, 0x3D, 0x26, 0xF5, 0x2E, 0xEE, 0x18 }; + 0x59, 0x45, 0x3D, 0x26, 0xF5, 0x2E, 0xEE, 0x18 }; const uint8_t UUID_CHIPoBLEChar_TX[] = { 0x12, 0x9D, 0x9F, 0x42, 0x9C, 0x4F, 0x9F, 0x95, - 0x59, 0x45, 0x3D, 0x26, 0xF5, 0x2E, 0xEE, 0x18 }; + 0x59, 0x45, 0x3D, 0x26, 0xF5, 0x2E, 0xEE, 0x18 }; #if CONFIG_ENABLE_ESP32_BLE_CONTROLLER const uint8_t ShortUUID_CHIPoBLE_CharTx_Desc[] = { 0x02, 0x29 }; #endif diff --git a/src/platform/ESP32/route_hook/ESP32RouteHook.c b/src/platform/ESP32/route_hook/ESP32RouteHook.c index f19cf59ebf90b2..d02c3d6eec0db0 100644 --- a/src/platform/ESP32/route_hook/ESP32RouteHook.c +++ b/src/platform/ESP32/route_hook/ESP32RouteHook.c @@ -59,12 +59,12 @@ static void ra_recv_handler(struct netif * netif, const uint8_t * icmp_payload, return; } icmp_payload += sizeof(struct ra_header); - payload_len = (uint16_t)(payload_len - sizeof(struct ra_header)); + payload_len = (uint16_t) (payload_len - sizeof(struct ra_header)); while (payload_len >= 2) { uint8_t opt_type = icmp_payload[0]; - uint8_t opt_len = (uint8_t)(icmp_payload[1] << 3); + uint8_t opt_len = (uint8_t) (icmp_payload[1] << 3); if (opt_type == ND6_OPTION_TYPE_ROUTE_INFO && opt_len >= sizeof(route_option_t) - sizeof(ip6_addr_p_t) && !is_self_address(netif, src_addr) && payload_len >= opt_len) @@ -77,9 +77,9 @@ static void ra_recv_handler(struct netif * netif, const uint8_t * icmp_payload, { break; } - uint8_t prefix_len_bytes = (uint8_t)((route_option.prefix_length + 7) / 8); - int8_t preference = (int8_t)(-2 * ((route_option.preference >> 4) & 1) + (((route_option.preference) >> 3) & 1)); - uint8_t rio_data_len = (uint8_t)(opt_len - sizeof(route_option) + sizeof(ip6_addr_p_t)); + uint8_t prefix_len_bytes = (uint8_t) ((route_option.prefix_length + 7) / 8); + int8_t preference = (int8_t) (-2 * ((route_option.preference >> 4) & 1) + (((route_option.preference) >> 3) & 1)); + uint8_t rio_data_len = (uint8_t) (opt_len - sizeof(route_option) + sizeof(ip6_addr_p_t)); ESP_LOGI(TAG, "Received RIO"); if (rio_data_len >= prefix_len_bytes) @@ -103,7 +103,7 @@ static void ra_recv_handler(struct netif * netif, const uint8_t * icmp_payload, } } icmp_payload += opt_len; - payload_len = (uint16_t)(payload_len - opt_len); + payload_len = (uint16_t) (payload_len - opt_len); } } @@ -138,7 +138,7 @@ static uint8_t icmp6_raw_recv_handler(void * arg, struct raw_pcb * pcb, struct p return 0; } - icmp_payload_len = (uint16_t)(p->tot_len - sizeof(struct ip6_hdr)); + icmp_payload_len = (uint16_t) (p->tot_len - sizeof(struct ip6_hdr)); icmp_payload = p->payload + sizeof(struct ip6_hdr); icmp6_header = (struct icmp6_hdr *) icmp_payload; diff --git a/src/platform/Infineon/CYW30739/cyw30739-chip-mbedtls-config.h b/src/platform/Infineon/CYW30739/cyw30739-chip-mbedtls-config.h index f9de67ab717faa..1dda5aa93cf4ff 100644 --- a/src/platform/Infineon/CYW30739/cyw30739-chip-mbedtls-config.h +++ b/src/platform/Infineon/CYW30739/cyw30739-chip-mbedtls-config.h @@ -43,29 +43,29 @@ * */ #define MBEDTLS_AES_ALT -//#define MBEDTLS_ARC4_ALT -//#define MBEDTLS_ARIA_ALT -//#define MBEDTLS_BLOWFISH_ALT -//#define MBEDTLS_CAMELLIA_ALT +// #define MBEDTLS_ARC4_ALT +// #define MBEDTLS_ARIA_ALT +// #define MBEDTLS_BLOWFISH_ALT +// #define MBEDTLS_CAMELLIA_ALT #define MBEDTLS_CCM_ALT -//#define MBEDTLS_CHACHA20_ALT -//#define MBEDTLS_CHACHAPOLY_ALT -//#define MBEDTLS_CMAC_ALT -//#define MBEDTLS_DES_ALT -//#define MBEDTLS_DHM_ALT -//#define MBEDTLS_ECJPAKE_ALT -//#define MBEDTLS_GCM_ALT -//#define MBEDTLS_NIST_KW_ALT -//#define MBEDTLS_MD2_ALT -//#define MBEDTLS_MD4_ALT -//#define MBEDTLS_MD5_ALT -//#define MBEDTLS_POLY1305_ALT -//#define MBEDTLS_RIPEMD160_ALT -//#define MBEDTLS_RSA_ALT -//#define MBEDTLS_SHA1_ALT +// #define MBEDTLS_CHACHA20_ALT +// #define MBEDTLS_CHACHAPOLY_ALT +// #define MBEDTLS_CMAC_ALT +// #define MBEDTLS_DES_ALT +// #define MBEDTLS_DHM_ALT +// #define MBEDTLS_ECJPAKE_ALT +// #define MBEDTLS_GCM_ALT +// #define MBEDTLS_NIST_KW_ALT +// #define MBEDTLS_MD2_ALT +// #define MBEDTLS_MD4_ALT +// #define MBEDTLS_MD5_ALT +// #define MBEDTLS_POLY1305_ALT +// #define MBEDTLS_RIPEMD160_ALT +// #define MBEDTLS_RSA_ALT +// #define MBEDTLS_SHA1_ALT #define MBEDTLS_SHA256_ALT -//#define MBEDTLS_SHA512_ALT -//#define MBEDTLS_XTEA_ALT +// #define MBEDTLS_SHA512_ALT +// #define MBEDTLS_XTEA_ALT /** * \def MBEDTLS_ERROR_STRERROR_DUMMY diff --git a/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp b/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp index ef1d25072f5e39..7e23d7dfaf5a00 100644 --- a/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp +++ b/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp @@ -346,7 +346,7 @@ void ConnectivityManagerImpl::ChangeWiFiAPState(WiFiAPState newState) } } -#define INITIALISER_IPV4_ADDRESS1(addr_var, addr_val) addr_var = { CY_WCM_IP_VER_V4, { .v4 = (uint32_t)(addr_val) } } +#define INITIALISER_IPV4_ADDRESS1(addr_var, addr_val) addr_var = { CY_WCM_IP_VER_V4, { .v4 = (uint32_t) (addr_val) } } #define MAKE_IPV4_ADDRESS1(a, b, c, d) ((((uint32_t) d) << 24) | (((uint32_t) c) << 16) | (((uint32_t) b) << 8) | ((uint32_t) a)) static const cy_wcm_ip_setting_t ap_mode_ip_settings = { INITIALISER_IPV4_ADDRESS1(.ip_address, MAKE_IPV4_ADDRESS1(192, 168, 0, 2)), diff --git a/src/platform/Infineon/PSOC6/NetworkCommissioningDriver.h b/src/platform/Infineon/PSOC6/NetworkCommissioningDriver.h index 3bd1a02f99a91f..a0df82a0ed36d4 100644 --- a/src/platform/Infineon/PSOC6/NetworkCommissioningDriver.h +++ b/src/platform/Infineon/PSOC6/NetworkCommissioningDriver.h @@ -51,7 +51,7 @@ class P6ScanResponseIterator : public Iterator item.wiFiBand = (mpScanResults[mIternum].band == CY_WCM_WIFI_BAND_2_4GHZ) ? chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4 : chip::DeviceLayer::NetworkCommissioning::WiFiBand::k5g; - item.rssi = mpScanResults[mIternum].signal_strength; + item.rssi = mpScanResults[mIternum].signal_strength; memcpy(item.ssid, mpScanResults[mIternum].SSID, item.ssidLen); memcpy(item.bssid, mpScanResults[mIternum].BSSID, 6); diff --git a/src/platform/Infineon/PSOC6/NetworkCommissioningWiFiDriver.cpp b/src/platform/Infineon/PSOC6/NetworkCommissioningWiFiDriver.cpp index 4e866a069b25d9..7fe0c1aaebb099 100644 --- a/src/platform/Infineon/PSOC6/NetworkCommissioningWiFiDriver.cpp +++ b/src/platform/Infineon/PSOC6/NetworkCommissioningWiFiDriver.cpp @@ -175,7 +175,7 @@ void P6WiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback VerifyOrExit(mpConnectCallback == nullptr, networkingStatus = Status::kUnknownError); ChipLogProgress(NetworkProvisioning, "P6 NetworkCommissioningDelegate: SSID: %s", mStagingNetwork.ssid); err = ConnectWiFiNetwork(reinterpret_cast(mStagingNetwork.ssid), mStagingNetwork.ssidLen, - reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); + reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); mpConnectCallback = callback; exit: if (err != CHIP_NO_ERROR) diff --git a/src/platform/Infineon/PSOC6/cycfg_gap.cpp b/src/platform/Infineon/PSOC6/cycfg_gap.cpp index 62b458ae1b3d40..1201df4303d122 100644 --- a/src/platform/Infineon/PSOC6/cycfg_gap.cpp +++ b/src/platform/Infineon/PSOC6/cycfg_gap.cpp @@ -6,7 +6,7 @@ const wiced_bt_device_address_t cy_bt_device_address = { 0x00, 0xA0, 0x50, 0x00, const uint8_t cy_bt_adv_packet_elem_0[1] = { 0x06 }; const uint8_t cy_bt_adv_packet_elem_1[7] = { 0x62, 0x6C, 0x65, 0x50, 0x72, 0x6F, 0x76 }; const uint8_t cy_bt_adv_packet_elem_2[16] = { 0x5B, 0x19, 0xBA, 0xE4, 0xE4, 0x52, 0xA9, 0x96, - 0xF1, 0x4A, 0x84, 0xC8, 0x09, 0x4D, 0xC0, 0x21 }; + 0xF1, 0x4A, 0x84, 0xC8, 0x09, 0x4D, 0xC0, 0x21 }; wiced_bt_ble_advert_elem_t cy_bt_adv_packet_data[] = { /* Flags */ { diff --git a/src/platform/Linux/DnssdImpl.h b/src/platform/Linux/DnssdImpl.h index 2914a888c29381..483ac50d9128a0 100644 --- a/src/platform/Linux/DnssdImpl.h +++ b/src/platform/Linux/DnssdImpl.h @@ -102,7 +102,7 @@ class Poller class MdnsAvahi { public: - MdnsAvahi(const MdnsAvahi &) = delete; + MdnsAvahi(const MdnsAvahi &) = delete; MdnsAvahi & operator=(const MdnsAvahi &) = delete; CHIP_ERROR Init(DnssdAsyncReturnCallback initCallback, DnssdAsyncReturnCallback errorCallback, void * context); diff --git a/src/platform/Linux/bluez/ChipDeviceScanner.h b/src/platform/Linux/bluez/ChipDeviceScanner.h index f07606b2ae3b29..ef8830a6fac820 100644 --- a/src/platform/Linux/bluez/ChipDeviceScanner.h +++ b/src/platform/Linux/bluez/ChipDeviceScanner.h @@ -57,8 +57,8 @@ class ChipDeviceScanner ChipDeviceScanner(GDBusObjectManager * manager, BluezAdapter1 * adapter, GCancellable * cancellable, ChipDeviceScannerDelegate * delegate); - ChipDeviceScanner(ChipDeviceScanner &&) = default; - ChipDeviceScanner(const ChipDeviceScanner &) = delete; + ChipDeviceScanner(ChipDeviceScanner &&) = default; + ChipDeviceScanner(const ChipDeviceScanner &) = delete; ChipDeviceScanner & operator=(const ChipDeviceScanner &) = delete; ~ChipDeviceScanner(); diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h old mode 100755 new mode 100644 index d8bf1b2b76a4a0..eb0aecdd289901 --- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h +++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h @@ -217,7 +217,7 @@ class GenericThreadStackManagerImpl_OpenThread static constexpr size_t kTotalDnsServiceTxtValueSize = std::max(Dnssd::CommissionAdvertisingParameters::kTxtTotalValueSize, Dnssd::OperationalAdvertisingParameters::kTxtTotalValueSize); static constexpr size_t kTotalDnsServiceTxtKeySize = std::max(Dnssd::CommissionAdvertisingParameters::kTxtTotalKeySize, - Dnssd::OperationalAdvertisingParameters::kTxtTotalKeySize); + Dnssd::OperationalAdvertisingParameters::kTxtTotalKeySize); #else // Thread only supports operational discovery. static constexpr uint8_t kMaxDnsServiceTxtEntriesNumber = Dnssd::OperationalAdvertisingParameters::kTxtMaxNumber; diff --git a/src/platform/Tizen/DnssdImpl.h b/src/platform/Tizen/DnssdImpl.h index 50ff42b5c9e764..9c1706919f5587 100644 --- a/src/platform/Tizen/DnssdImpl.h +++ b/src/platform/Tizen/DnssdImpl.h @@ -120,7 +120,7 @@ struct ResolveContext : public GenericContext class DnssdTizen { public: - DnssdTizen(const DnssdTizen &) = delete; + DnssdTizen(const DnssdTizen &) = delete; DnssdTizen & operator=(const DnssdTizen &) = delete; CHIP_ERROR Init(DnssdAsyncReturnCallback initCallback, DnssdAsyncReturnCallback errorCallback, void * context); diff --git a/src/platform/Tizen/SystemInfo.cpp b/src/platform/Tizen/SystemInfo.cpp index 04f445a87202ba..7fec28c129ef3f 100644 --- a/src/platform/Tizen/SystemInfo.cpp +++ b/src/platform/Tizen/SystemInfo.cpp @@ -51,8 +51,8 @@ CHIP_ERROR SystemInfo::GetPlatformVersion(PlatformVersion & version) return CHIP_ERROR_INTERNAL; } - sInstance.mMajor = version.mMajor = (uint8_t)(platformVersion[0] - '0'); - sInstance.mMinor = version.mMinor = (uint8_t)(platformVersion[2] - '0'); + sInstance.mMajor = version.mMajor = (uint8_t) (platformVersion[0] - '0'); + sInstance.mMinor = version.mMinor = (uint8_t) (platformVersion[2] - '0'); free(platformVersion); return CHIP_NO_ERROR; } diff --git a/src/platform/Zephyr/BLEManagerImpl.cpp b/src/platform/Zephyr/BLEManagerImpl.cpp index 8a7877aab3c779..09ddd4fbe34304 100644 --- a/src/platform/Zephyr/BLEManagerImpl.cpp +++ b/src/platform/Zephyr/BLEManagerImpl.cpp @@ -255,14 +255,14 @@ inline CHIP_ERROR BLEManagerImpl::PrepareAdvertisingRequest() advertisingData[1] = BT_DATA(BT_DATA_SVC_DATA16, &serviceData, sizeof(serviceData)); scanResponseData[0] = BT_DATA(BT_DATA_NAME_COMPLETE, name, nameSize); - mAdvertisingRequest.priority = CHIP_DEVICE_BLE_ADVERTISING_PRIORITY; - mAdvertisingRequest.options = kAdvertisingOptions; - mAdvertisingRequest.minInterval = mFlags.Has(Flags::kFastAdvertisingEnabled) - ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MIN - : CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN; - mAdvertisingRequest.maxInterval = mFlags.Has(Flags::kFastAdvertisingEnabled) - ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MAX - : CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX; + mAdvertisingRequest.priority = CHIP_DEVICE_BLE_ADVERTISING_PRIORITY; + mAdvertisingRequest.options = kAdvertisingOptions; + mAdvertisingRequest.minInterval = mFlags.Has(Flags::kFastAdvertisingEnabled) + ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MIN + : CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN; + mAdvertisingRequest.maxInterval = mFlags.Has(Flags::kFastAdvertisingEnabled) + ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MAX + : CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX; mAdvertisingRequest.advertisingData = Span(advertisingData); mAdvertisingRequest.scanResponseData = nameSize ? Span(scanResponseData) : Span{}; diff --git a/src/platform/android/BLEManagerImpl.cpp b/src/platform/android/BLEManagerImpl.cpp index e811230c8638a6..712e0556f98ee7 100644 --- a/src/platform/android/BLEManagerImpl.cpp +++ b/src/platform/android/BLEManagerImpl.cpp @@ -40,9 +40,7 @@ namespace chip { namespace DeviceLayer { namespace Internal { -namespace { - -} // namespace +namespace {} // namespace BLEManagerImpl BLEManagerImpl::sInstance; @@ -285,7 +283,7 @@ bool BLEManagerImpl::UnsubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, cons env->ExceptionClear(); tmpConnObj = reinterpret_cast(conId); rc = (bool) env->CallBooleanMethod(mBLEManagerObject, mOnUnsubscribeCharacteristicMethod, static_cast(tmpConnObj), - svcIdObj, charIdObj); + svcIdObj, charIdObj); VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN); exit: diff --git a/src/platform/android/BlePlatformConfig.h b/src/platform/android/BlePlatformConfig.h index 2d28bc98435968..12676b1560a941 100644 --- a/src/platform/android/BlePlatformConfig.h +++ b/src/platform/android/BlePlatformConfig.h @@ -26,8 +26,7 @@ namespace chip { namespace DeviceLayer { -namespace Internal { -} // namespace Internal +namespace Internal {} // namespace Internal } // namespace DeviceLayer } // namespace chip diff --git a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp index 4ed9c9359b1f92..4d8bd35af57380 100644 --- a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp +++ b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp @@ -198,7 +198,7 @@ void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback networkId.data()); err = ConnectWiFiNetwork(reinterpret_cast(mStagingNetwork.ssid), mStagingNetwork.ssidLen, - reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); + reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); mpConnectCallback = callback; exit: diff --git a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h index f6ebab8ea5e443..adf41896c4245e 100644 --- a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h +++ b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h @@ -44,9 +44,9 @@ class BLScanResponseIterator : public Iterator } item.security.SetRaw(mpScanResults[mIternum].auth); - item.ssidLen = mpScanResults[mIternum].ssid_len < chip::DeviceLayer::Internal::kMaxWiFiSSIDLength - ? mpScanResults[mIternum].ssid_len - : chip::DeviceLayer::Internal::kMaxWiFiSSIDLength; + item.ssidLen = mpScanResults[mIternum].ssid_len < chip::DeviceLayer::Internal::kMaxWiFiSSIDLength + ? mpScanResults[mIternum].ssid_len + : chip::DeviceLayer::Internal::kMaxWiFiSSIDLength; item.channel = mpScanResults[mIternum].channel; item.wiFiBand = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4; item.rssi = mpScanResults[mIternum].rssi; diff --git a/src/platform/bouffalolab/BL602/bl602-chip-mbedtls-config.h b/src/platform/bouffalolab/BL602/bl602-chip-mbedtls-config.h index a3b81db8bd5317..f9cc993066a1e9 100644 --- a/src/platform/bouffalolab/BL602/bl602-chip-mbedtls-config.h +++ b/src/platform/bouffalolab/BL602/bl602-chip-mbedtls-config.h @@ -36,7 +36,7 @@ * Enable FreeRTOS threading support */ #define MBEDTLS_FREERTOS -//#define MBEDTLS_THREADING_C +// #define MBEDTLS_THREADING_C #define SL_CATALOG_FREERTOS_KERNEL_PRESENT @@ -96,7 +96,7 @@ typedef void mbedtls_ecp_restart_ctx; #define MBEDTLS_PK_WRITE_C #define MBEDTLS_PKCS5_C #define MBEDTLS_PLATFORM_C -//#define MBEDTLS_PLATFORM_MEMORY +// #define MBEDTLS_PLATFORM_MEMORY #define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS #define MBEDTLS_PSA_CRYPTO_C #define MBEDTLS_PSA_CRYPTO_CONFIG @@ -145,5 +145,5 @@ typedef void mbedtls_ecp_restart_ctx; #define MBEDTLS_AES_ALT #define MBEDTLS_ECP_ALT -//#include "config-device-acceleration.h" +// #include "config-device-acceleration.h" #include "mbedtls/check_config.h" diff --git a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp index 69ccc5da6e2dd3..dc7ca274857de5 100644 --- a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp +++ b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp @@ -80,9 +80,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNe return CHIP_ERROR_INTERNAL; } - if (pApInfo->auth_mode < (uint8_t)(SecurityTypeEnum::kUnknownEnumValue)) + if (pApInfo->auth_mode < (uint8_t) (SecurityTypeEnum::kUnknownEnumValue)) { - securityType = (SecurityTypeEnum)(pApInfo->auth_mode); + securityType = (SecurityTypeEnum) (pApInfo->auth_mode); } else { diff --git a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp b/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp index 3762091fbd3e21..22df7c3b4f90c2 100644 --- a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp +++ b/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp @@ -191,7 +191,7 @@ void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback networkId.data()); err = ConnectWiFiNetwork(reinterpret_cast(mStagingNetwork.ssid), mStagingNetwork.ssidLen, - reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); + reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); mpConnectCallback = callback; exit: @@ -270,9 +270,9 @@ void BLWiFiDriver::OnScanWiFiNetworkDone(void * opaque) } p->security.SetRaw(pmsg->records[i].auth_mode); - p->ssidLen = strlen((char *) pmsg->records[i].ssid) < chip::DeviceLayer::Internal::kMaxWiFiSSIDLength - ? strlen((char *) pmsg->records[i].ssid) - : chip::DeviceLayer::Internal::kMaxWiFiSSIDLength; + p->ssidLen = strlen((char *) pmsg->records[i].ssid) < chip::DeviceLayer::Internal::kMaxWiFiSSIDLength + ? strlen((char *) pmsg->records[i].ssid) + : chip::DeviceLayer::Internal::kMaxWiFiSSIDLength; p->channel = pmsg->records[i].channel; p->wiFiBand = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4; p->rssi = pmsg->records[i].rssi; diff --git a/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp b/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp index 94932a9febb8c8..3b9e0313a5b66f 100644 --- a/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp +++ b/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp @@ -143,7 +143,7 @@ extern "C" ot_system_event_t otrGetNotifyEvent(void) extern "C" void otrNotifyEvent(ot_system_event_t sevent) { uint32_t tag = otrEnterCrit(); - ot_system_event_var = (ot_system_event_t)(ot_system_event_var | sevent); + ot_system_event_var = (ot_system_event_t) (ot_system_event_var | sevent); otrExitCrit(tag); otSysEventSignalPending(); diff --git a/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp b/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp index f2996526e84445..e2ceec4e40219f 100644 --- a/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp +++ b/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp @@ -121,7 +121,7 @@ extern "C" ot_system_event_t otrGetNotifyEvent(void) extern "C" void otrNotifyEvent(ot_system_event_t sevent) { uint32_t tag = otrEnterCrit(); - ot_system_event_var = (ot_system_event_t)(ot_system_event_var | sevent); + ot_system_event_var = (ot_system_event_t) (ot_system_event_var | sevent); otrExitCrit(tag); otSysEventSignalPending(); diff --git a/src/platform/bouffalolab/common/FactoryDataProvider.cpp b/src/platform/bouffalolab/common/FactoryDataProvider.cpp index 128fd1676d83f8..5970549234ffa2 100644 --- a/src/platform/bouffalolab/common/FactoryDataProvider.cpp +++ b/src/platform/bouffalolab/common/FactoryDataProvider.cpp @@ -583,14 +583,16 @@ CHIP_ERROR FactoryDataProvider::GetManufacturingDate(uint16_t & year, uint8_t & (int) (__DATE__[10] - '0')) #define OS_MONTH \ - (__DATE__[2] == 'n' ? (__DATE__[1] == 'a' ? 1 : 6) \ - : __DATE__[2] == 'b' ? 2 \ - : __DATE__[2] == 'r' ? (__DATE__[0] == 'M' ? 3 : 4) \ - : __DATE__[2] == 'y' ? 5 \ - : __DATE__[2] == 'l' \ - ? 7 \ - : __DATE__[2] == 'g' ? 8 \ - : __DATE__[2] == 'p' ? 9 : __DATE__[2] == 't' ? 10 : __DATE__[2] == 'v' ? 11 : 12) + (__DATE__[2] == 'n' ? (__DATE__[1] == 'a' ? 1 : 6) \ + : __DATE__[2] == 'b' ? 2 \ + : __DATE__[2] == 'r' ? (__DATE__[0] == 'M' ? 3 : 4) \ + : __DATE__[2] == 'y' ? 5 \ + : __DATE__[2] == 'l' ? 7 \ + : __DATE__[2] == 'g' ? 8 \ + : __DATE__[2] == 'p' ? 9 \ + : __DATE__[2] == 't' ? 10 \ + : __DATE__[2] == 'v' ? 11 \ + : 12) #define OS_DAY ((__DATE__[4] == ' ' ? 0 : __DATE__[4] - '0') * 10 + (__DATE__[5] - '0')) diff --git a/src/platform/bouffalolab/common/SystemPlatformConfig.h b/src/platform/bouffalolab/common/SystemPlatformConfig.h index 80f21edc1fccfd..3b821b14b5d43d 100644 --- a/src/platform/bouffalolab/common/SystemPlatformConfig.h +++ b/src/platform/bouffalolab/common/SystemPlatformConfig.h @@ -30,5 +30,5 @@ struct ChipDeviceEvent; #define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1 #define CHIP_SYSTEM_CONFIG_EVENT_OBJECT_TYPE const struct ::chip::DeviceLayer::ChipDeviceEvent * -//#define CHIP_CONFIG_SHA256_CONTEXT_SIZE sizeof(bl_sha_ctx_t) +// #define CHIP_CONFIG_SHA256_CONTEXT_SIZE sizeof(bl_sha_ctx_t) #define CHIP_CONFIG_SHA256_CONTEXT_SIZE ((1 + 5 + 18 + 16 + 16) * sizeof(unsigned int)) diff --git a/src/platform/cc13xx_26xx/BLEManagerImpl.cpp b/src/platform/cc13xx_26xx/BLEManagerImpl.cpp index 465a2b746aee39..5d5d9d3d9dc8ba 100644 --- a/src/platform/cc13xx_26xx/BLEManagerImpl.cpp +++ b/src/platform/cc13xx_26xx/BLEManagerImpl.cpp @@ -535,7 +535,7 @@ void BLEManagerImpl::EventHandler_init(void) /* Start tasks of external images */ ICall_createRemoteTasks(); - BLEManagerImpl::sBleTaskHndl = (TaskHandle_t)(*((TaskHandle_t *) ICall_getRemoteTaskHandle(0))); + BLEManagerImpl::sBleTaskHndl = (TaskHandle_t) (*((TaskHandle_t *) ICall_getRemoteTaskHandle(0))); DMMSch_registerClient((TaskHandle_t) BLEManagerImpl::sBleTaskHndl, DMMPolicy_StackRole_BlePeripheral); /* set the stacks in default states */ DMMPolicy_updateStackState(DMMPolicy_StackRole_BlePeripheral, DMMPOLICY_BLE_IDLE); diff --git a/src/platform/cc13xx_26xx/CC13XX_26XXConfig.cpp b/src/platform/cc13xx_26xx/CC13XX_26XXConfig.cpp index c0475e0d015610..b4ea1ec2924378 100644 --- a/src/platform/cc13xx_26xx/CC13XX_26XXConfig.cpp +++ b/src/platform/cc13xx_26xx/CC13XX_26XXConfig.cpp @@ -125,7 +125,7 @@ const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_UniqueId = { /* Internal for the KVS interface. */ const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_KVS_key = { { .systemID = kCC13XX_26XXMatter_SysID, - .itemID = kCC13XX_26XXMatter_ItemID_ChipKVS_key } }; + .itemID = kCC13XX_26XXMatter_ItemID_ChipKVS_key } }; const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_KVS_value = { { .systemID = kCC13XX_26XXMatter_SysID, .itemID = kCC13XX_26XXMatter_ItemID_ChipKVS_value } }; diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h index b2ba6fec96eac0..acef7e60b15744 100644 --- a/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h +++ b/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h @@ -63,8 +63,8 @@ /* FreeRTOS heap size is 0 because currently "bget" heap is the only heap available, for both FreeRTOS and application */ -//#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 0 ) ) -#define configTOTAL_HEAP_SIZE ((size_t)(0)) +// #define configTOTAL_HEAP_SIZE ( ( size_t ) ( 0 ) ) +#define configTOTAL_HEAP_SIZE ((size_t) (0)) #define configSUPPORT_STATIC_ALLOCATION 1 #define configAPPLICATION_ALLOCATED_HEAP 1 diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/cc13x2_26x2-mbedtls-config.h b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/cc13x2_26x2-mbedtls-config.h index a005f6bf804905..48ec00ec7b3c02 100644 --- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/cc13x2_26x2-mbedtls-config.h +++ b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/cc13x2_26x2-mbedtls-config.h @@ -33,25 +33,25 @@ /** * Enable FreeRTOS threading support */ -//#define MBEDTLS_FREERTOS -//#define MBEDTLS_THREADING_C -//#define MBEDTLS_THREADING_ALT +// #define MBEDTLS_FREERTOS +// #define MBEDTLS_THREADING_C +// #define MBEDTLS_THREADING_ALT /* Enable Hardware Acceleration */ -//#define MBEDTLS_AES_ALT -//#define MBEDTLS_ECDH_COMPUTE_SHARED_ALT -//#define MBEDTLS_ECDH_GEN_PUBLIC_ALT +// #define MBEDTLS_AES_ALT +// #define MBEDTLS_ECDH_COMPUTE_SHARED_ALT +// #define MBEDTLS_ECDH_GEN_PUBLIC_ALT #define MBEDTLS_ECDSA_SIGN_ALT #define MBEDTLS_ECDSA_VERIFY_ALT #define MBEDTLS_ENTROPY_HARDWARE_ALT #define MBEDTLS_SHA256_ALT // Thread Joining disabled -//#define MBEDTLS_ECJPAKE_ALT -//#define MBEDTLS_ECJPAKE_C -//#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED -//#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8 +// #define MBEDTLS_ECJPAKE_ALT +// #define MBEDTLS_ECJPAKE_C +// #define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED +// #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8 /** * Enable Crypto and Entropy modules diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c index 84b60b0f92c347..c5668d4e87f830 100644 --- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c +++ b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c @@ -143,7 +143,7 @@ static const char * const ecjpake_id[] = { "client", "server" }; */ static int tls_write_binary(uint8_t ** p, const uint8_t * end, const uint8_t * bin, size_t len) { - if ((end < *p) || ((size_t)(end - *p) < 1 + len)) + if ((end < *p) || ((size_t) (end - *p) < 1 + len)) { return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL); } @@ -179,7 +179,7 @@ static int tls_read_binary(const uint8_t ** p, const uint8_t * end, uint8_t * bi uint8_t data_len; /* length byte plus the length of the crypto key */ - if ((end < *p) || ((size_t)(end - *p) < 1 + len)) + if ((end < *p) || ((size_t) (end - *p) < 1 + len)) { return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA); } @@ -321,7 +321,7 @@ static int tls_verify_curve_info(const uint8_t ** p, const uint8_t * end, mbedtl { return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA); } - curve_name_id = (((uint16_t)(*p)[1] << 8)) | (((uint16_t)(*p)[2])); + curve_name_id = (((uint16_t) (*p)[1] << 8)) | (((uint16_t) (*p)[2])); *p += 3; curve_info = mbedtls_ecp_curve_info_from_grp_id(group_id); @@ -474,7 +474,7 @@ static void big_num_reverse(uint8_t * arr, size_t len) */ static int ecjpake_write_len_binary(uint8_t ** p, const uint8_t * end, const uint8_t * bin, size_t len) { - if ((end < *p) || ((size_t)(end - *p) < 4 + len)) + if ((end < *p) || ((size_t) (end - *p) < 4 + len)) { return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL); } diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config.h b/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config.h index ceb3e8b4e2bb75..dfdb7bcdd73057 100644 --- a/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config.h +++ b/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config.h @@ -53,7 +53,7 @@ #define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1 -//#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0 +// #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0 #define UART_AS_SERIAL_TRANSPORT 1 #define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1 diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/FreeRTOSConfig.h b/src/platform/cc13xx_26xx/cc13x4_26x4/FreeRTOSConfig.h index a3e2ae6e1baf78..9cf845e1b401bd 100644 --- a/src/platform/cc13xx_26xx/cc13x4_26x4/FreeRTOSConfig.h +++ b/src/platform/cc13xx_26xx/cc13x4_26x4/FreeRTOSConfig.h @@ -53,7 +53,7 @@ #define configCPU_CLOCK_HZ ((unsigned long) (48000000)) /* FreeRTOS heap size is 0 because currently "bget" heap is the only heap available, for both FreeRTOS and application */ -#define configTOTAL_HEAP_SIZE ((size_t)(0)) +#define configTOTAL_HEAP_SIZE ((size_t) (0)) #define configCHECK_FOR_STACK_OVERFLOW 2 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 0 #define configEXPECTED_IDLE_TIME_BEFORE_SLEEP 2 diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/crypto/cc13x4_26x4-mbedtls-config.h b/src/platform/cc13xx_26xx/cc13x4_26x4/crypto/cc13x4_26x4-mbedtls-config.h index 16b1dafdcc95d4..2ac87444764fd6 100644 --- a/src/platform/cc13xx_26xx/cc13x4_26x4/crypto/cc13x4_26x4-mbedtls-config.h +++ b/src/platform/cc13xx_26xx/cc13x4_26x4/crypto/cc13x4_26x4-mbedtls-config.h @@ -32,25 +32,25 @@ /** * Enable FreeRTOS threading support */ -//#define MBEDTLS_FREERTOS -//#define MBEDTLS_THREADING_C -//#define MBEDTLS_THREADING_ALT +// #define MBEDTLS_FREERTOS +// #define MBEDTLS_THREADING_C +// #define MBEDTLS_THREADING_ALT /* Enable Hardware Acceleration */ -//#define MBEDTLS_AES_ALT -//#define MBEDTLS_ECDH_COMPUTE_SHARED_ALT -//#define MBEDTLS_ECDH_GEN_PUBLIC_ALT +// #define MBEDTLS_AES_ALT +// #define MBEDTLS_ECDH_COMPUTE_SHARED_ALT +// #define MBEDTLS_ECDH_GEN_PUBLIC_ALT #define MBEDTLS_ECDSA_SIGN_ALT #define MBEDTLS_ECDSA_VERIFY_ALT #define MBEDTLS_ENTROPY_HARDWARE_ALT #define MBEDTLS_SHA256_ALT // Thread Joining disabled -//#define MBEDTLS_ECJPAKE_ALT -//#define MBEDTLS_ECJPAKE_C -//#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED -//#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8 +// #define MBEDTLS_ECJPAKE_ALT +// #define MBEDTLS_ECJPAKE_C +// #define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED +// #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8 /** * Enable Crypto and Entropy modules diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/crypto/ecjpake_alt.c b/src/platform/cc13xx_26xx/cc13x4_26x4/crypto/ecjpake_alt.c index 84b60b0f92c347..c5668d4e87f830 100644 --- a/src/platform/cc13xx_26xx/cc13x4_26x4/crypto/ecjpake_alt.c +++ b/src/platform/cc13xx_26xx/cc13x4_26x4/crypto/ecjpake_alt.c @@ -143,7 +143,7 @@ static const char * const ecjpake_id[] = { "client", "server" }; */ static int tls_write_binary(uint8_t ** p, const uint8_t * end, const uint8_t * bin, size_t len) { - if ((end < *p) || ((size_t)(end - *p) < 1 + len)) + if ((end < *p) || ((size_t) (end - *p) < 1 + len)) { return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL); } @@ -179,7 +179,7 @@ static int tls_read_binary(const uint8_t ** p, const uint8_t * end, uint8_t * bi uint8_t data_len; /* length byte plus the length of the crypto key */ - if ((end < *p) || ((size_t)(end - *p) < 1 + len)) + if ((end < *p) || ((size_t) (end - *p) < 1 + len)) { return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA); } @@ -321,7 +321,7 @@ static int tls_verify_curve_info(const uint8_t ** p, const uint8_t * end, mbedtl { return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA); } - curve_name_id = (((uint16_t)(*p)[1] << 8)) | (((uint16_t)(*p)[2])); + curve_name_id = (((uint16_t) (*p)[1] << 8)) | (((uint16_t) (*p)[2])); *p += 3; curve_info = mbedtls_ecp_curve_info_from_grp_id(group_id); @@ -474,7 +474,7 @@ static void big_num_reverse(uint8_t * arr, size_t len) */ static int ecjpake_write_len_binary(uint8_t ** p, const uint8_t * end, const uint8_t * bin, size_t len) { - if ((end < *p) || ((size_t)(end - *p) < 4 + len)) + if ((end < *p) || ((size_t) (end - *p) < 4 + len)) { return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL); } diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/openthread-core-cc13x4_26x4-config.h b/src/platform/cc13xx_26xx/cc13x4_26x4/openthread-core-cc13x4_26x4-config.h index 5857675e1a309d..f1c575c1a82e11 100644 --- a/src/platform/cc13xx_26xx/cc13x4_26x4/openthread-core-cc13x4_26x4-config.h +++ b/src/platform/cc13xx_26xx/cc13x4_26x4/openthread-core-cc13x4_26x4-config.h @@ -53,7 +53,7 @@ #define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1 -//#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0 +// #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0 #define UART_AS_SERIAL_TRANSPORT 1 #define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1 diff --git a/src/platform/cc13xx_26xx/chipOBleProfile.c b/src/platform/cc13xx_26xx/chipOBleProfile.c index fb8cf72b93ac53..b506dc3715cd50 100644 --- a/src/platform/cc13xx_26xx/chipOBleProfile.c +++ b/src/platform/cc13xx_26xx/chipOBleProfile.c @@ -169,7 +169,7 @@ bStatus_t CHIPoBLEProfile_AddService(uint32 services) uint8 status; // Allocate Client Characteristic Configuration tables - chipOBleProfileTxStateDataConfig = (gattCharCfg_t *) ICall_malloc((uint_least16_t)(sizeof(gattCharCfg_t) * MAX_NUM_BLE_CONNS)); + chipOBleProfileTxStateDataConfig = (gattCharCfg_t *) ICall_malloc((uint_least16_t) (sizeof(gattCharCfg_t) * MAX_NUM_BLE_CONNS)); if (chipOBleProfileTxStateDataConfig == NULL) { return bleMemAllocError; diff --git a/src/platform/cc32xx/CC32XXConfig.cpp b/src/platform/cc32xx/CC32XXConfig.cpp index 599403b6868d70..7eace22b7dbc5e 100644 --- a/src/platform/cc32xx/CC32XXConfig.cpp +++ b/src/platform/cc32xx/CC32XXConfig.cpp @@ -230,8 +230,8 @@ class CC32XXKVSList bufferLength += (uint16_t) strlen(currentEntry->Key()); // copy value length - list[bufferLength] = (uint8_t)(currentEntry->Len() & 0xFF); - list[bufferLength + 1] = (uint8_t)((currentEntry->Len() & 0xFF00) >> 8); + list[bufferLength] = (uint8_t) (currentEntry->Len() & 0xFF); + list[bufferLength + 1] = (uint8_t) ((currentEntry->Len() & 0xFF00) >> 8); bufferLength = bufferLength + 2; // copy value @@ -267,7 +267,7 @@ class CC32XXKVSList // read in value length uint16_t valueLen = 0; - valueLen = (uint16_t)(list[currentLength] | list[currentLength + 1] << 8); + valueLen = (uint16_t) (list[currentLength] | list[currentLength + 1] << 8); currentLength += 2; // read in value diff --git a/src/platform/cc32xx/FreeRTOSConfig.h b/src/platform/cc32xx/FreeRTOSConfig.h index feece6421568b9..2dc4874d7a3549 100644 --- a/src/platform/cc32xx/FreeRTOSConfig.h +++ b/src/platform/cc32xx/FreeRTOSConfig.h @@ -55,7 +55,7 @@ supported, or if both static and dynamic allocation are supported. */ #define configMINIMAL_STACK_SIZE ((unsigned short) 256) // changed from 128 #define configMAX_TASK_NAME_LEN (12) -#define configTOTAL_HEAP_SIZE ((size_t)(0x14000)) // inreased from 0xe000 +#define configTOTAL_HEAP_SIZE ((size_t) (0x14000)) // inreased from 0xe000 /* Idle task stack size in words */ #define configIDLE_TASK_STACK_DEPTH (configMINIMAL_STACK_SIZE * 2) diff --git a/src/platform/cc32xx/SystemPlatformConfig.h b/src/platform/cc32xx/SystemPlatformConfig.h index baee83449978b9..0ba1ff42890fe3 100644 --- a/src/platform/cc32xx/SystemPlatformConfig.h +++ b/src/platform/cc32xx/SystemPlatformConfig.h @@ -34,12 +34,12 @@ struct ChipDeviceEvent; // ==================== Platform Adaptations ==================== -//#define CHIP_SYSTEM_CONFIG_POSIX_LOCKING 0 -//#define CHIP_SYSTEM_CONFIG_FREERTOS_LOCKING 0 -//#define CHIP_SYSTEM_CONFIG_NO_LOCKING 1 -//#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_EVENT_FUNCTIONS 1 +// #define CHIP_SYSTEM_CONFIG_POSIX_LOCKING 0 +// #define CHIP_SYSTEM_CONFIG_FREERTOS_LOCKING 0 +// #define CHIP_SYSTEM_CONFIG_NO_LOCKING 1 +// #define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_EVENT_FUNCTIONS 1 #define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1 -//#define CHIP_SYSTEM_CONFIG_LWIP_EVENT_TYPE int +// #define CHIP_SYSTEM_CONFIG_LWIP_EVENT_TYPE int #define CHIP_SYSTEM_CONFIG_LWIP_EVENT_OBJECT_TYPE const struct ::chip::DeviceLayer::ChipDeviceEvent * // #define CHIP_SYSTEM_CONFIG_ERROR_TYPE uint32_t diff --git a/src/platform/mbed/BLEManagerImpl.cpp b/src/platform/mbed/BLEManagerImpl.cpp index ef6518d438fabf..aa797ff95f6f4c 100644 --- a/src/platform/mbed/BLEManagerImpl.cpp +++ b/src/platform/mbed/BLEManagerImpl.cpp @@ -330,7 +330,7 @@ class GapEventHandler : private mbed::NonCopyable, public ble:: struct CHIPService : public ble::GattServer::EventHandler { CHIPService() {} - CHIPService(const CHIPService &) = delete; + CHIPService(const CHIPService &) = delete; CHIPService & operator=(const CHIPService &) = delete; CHIP_ERROR init(ble::BLE & ble_interface) diff --git a/src/platform/mbed/NetworkCommissioningDriver.h b/src/platform/mbed/NetworkCommissioningDriver.h index 9e61d4640ac4f5..33496f0ed9af47 100644 --- a/src/platform/mbed/NetworkCommissioningDriver.h +++ b/src/platform/mbed/NetworkCommissioningDriver.h @@ -49,7 +49,7 @@ class MbedScanResponseIterator : public Iterator item.security.SetRaw(mScanResults[mIternum].get_security()); static_assert(chip::DeviceLayer::Internal::kMaxWiFiSSIDLength <= UINT8_MAX, "Our length won't fit in ssidLen"); item.ssidLen = static_cast(strnlen(reinterpret_cast(mScanResults[mIternum].get_ssid()), - chip::DeviceLayer::Internal::kMaxWiFiSSIDLength)); + chip::DeviceLayer::Internal::kMaxWiFiSSIDLength)); item.channel = mScanResults[mIternum].get_channel(); item.wiFiBand = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4; item.rssi = mScanResults[mIternum].get_rssi(); diff --git a/src/platform/mbed/arch.c b/src/platform/mbed/arch.c index 844d22476034ae..335188e1d439b1 100644 --- a/src/platform/mbed/arch.c +++ b/src/platform/mbed/arch.c @@ -73,7 +73,7 @@ void usleep(unsigned int usec) thread_sleep_for(ms); uint64_t end = get_clock_monotonic(); - uint64_t delta = (uint64_t)(end - start); + uint64_t delta = (uint64_t) (end - start); if (delta >= usec) { return; diff --git a/src/platform/mt793x/BLEManagerImpl.cpp b/src/platform/mt793x/BLEManagerImpl.cpp index a688807c2978c0..d1f92e1b2977ac 100644 --- a/src/platform/mt793x/BLEManagerImpl.cpp +++ b/src/platform/mt793x/BLEManagerImpl.cpp @@ -123,7 +123,7 @@ CHIP_ERROR BLEManagerImpl::_Init() bt_create_task(); bt_callback_manager_register_callback(bt_callback_type_app_event, - (uint32_t)(MODULE_MASK_GAP | MODULE_MASK_GATT | MODULE_MASK_SYSTEM), + (uint32_t) (MODULE_MASK_GAP | MODULE_MASK_GATT | MODULE_MASK_SYSTEM), (void *) BleMatterAppEventCallback); #ifdef BT_ENABLE_HCI_SNOOP_LOG bt_driver_btsnoop_ctrl(1); diff --git a/src/platform/mt793x/CHIPMem-Platform.cpp b/src/platform/mt793x/CHIPMem-Platform.cpp index b66e6263b15e9e..a050091077f5f7 100644 --- a/src/platform/mt793x/CHIPMem-Platform.cpp +++ b/src/platform/mt793x/CHIPMem-Platform.cpp @@ -41,7 +41,7 @@ * */ -//#include +// #include #include #include "task.h" diff --git a/src/platform/mt793x/ConnectivityManagerImpl_WIFI.cpp b/src/platform/mt793x/ConnectivityManagerImpl_WIFI.cpp index a24757c1c0ea77..5e2aa54ac8b809 100644 --- a/src/platform/mt793x/ConnectivityManagerImpl_WIFI.cpp +++ b/src/platform/mt793x/ConnectivityManagerImpl_WIFI.cpp @@ -386,7 +386,7 @@ CHIP_ERROR ConnectivityManagerImpl::ConfigureWiFiAP(void) uint16_t discriminator = 0x8888; ssid_len = snprintf(ssid, sizeof(ssid), "%s%03X-%04X-%04X", CHIP_DEVICE_CONFIG_WIFI_AP_SSID_PREFIX, discriminator, - CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID, CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID); + CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID, CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID); int8_t channel = CHIP_DEVICE_CONFIG_WIFI_AP_CHANNEL; filogic_wifi_ap_config_async(mFilogicCtx, channel, ssid, ssid_len); diff --git a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp index 504c4e3161c7ed..86a8f760b7a026 100644 --- a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp +++ b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp @@ -30,7 +30,7 @@ #endif #include -//#include "AppConfig.h" +// #include "AppConfig.h" #include "FreeRTOS.h" using namespace ::chip::app::Clusters::GeneralDiagnostics; diff --git a/src/platform/mt793x/DnssdImpl.cpp b/src/platform/mt793x/DnssdImpl.cpp index 6d99d7f7d8d8ac..12cdda0a794742 100644 --- a/src/platform/mt793x/DnssdImpl.cpp +++ b/src/platform/mt793x/DnssdImpl.cpp @@ -71,7 +71,7 @@ bool IsSupportedProtocol(DnssdServiceProtocol protocol) uint32_t GetInterfaceId(chip::Inet::InterfaceId interfaceId) { - return interfaceId.IsPresent() ? (uint32_t)(void *) interfaceId.GetPlatformInterface() : kDNSServiceInterfaceIndexAny; + return interfaceId.IsPresent() ? (uint32_t) (void *) interfaceId.GetPlatformInterface() : kDNSServiceInterfaceIndexAny; } std::string GetFullType(const char * type, DnssdServiceProtocol protocol) diff --git a/src/platform/mt793x/DnssdImpl.h b/src/platform/mt793x/DnssdImpl.h index d1499b6b9a9be8..9305f20c0db085 100644 --- a/src/platform/mt793x/DnssdImpl.h +++ b/src/platform/mt793x/DnssdImpl.h @@ -52,7 +52,7 @@ struct RegisterContext; class MdnsContexts { public: - MdnsContexts(const MdnsContexts &) = delete; + MdnsContexts(const MdnsContexts &) = delete; MdnsContexts & operator=(const MdnsContexts &) = delete; ~MdnsContexts(); static MdnsContexts & GetInstance() { return sInstance; } diff --git a/src/platform/mt793x/KeyValueStoreManagerImpl.cpp b/src/platform/mt793x/KeyValueStoreManagerImpl.cpp index bd7ca83fe2c78f..1e0540c25cbaf3 100644 --- a/src/platform/mt793x/KeyValueStoreManagerImpl.cpp +++ b/src/platform/mt793x/KeyValueStoreManagerImpl.cpp @@ -29,7 +29,7 @@ #pragma GCC diagnostic ignored "-Wconversion" #endif -//#include +// #include #if defined(__GNUC__) #pragma GCC diagnostic pop diff --git a/src/platform/mt793x/KeyValueStoreManagerImpl.h b/src/platform/mt793x/KeyValueStoreManagerImpl.h index 40f21d1cf49985..ee811358df7430 100644 --- a/src/platform/mt793x/KeyValueStoreManagerImpl.h +++ b/src/platform/mt793x/KeyValueStoreManagerImpl.h @@ -32,9 +32,9 @@ #pragma GCC diagnostic ignored "-Wconversion" #endif -//#include -//#include -//#include +// #include +// #include +// #include #if defined(__GNUC__) #pragma GCC diagnostic pop diff --git a/src/platform/mt793x/MT793XConfig.cpp b/src/platform/mt793x/MT793XConfig.cpp index 6322a8aa6ec59d..a524315657a762 100644 --- a/src/platform/mt793x/MT793XConfig.cpp +++ b/src/platform/mt793x/MT793XConfig.cpp @@ -44,16 +44,16 @@ const MT793XConfig::Key MT793XConfig::kConfigKey_SerialNum = { .Namespace = kC const MT793XConfig::Key MT793XConfig::kConfigKey_UniqueId = { .Namespace = kConfigNamespace_ChipFactory, .Name = "unique-id" }; const MT793XConfig::Key MT793XConfig::kConfigKey_MfrDeviceId = { .Namespace = kConfigNamespace_ChipFactory, .Name = "device-id" }; const MT793XConfig::Key MT793XConfig::kConfigKey_MfrDeviceCert = { .Namespace = kConfigNamespace_ChipFactory, - .Name = "device-cert" }; + .Name = "device-cert" }; const MT793XConfig::Key MT793XConfig::kConfigKey_MfrDevicePrivateKey = { .Namespace = kConfigNamespace_ChipFactory, .Name = "device-key" }; const MT793XConfig::Key MT793XConfig::kConfigKey_ManufacturingDate = { .Namespace = kConfigNamespace_ChipFactory, - .Name = "mfg-date" }; + .Name = "mfg-date" }; const MT793XConfig::Key MT793XConfig::kConfigKey_SetupPinCode = { .Namespace = kConfigNamespace_ChipFactory, .Name = "pin-code" }; const MT793XConfig::Key MT793XConfig::kConfigKey_MfrDeviceICACerts = { .Namespace = kConfigNamespace_ChipFactory, - .Name = "device-ca-certs" }; + .Name = "device-ca-certs" }; const MT793XConfig::Key MT793XConfig::kConfigKey_SetupDiscriminator = { .Namespace = kConfigNamespace_ChipFactory, - .Name = "discriminator" }; + .Name = "discriminator" }; const MT793XConfig::Key MT793XConfig::kConfigKey_Spake2pIterationCount = { .Namespace = kConfigNamespace_ChipFactory, .Name = "iteration-count" }; const MT793XConfig::Key MT793XConfig::kConfigKey_Spake2pSalt = { .Namespace = kConfigNamespace_ChipFactory, .Name = "salt" }; @@ -71,10 +71,10 @@ const MT793XConfig::Key MT793XConfig::kConfigKey_FabricSecret = { .Namespace = k const MT793XConfig::Key MT793XConfig::kConfigKey_LastUsedEpochKeyId = { .Namespace = kConfigNamespace_ChipConfig, .Name = "last-ek-id" }; const MT793XConfig::Key MT793XConfig::kConfigKey_FailSafeArmed = { .Namespace = kConfigNamespace_ChipConfig, - .Name = "fail-safe-armed" }; + .Name = "fail-safe-armed" }; const MT793XConfig::Key MT793XConfig::kConfigKey_GroupKey = { .Namespace = kConfigNamespace_ChipConfig, .Name = "group-key" }; const MT793XConfig::Key MT793XConfig::kConfigKey_HardwareVersion = { .Namespace = kConfigNamespace_ChipConfig, - .Name = "hardware-ver" }; + .Name = "hardware-ver" }; const MT793XConfig::Key MT793XConfig::kConfigKey_RegulatoryLocation = { .Namespace = kConfigNamespace_ChipConfig, .Name = "reg-location" }; const MT793XConfig::Key MT793XConfig::kConfigKey_CountryCode = { .Namespace = kConfigNamespace_ChipConfig, .Name = "country-code" }; @@ -85,15 +85,15 @@ const MT793XConfig::Key MT793XConfig::kConfigKey_WiFiSEC = { .Namespace = kC const MT793XConfig::Key MT793XConfig::kConfigKey_GroupKeyBase = { .Namespace = kConfigNamespace_ChipConfig, .Name = "group-key-base" }; const MT793XConfig::Key MT793XConfig::kConfigKey_GroupKeyMax = { .Namespace = kConfigNamespace_ChipConfig, - .Name = "group-key-max" }; + .Name = "group-key-max" }; const MT793XConfig::Key MT793XConfig::kConfigKey_LockUser = { .Namespace = kConfigNamespace_ChipConfig, .Name = "lock-user" }; const MT793XConfig::Key MT793XConfig::kConfigKey_Credential = { .Namespace = kConfigNamespace_ChipConfig, .Name = "credential" }; const MT793XConfig::Key MT793XConfig::kConfigKey_LockUserName = { .Namespace = kConfigNamespace_ChipConfig, .Name = "lock-user-name" }; const MT793XConfig::Key MT793XConfig::kConfigKey_CredentialData = { .Namespace = kConfigNamespace_ChipConfig, - .Name = "credential-data" }; + .Name = "credential-data" }; const MT793XConfig::Key MT793XConfig::kConfigKey_UserCredentials = { .Namespace = kConfigNamespace_ChipConfig, - .Name = "user-credential" }; + .Name = "user-credential" }; const MT793XConfig::Key MT793XConfig::kConfigKey_WeekDaySchedules = { .Namespace = kConfigNamespace_ChipConfig, .Name = "weekday-sched" }; const MT793XConfig::Key MT793XConfig::kConfigKey_YearDaySchedules = { .Namespace = kConfigNamespace_ChipConfig, diff --git a/src/platform/mt793x/gatt_db.h b/src/platform/mt793x/gatt_db.h index 7eab6135d0a33c..a36444ddd3f98a 100644 --- a/src/platform/mt793x/gatt_db.h +++ b/src/platform/mt793x/gatt_db.h @@ -27,7 +27,7 @@ extern "C" { #endif -//#include "sli_bt_gattdb_def.h" +// #include "sli_bt_gattdb_def.h" // extern const sli_bt_gattdb_t gattdb; diff --git a/src/platform/mt793x/mt793x-mbedtls-config.h b/src/platform/mt793x/mt793x-mbedtls-config.h index b37edfcdfbb135..6c95e3ca780c34 100644 --- a/src/platform/mt793x/mt793x-mbedtls-config.h +++ b/src/platform/mt793x/mt793x-mbedtls-config.h @@ -88,7 +88,7 @@ #define MBEDTLS_PSA_CRYPTO_C #define MBEDTLS_PSA_CRYPTO_CONFIG #define MBEDTLS_PSA_CRYPTO_DRIVERS -//#define MBEDTLS_PSA_CRYPTO_STORAGE_C +// #define MBEDTLS_PSA_CRYPTO_STORAGE_C #define MBEDTLS_SHA256_SMALLER #define MBEDTLS_SHA512_C #define MBEDTLS_SSL_CLI_C diff --git a/src/platform/nrfconnect/FactoryDataParser.c b/src/platform/nrfconnect/FactoryDataParser.c index 45f9951f7ea8db..610c78ab3e724f 100644 --- a/src/platform/nrfconnect/FactoryDataParser.c +++ b/src/platform/nrfconnect/FactoryDataParser.c @@ -184,10 +184,11 @@ bool ParseFactoryData(uint8_t * buffer, uint16_t bufferSize, struct FactoryData isdigit(date.value[3]) && date.value[4] == '-' && isdigit(date.value[5]) && isdigit(date.value[6]) && date.value[7] == '-' && isdigit(date.value[8]) && isdigit(date.value[9])) { - factoryData->date_year = (uint16_t)(1000 * (uint16_t)(date.value[0] - '0') + 100 * (uint16_t)(date.value[1] - '0') + - 10 * (uint16_t)(date.value[2] - '0') + (uint16_t)(date.value[3] - '0')); - factoryData->date_month = (uint8_t)(10 * (uint16_t)(date.value[5] - '0') + (uint16_t)(date.value[6] - '0')); - factoryData->date_day = (uint8_t)(10 * (uint16_t)(date.value[8] - '0') + (uint16_t)(date.value[9] - '0')); + factoryData->date_year = + (uint16_t) (1000 * (uint16_t) (date.value[0] - '0') + 100 * (uint16_t) (date.value[1] - '0') + + 10 * (uint16_t) (date.value[2] - '0') + (uint16_t) (date.value[3] - '0')); + factoryData->date_month = (uint8_t) (10 * (uint16_t) (date.value[5] - '0') + (uint16_t) (date.value[6] - '0')); + factoryData->date_day = (uint8_t) (10 * (uint16_t) (date.value[8] - '0') + (uint16_t) (date.value[9] - '0')); } else { @@ -260,7 +261,7 @@ bool ParseFactoryData(uint8_t * buffer, uint16_t bufferSize, struct FactoryData { factoryData->user.data = (void *) states->payload; res = res && zcbor_any_skip(states, NULL); - factoryData->user.len = (size_t)((void *) states->payload - factoryData->user.data); + factoryData->user.len = (size_t) ((void *) states->payload - factoryData->user.data); } else { diff --git a/src/platform/nrfconnect/wifi/WiFiManager.h b/src/platform/nrfconnect/wifi/WiFiManager.h index 5c477d7fa6c73e..5e248a3bebe229 100644 --- a/src/platform/nrfconnect/wifi/WiFiManager.h +++ b/src/platform/nrfconnect/wifi/WiFiManager.h @@ -74,12 +74,12 @@ class Map return T2{}; } - Map() = delete; - Map(const Map &) = delete; - Map(Map &&) = delete; + Map() = delete; + Map(const Map &) = delete; + Map(Map &&) = delete; Map & operator=(const Map &) = delete; - Map & operator=(Map &&) = delete; - ~Map() = default; + Map & operator=(Map &&) = delete; + ~Map() = default; private: Pair mMap[N]; diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_p256.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_p256.cpp index a9c8cd94bdacb6..4ec19deed47ac8 100644 --- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_p256.cpp +++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_p256.cpp @@ -86,7 +86,7 @@ static CHIP_ERROR parse_se05x_keyid_from_keypair(const P256KeypairContext mKeypa return CHIP_NO_ERROR; } -#endif //#if (ENABLE_SE05X_GENERATE_EC_KEY || ENABLE_SE05X_ECDSA_VERIFY) +#endif // #if (ENABLE_SE05X_GENERATE_EC_KEY || ENABLE_SE05X_ECDSA_VERIFY) P256Keypair::~P256Keypair() { @@ -297,12 +297,12 @@ CHIP_ERROR P256Keypair::Deserialize(P256SerializedKeypair & input) sss_object_t sss_object = { 0 }; sss_status_t sss_status = kStatus_SSS_Fail; - uint32_t keyid = 0; + uint32_t keyid = 0; uint8_t keyid_buffer[4] = { 0 }; - uint8_t key[128] = { 0 }; - uint8_t header[] = EC_NIST_P256_KP_HEADER; - uint8_t pub_header[] = EC_NIST_P256_KP_PUB_HEADER; - size_t key_length = 0; + uint8_t key[128] = { 0 }; + uint8_t header[] = EC_NIST_P256_KP_HEADER; + uint8_t pub_header[] = EC_NIST_P256_KP_PUB_HEADER; + size_t key_length = 0; memcpy(&key[key_length], header, sizeof(header)); key_length += sizeof(header); @@ -344,7 +344,7 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k return ECDH_derive_secret_H(&mKeypair, remote_public_key, out_secret); #else size_t secret_length = (out_secret.Length() == 0) ? out_secret.Capacity() : out_secret.Length(); - uint32_t keyid = 0; + uint32_t keyid = 0; if (CHIP_NO_ERROR != parse_se05x_keyid_from_keypair(mKeypair, &keyid)) { @@ -358,7 +358,7 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k VerifyOrReturnError(gex_sss_chip_ctx.ks.session != NULL, CHIP_ERROR_INTERNAL); const uint8_t * const rem_pubKey = Uint8::to_const_uchar(remote_public_key); - const size_t rem_pubKeyLen = remote_public_key.Length(); + const size_t rem_pubKeyLen = remote_public_key.Length(); VerifyOrReturnError(gex_sss_chip_ctx.ks.session != nullptr, CHIP_ERROR_INTERNAL); @@ -415,16 +415,16 @@ CHIP_ERROR P256PublicKey::ECDSA_validate_msg_signature(const uint8_t * msg, size #if !ENABLE_SE05X_ECDSA_VERIFY return ECDSA_validate_msg_signature_H(this, msg, msg_length, signature); #else - CHIP_ERROR error = CHIP_ERROR_INTERNAL; - sss_status_t status = kStatus_SSS_Success; + CHIP_ERROR error = CHIP_ERROR_INTERNAL; + sss_status_t status = kStatus_SSS_Success; sss_asymmetric_t asymm_ctx = { 0 }; - uint8_t hash[32] = { + uint8_t hash[32] = { 0, }; - size_t hash_length = sizeof(hash); - sss_object_t keyObject = { 0 }; + size_t hash_length = sizeof(hash); + sss_object_t keyObject = { 0 }; uint8_t signature_se05x[kMax_ECDSA_Signature_Length_Der] = { 0 }; - size_t signature_se05x_len = sizeof(signature_se05x); + size_t signature_se05x_len = sizeof(signature_se05x); MutableByteSpan out_der_sig_span(signature_se05x, signature_se05x_len); VerifyOrReturnError(msg != nullptr, CHIP_ERROR_INVALID_ARGUMENT); @@ -478,12 +478,12 @@ CHIP_ERROR P256PublicKey::ECDSA_validate_hash_signature(const uint8_t * hash, si #if !ENABLE_SE05X_ECDSA_VERIFY return ECDSA_validate_hash_signature_H(this, hash, hash_length, signature); #else - CHIP_ERROR error = CHIP_ERROR_INTERNAL; - sss_status_t status = kStatus_SSS_Success; - sss_asymmetric_t asymm_ctx = { 0 }; - sss_object_t keyObject = { 0 }; + CHIP_ERROR error = CHIP_ERROR_INTERNAL; + sss_status_t status = kStatus_SSS_Success; + sss_asymmetric_t asymm_ctx = { 0 }; + sss_object_t keyObject = { 0 }; uint8_t signature_se05x[kMax_ECDSA_Signature_Length_Der] = { 0 }; - size_t signature_se05x_len = sizeof(signature_se05x); + size_t signature_se05x_len = sizeof(signature_se05x); MutableByteSpan out_der_sig_span(signature_se05x, signature_se05x_len); VerifyOrReturnError(hash != nullptr, CHIP_ERROR_INVALID_ARGUMENT); @@ -577,28 +577,28 @@ CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * csr, size_t & csr #if !ENABLE_SE05X_GENERATE_EC_KEY return NewCertificateSigningRequest_H(&mKeypair, csr, csr_length); #else - CHIP_ERROR error = CHIP_ERROR_INTERNAL; - sss_status_t status = kStatus_SSS_Success; + CHIP_ERROR error = CHIP_ERROR_INTERNAL; + sss_status_t status = kStatus_SSS_Success; sss_asymmetric_t asymm_ctx = { 0 }; - sss_object_t keyObject = { 0 }; - uint32_t keyid = 0; + sss_object_t keyObject = { 0 }; + uint32_t keyid = 0; uint8_t data_to_hash[128] = { 0 }; - size_t data_to_hash_len = sizeof(data_to_hash); - uint8_t pubkey[128] = { 0 }; - size_t pubKeyLen = 0; - uint8_t hash[32] = { 0 }; - size_t hash_length = sizeof(hash); - uint8_t signature[128] = { 0 }; - size_t signature_len = sizeof(signature); - - size_t csr_index = 0; + size_t data_to_hash_len = sizeof(data_to_hash); + uint8_t pubkey[128] = { 0 }; + size_t pubKeyLen = 0; + uint8_t hash[32] = { 0 }; + size_t hash_length = sizeof(hash); + uint8_t signature[128] = { 0 }; + size_t signature_len = sizeof(signature); + + size_t csr_index = 0; size_t buffer_index = data_to_hash_len; uint8_t organisation_oid[3] = { 0x55, 0x04, 0x0a }; // Version ::= INTEGER { v1(0), v2(1), v3(2) } - uint8_t version[3] = { 0x02, 0x01, 0x00 }; + uint8_t version[3] = { 0x02, 0x01, 0x00 }; uint8_t signature_oid[8] = { 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02 }; uint8_t nist256_header[] = { 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, 0x01, 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00 }; @@ -695,7 +695,7 @@ CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * csr, size_t & csr { csr[csr_index++] = 0x81; } - csr[csr_index++] = (uint8_t)(data_to_hash_len + 14 + kTlvHeader + signature_len); + csr[csr_index++] = (uint8_t) (data_to_hash_len + 14 + kTlvHeader + signature_len); VerifyOrExit((csr_index + data_to_hash_len) <= csr_length, error = CHIP_ERROR_INTERNAL); memcpy((csr + csr_index), data_to_hash, data_to_hash_len); @@ -717,7 +717,7 @@ CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * csr, size_t & csr VerifyOrExit((csr_index + kTlvHeader) <= csr_length, error = CHIP_ERROR_INTERNAL); csr[csr_index++] = ASN1_BIT_STRING; - csr[csr_index++] = (uint8_t)((signature[0] != 0) ? (signature_len + 1) : (signature_len)); + csr[csr_index++] = (uint8_t) ((signature[0] != 0) ? (signature_len + 1) : (signature_len)); if (signature[0] != 0) { diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_spake2p.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_spake2p.cpp index f1b13a54458cd6..84216185a68f6e 100644 --- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_spake2p.cpp +++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_spake2p.cpp @@ -49,7 +49,7 @@ void Spake2p_Finish_HSM(hsm_pake_context_t * phsm_pake_context) spake_objects_created--; } } -#endif //#if ENABLE_REENTRANCY +#endif // #if ENABLE_REENTRANCY return; } @@ -204,7 +204,7 @@ CHIP_ERROR Spake2pHSM_P256_SHA256_HKDF_HMAC::Init(const uint8_t * context, size_ se05x_init_cryptoObj_mutex(); alreadyInitialised = true; } -#endif //#if ENABLE_REENTRANCY +#endif // #if ENABLE_REENTRANCY if (context_len > 0) { @@ -441,4 +441,4 @@ CHIP_ERROR Spake2pHSM_P256_SHA256_HKDF_HMAC::KeyConfirm(const uint8_t * in, size } // namespace Crypto } // namespace chip -#endif //#if ((ENABLE_SE05X_SPAKE_VERIFIER) || (ENABLE_SE05X_SPAKE_PROVER)) +#endif // #if ((ENABLE_SE05X_SPAKE_VERIFIER) || (ENABLE_SE05X_SPAKE_PROVER)) diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.cpp b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.cpp index ed5edc566b6cb9..63f4b6c6448ffa 100644 --- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.cpp +++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.cpp @@ -73,7 +73,7 @@ static Mutex sSEObjMutex; #define UNLOCK_SECURE_ELEMENT() #endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING -#endif //#if ENABLE_REENTRANCY +#endif // #if ENABLE_REENTRANCY /* Open session to se05x */ CHIP_ERROR se05x_sessionOpen(void) @@ -378,4 +378,4 @@ void se05x_setCryptoObjID(SE05x_CryptoObjectID_t objId, uint8_t status) UNLOCK_SECURE_ELEMENT(); } -#endif //#if ENABLE_REENTRANCY +#endif // #if ENABLE_REENTRANCY diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.h b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.h index a18e53e140f4a9..7b36886096b2b8 100644 --- a/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.h +++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPALHsm_se05x_utils.h @@ -95,7 +95,7 @@ SE05x_CryptoObjectID_t se05x_getCryptoObjID(void); /* Set object id status */ void se05x_setCryptoObjID(SE05x_CryptoObjectID_t objId, uint8_t status); -#endif //#if ENABLE_REENTRANCY +#endif // #if ENABLE_REENTRANCY #ifdef __cplusplus } diff --git a/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_se05x.h b/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_se05x.h index b1adef99b9ef52..6c180633e6b6da 100644 --- a/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_se05x.h +++ b/src/platform/nxp/crypto/se05x/CHIPCryptoPAL_se05x.h @@ -32,7 +32,7 @@ typedef struct hsm_pake_context_s size_t spake_context_len; uint8_t spake_objId; } hsm_pake_context_t; -#endif //#if ((ENABLE_SE05X_SPAKE_VERIFIER) || (ENABLE_SE05X_SPAKE_PROVER)) +#endif // #if ((ENABLE_SE05X_SPAKE_VERIFIER) || (ENABLE_SE05X_SPAKE_PROVER)) namespace chip { namespace Crypto { @@ -77,7 +77,7 @@ class Spake2pHSM_P256_SHA256_HKDF_HMAC : public Spake2p_P256_SHA256_HKDF_HMAC hsm_pake_context_t hsm_pake_context; }; -#endif //#if ((ENABLE_SE05X_SPAKE_VERIFIER) || (ENABLE_SE05X_SPAKE_PROVER)) +#endif // #if ((ENABLE_SE05X_SPAKE_VERIFIER) || (ENABLE_SE05X_SPAKE_PROVER)) } // namespace Crypto } // namespace chip diff --git a/src/platform/nxp/k32w/common/BLEManagerCommon.cpp b/src/platform/nxp/k32w/common/BLEManagerCommon.cpp index 05b878bfd3d202..2e3c5a35974c96 100644 --- a/src/platform/nxp/k32w/common/BLEManagerCommon.cpp +++ b/src/platform/nxp/k32w/common/BLEManagerCommon.cpp @@ -665,14 +665,14 @@ CHIP_ERROR BLEManagerCommon::ConfigureAdvertisingData(void) { advInterval = CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX; } - advInterval = (uint16_t)(advInterval * 0.625F); + advInterval = (uint16_t) (advInterval * 0.625F); adv_params.minInterval = adv_params.maxInterval = advInterval; adv_params.advertisingType = gAdvConnectableUndirected_c; adv_params.ownAddressType = gBleAddrTypeRandom_c; adv_params.peerAddressType = gBleAddrTypePublic_c; memset(adv_params.peerAddress, 0, gcBleDeviceAddressSize_c); - adv_params.channelMap = (gapAdvertisingChannelMapFlags_t)(gAdvChanMapFlag37_c | gAdvChanMapFlag38_c | gAdvChanMapFlag39_c); + adv_params.channelMap = (gapAdvertisingChannelMapFlags_t) (gAdvChanMapFlag37_c | gAdvChanMapFlag38_c | gAdvChanMapFlag39_c); adv_params.filterPolicy = gProcessAll_c; err = blekw_start_advertising(&adv_params, &adv, &scanRsp); diff --git a/src/platform/nxp/k32w/common/FactoryDataProvider.cpp b/src/platform/nxp/k32w/common/FactoryDataProvider.cpp index 5e99042ba4f0ed..98bb1653210601 100644 --- a/src/platform/nxp/k32w/common/FactoryDataProvider.cpp +++ b/src/platform/nxp/k32w/common/FactoryDataProvider.cpp @@ -162,7 +162,7 @@ CHIP_ERROR FactoryDataProvider::GetSetupDiscriminator(uint16_t & setupDiscrimina uint16_t temp = 0; ReturnErrorOnFailure(SearchForId(FactoryDataId::kDiscriminatorId, (uint8_t *) &discriminator, sizeof(discriminator), temp)); - setupDiscriminator = (uint16_t)(discriminator & 0x0000FFFF); + setupDiscriminator = (uint16_t) (discriminator & 0x0000FFFF); return CHIP_NO_ERROR; } diff --git a/src/platform/nxp/k32w/k32w0/LowPowerHooks.cpp b/src/platform/nxp/k32w/k32w0/LowPowerHooks.cpp index a9bbcac8613d8f..5d98fc1f0c6b67 100644 --- a/src/platform/nxp/k32w/k32w0/LowPowerHooks.cpp +++ b/src/platform/nxp/k32w/k32w0/LowPowerHooks.cpp @@ -246,7 +246,7 @@ void dm_switch_init15_4AfterWakeUp(void) if (dualModeStates.threadWarmBootInitTime == kThreadWarmNotInitializedValue) { - dualModeStates.threadWarmBootInitTime = (uint32_t)(otPlatTimeGet() - tick1); + dualModeStates.threadWarmBootInitTime = (uint32_t) (otPlatTimeGet() - tick1); /* Add a margin of 0.5 ms */ dualModeStates.threadWarmBootInitTime += 500; diff --git a/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.cpp b/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.cpp index e67680554fc0a9..0435d168a99305 100644 --- a/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.cpp +++ b/src/platform/nxp/k32w/k32w0/ThreadStackManagerImpl.cpp @@ -107,7 +107,7 @@ extern "C" void otTaskletsSignalPending(otInstance * p_instance) extern "C" void * pvPortCallocRtos(size_t num, size_t size) { - size_t totalAllocSize = (size_t)(num * size); + size_t totalAllocSize = (size_t) (num * size); if (size && totalAllocSize / size != num) return nullptr; diff --git a/src/platform/nxp/k32w/k32w0/k32w0-chip-mbedtls-config.h b/src/platform/nxp/k32w/k32w0/k32w0-chip-mbedtls-config.h index e24aad2f9e0200..3cdee6cea49376 100644 --- a/src/platform/nxp/k32w/k32w0/k32w0-chip-mbedtls-config.h +++ b/src/platform/nxp/k32w/k32w0/k32w0-chip-mbedtls-config.h @@ -104,7 +104,7 @@ * RSA-2048 still requires the FREESCALE_PKHA_LONG_OPERANDS_ENABLE macro to be defined, * otherwise it fails at runtime. */ -//#define FREESCALE_PKHA_LONG_OPERANDS_ENABLE +// #define FREESCALE_PKHA_LONG_OPERANDS_ENABLE #endif /* Enable AES use in library if there is AES on chip. */ diff --git a/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h b/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h index 7c087f7361e069..678695e9b304c6 100644 --- a/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h +++ b/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h @@ -61,6 +61,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0 // mdns/mdns_sd ++ -//#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DISCOVERY 1 +// #define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DISCOVERY 1 #define CHIP_DEVICE_CONFIG_ENABLE_DNSSD 1 // mdns/dns_sd -- diff --git a/src/platform/nxp/mw320/ConfigurationManagerImpl.cpp b/src/platform/nxp/mw320/ConfigurationManagerImpl.cpp index 1a15b60f2b0e8c..ee61de629109ae 100644 --- a/src/platform/nxp/mw320/ConfigurationManagerImpl.cpp +++ b/src/platform/nxp/mw320/ConfigurationManagerImpl.cpp @@ -31,7 +31,7 @@ #include #include -//#include "core_cm7.h" +// #include "core_cm7.h" namespace chip { namespace DeviceLayer { diff --git a/src/platform/nxp/mw320/ConfigurationManagerImpl.h b/src/platform/nxp/mw320/ConfigurationManagerImpl.h index af1f75ef3cadd2..9a182ae9e37bdb 100644 --- a/src/platform/nxp/mw320/ConfigurationManagerImpl.h +++ b/src/platform/nxp/mw320/ConfigurationManagerImpl.h @@ -61,9 +61,9 @@ class ConfigurationManagerImpl final : public Internal::GenericConfigurationMana // Allow the GenericConfigurationManagerImpl base class to access helper methods and types // defined on this class. - //#ifndef DOXYGEN_SHOULD_SKIP_THIS + // #ifndef DOXYGEN_SHOULD_SKIP_THIS // friend class Internal::GenericConfigurationManagerImpl; - //#endif + // #endif private: // ===== Members that implement the ConfigurationManager public interface. diff --git a/src/platform/nxp/mw320/ConnectivityUtils.h b/src/platform/nxp/mw320/ConnectivityUtils.h index ddf5039ebed72d..ff8575dd2f2bbf 100644 --- a/src/platform/nxp/mw320/ConnectivityUtils.h +++ b/src/platform/nxp/mw320/ConnectivityUtils.h @@ -26,8 +26,8 @@ #include #include -//#include /* for "caddr_t" et al */ -//#include +// #include /* for "caddr_t" et al */ +// #include namespace chip { namespace DeviceLayer { diff --git a/src/platform/nxp/mw320/DeviceInfoProviderImpl.h b/src/platform/nxp/mw320/DeviceInfoProviderImpl.h index d06582f16405d5..e35bbe132efe23 100644 --- a/src/platform/nxp/mw320/DeviceInfoProviderImpl.h +++ b/src/platform/nxp/mw320/DeviceInfoProviderImpl.h @@ -18,7 +18,7 @@ #include #include -//#include +// #include namespace chip { namespace DeviceLayer { diff --git a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp index ae53f7c5fadc46..04a59761c87277 100644 --- a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp +++ b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp @@ -35,7 +35,7 @@ extern "C" { #include "wlan.h" } -//#include +// #include using namespace ::chip; using namespace ::chip::app; using namespace ::chip::DeviceLayer; diff --git a/src/platform/nxp/mw320/FactoryDataProvider.cpp b/src/platform/nxp/mw320/FactoryDataProvider.cpp index 182824ff396168..5b36958f306d5b 100644 --- a/src/platform/nxp/mw320/FactoryDataProvider.cpp +++ b/src/platform/nxp/mw320/FactoryDataProvider.cpp @@ -209,7 +209,7 @@ CHIP_ERROR FactoryDataProvider::GetSetupDiscriminator(uint16_t & setupDiscrimina uint16_t temp = 0; ReturnErrorOnFailure(SearchForId(kDiscriminatorId, (uint8_t *) &discriminator, sizeof(discriminator), temp)); - setupDiscriminator = (uint16_t)(discriminator & 0x0000FFFF); + setupDiscriminator = (uint16_t) (discriminator & 0x0000FFFF); return CHIP_NO_ERROR; } diff --git a/src/platform/nxp/mw320/KeyValueStoreManagerImpl.cpp b/src/platform/nxp/mw320/KeyValueStoreManagerImpl.cpp index ddf3472c2a55ff..349de94965cbb6 100644 --- a/src/platform/nxp/mw320/KeyValueStoreManagerImpl.cpp +++ b/src/platform/nxp/mw320/KeyValueStoreManagerImpl.cpp @@ -64,7 +64,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t VerifyOrReturnError(value != nullptr, CHIP_ERROR_INVALID_ARGUMENT); - size_t copy_size = std::min(value_size, (size_t)(read_size - offset_bytes)); + size_t copy_size = std::min(value_size, (size_t) (read_size - offset_bytes)); ::memcpy(value, &buf[offset_bytes], copy_size); *read_bytes_size = copy_size; diff --git a/src/platform/nxp/mw320/NetworkCommissioningWiFiDriver.cpp b/src/platform/nxp/mw320/NetworkCommissioningWiFiDriver.cpp index c096a47dd0e785..d756363a65f298 100644 --- a/src/platform/nxp/mw320/NetworkCommissioningWiFiDriver.cpp +++ b/src/platform/nxp/mw320/NetworkCommissioningWiFiDriver.cpp @@ -15,8 +15,8 @@ * limitations under the License. */ -//#include -//#include +// #include +// #include #include #include diff --git a/src/platform/openiotsdk/OpenIoTSDKArchUtils.c b/src/platform/openiotsdk/OpenIoTSDKArchUtils.c index 96378c7f24f730..10b260d1a36554 100644 --- a/src/platform/openiotsdk/OpenIoTSDKArchUtils.c +++ b/src/platform/openiotsdk/OpenIoTSDKArchUtils.c @@ -51,14 +51,14 @@ uint32_t sec2tick(uint32_t sec) uint32_t ms2tick(uint32_t ms) { - return (uint32_t)(((uint64_t) ms * (uint64_t) osKernelGetTickFreq()) / 1000U); + return (uint32_t) (((uint64_t) ms * (uint64_t) osKernelGetTickFreq()) / 1000U); } uint32_t us2tick(uint32_t usec) { // round division up because our tick is so long this might become 0 // we need the timer to sleep at least one tick as it otherwise breaks expectations - return (uint32_t)(((uint64_t) usec * osKernelGetTickFreq() + (1000000 - 1)) / 1000000); + return (uint32_t) (((uint64_t) usec * osKernelGetTickFreq() + (1000000 - 1)) / 1000000); } /* Kernel ticks to time */ @@ -110,7 +110,7 @@ void usleep(uint32_t usec) time_t time(time_t * __timer) { - time_t seconds = (time_t)(tick2sec(GetTick())); + time_t seconds = (time_t) (tick2sec(GetTick())); if (__timer) { *__timer = seconds; diff --git a/src/platform/openiotsdk/PlatformManagerImpl.cpp b/src/platform/openiotsdk/PlatformManagerImpl.cpp index 896617d781e31f..65632dabff1f87 100644 --- a/src/platform/openiotsdk/PlatformManagerImpl.cpp +++ b/src/platform/openiotsdk/PlatformManagerImpl.cpp @@ -42,7 +42,7 @@ namespace DeviceLayer { struct ScopedLock { ScopedLock(osMutexId_t & lockable) : _lockable(lockable) { osMutexAcquire(_lockable, osWaitForever); } - ScopedLock(const ScopedLock &) = delete; + ScopedLock(const ScopedLock &) = delete; ScopedLock & operator=(const ScopedLock &) = delete; ~ScopedLock() { osMutexRelease(_lockable); } diff --git a/src/platform/silabs/CHIPMem-Platform.cpp b/src/platform/silabs/CHIPMem-Platform.cpp index a826ebe856ca1e..20859100f129c4 100644 --- a/src/platform/silabs/CHIPMem-Platform.cpp +++ b/src/platform/silabs/CHIPMem-Platform.cpp @@ -41,7 +41,7 @@ * */ -//#include +// #include #include #include "heap_4_silabs.h" diff --git a/src/platform/silabs/KeyValueStoreManagerImpl.cpp b/src/platform/silabs/KeyValueStoreManagerImpl.cpp index d78e957d2f40bc..012c951aaaa729 100644 --- a/src/platform/silabs/KeyValueStoreManagerImpl.cpp +++ b/src/platform/silabs/KeyValueStoreManagerImpl.cpp @@ -183,7 +183,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t // The user doesn't need the KeyString prefix, Read data after it size_t KeyStringLen = strlen(key); err = SilabsConfig::ReadConfigValueBin(nvm3Key, reinterpret_cast(value), value_size, outLen, - (offset_bytes + KeyStringLen)); + (offset_bytes + KeyStringLen)); if (read_bytes_size) { *read_bytes_size = outLen; diff --git a/src/platform/silabs/SiWx917/wifi/wfx_notify.cpp b/src/platform/silabs/SiWx917/wifi/wfx_notify.cpp index 215555c615c647..3d0f56cf14f442 100644 --- a/src/platform/silabs/SiWx917/wifi/wfx_notify.cpp +++ b/src/platform/silabs/SiWx917/wifi/wfx_notify.cpp @@ -32,7 +32,7 @@ #endif #include -//#include +// #include #include #include diff --git a/src/platform/silabs/efr32/BLEManagerImpl.cpp b/src/platform/silabs/efr32/BLEManagerImpl.cpp index ae8bb91ad846c4..f8130df8b89fdf 100644 --- a/src/platform/silabs/efr32/BLEManagerImpl.cpp +++ b/src/platform/silabs/efr32/BLEManagerImpl.cpp @@ -99,7 +99,7 @@ namespace { TimerHandle_t sbleAdvTimeoutTimer; // FreeRTOS sw timer. const uint8_t UUID_CHIPoBLEService[] = { 0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80, - 0x00, 0x10, 0x00, 0x00, 0xF6, 0xFF, 0x00, 0x00 }; + 0x00, 0x10, 0x00, 0x00, 0xF6, 0xFF, 0x00, 0x00 }; const uint8_t ShortUUID_CHIPoBLEService[] = { 0xF6, 0xFF }; const ChipBleUUID ChipUUID_CHIPoBLEChar_RX = { { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42, 0x9F, 0x9D, 0x11 } }; diff --git a/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.h b/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.h index 4203724bd0dba7..4cb035e1459d2c 100644 --- a/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.h +++ b/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.h @@ -55,7 +55,7 @@ class Efr32PsaOperationalKeystore : public chip::Crypto::OperationalKeystore // Non-copyable Efr32PsaOperationalKeystore(Efr32PsaOperationalKeystore const &) = delete; - void operator=(Efr32PsaOperationalKeystore const &) = delete; + void operator=(Efr32PsaOperationalKeystore const &) = delete; /** * @brief Initialize the Operational Keystore diff --git a/src/platform/silabs/efr32/wifi/wfx_notify.cpp b/src/platform/silabs/efr32/wifi/wfx_notify.cpp index bbc7f91570de21..f888a1a4c5c0ab 100644 --- a/src/platform/silabs/efr32/wifi/wfx_notify.cpp +++ b/src/platform/silabs/efr32/wifi/wfx_notify.cpp @@ -39,7 +39,7 @@ #endif #include -//#include +// #include #include #include diff --git a/src/platform/silabs/rs911x/BLEManagerImpl.cpp b/src/platform/silabs/rs911x/BLEManagerImpl.cpp index a1f627bfc03f2a..717f0798c2068d 100644 --- a/src/platform/silabs/rs911x/BLEManagerImpl.cpp +++ b/src/platform/silabs/rs911x/BLEManagerImpl.cpp @@ -214,7 +214,7 @@ namespace { TimerHandle_t sbleAdvTimeoutTimer; // FreeRTOS sw timer. const uint8_t UUID_CHIPoBLEService[] = { 0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80, - 0x00, 0x10, 0x00, 0x00, 0xF6, 0xFF, 0x00, 0x00 }; + 0x00, 0x10, 0x00, 0x00, 0xF6, 0xFF, 0x00, 0x00 }; const uint8_t ShortUUID_CHIPoBLEService[] = { 0xF6, 0xFF }; const ChipBleUUID ChipUUID_CHIPoBLEChar_RX = { { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42, 0x9F, 0x9D, 0x11 } }; diff --git a/src/platform/stm32/FactoryDataProvider.cpp b/src/platform/stm32/FactoryDataProvider.cpp index 50a7798b345d6e..fc8e072836fd41 100644 --- a/src/platform/stm32/FactoryDataProvider.cpp +++ b/src/platform/stm32/FactoryDataProvider.cpp @@ -24,8 +24,7 @@ #include namespace chip { -namespace { -} // namespace +namespace {} // namespace namespace DeviceLayer { diff --git a/src/platform/stm32/ThreadStackManagerImpl.cpp b/src/platform/stm32/ThreadStackManagerImpl.cpp index ee97ff2ad0927b..e334243c294fd9 100644 --- a/src/platform/stm32/ThreadStackManagerImpl.cpp +++ b/src/platform/stm32/ThreadStackManagerImpl.cpp @@ -40,7 +40,7 @@ #include #include -//#include +// #include #include #include diff --git a/src/platform/telink/BLEManagerImpl.cpp b/src/platform/telink/BLEManagerImpl.cpp index 392d6049515238..c0fb4998645df7 100644 --- a/src/platform/telink/BLEManagerImpl.cpp +++ b/src/platform/telink/BLEManagerImpl.cpp @@ -271,14 +271,14 @@ inline CHIP_ERROR BLEManagerImpl::PrepareAdvertisingRequest(void) advertisingData[1] = BT_DATA(BT_DATA_SVC_DATA16, &serviceData, sizeof(serviceData)); scanResponseData[0] = BT_DATA(BT_DATA_NAME_COMPLETE, name, nameSize); - mAdvertisingRequest.priority = CHIP_DEVICE_BLE_ADVERTISING_PRIORITY; - mAdvertisingRequest.options = kAdvertisingOptions; - mAdvertisingRequest.minInterval = mFlags.Has(Flags::kFastAdvertisingEnabled) - ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MIN - : CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN; - mAdvertisingRequest.maxInterval = mFlags.Has(Flags::kFastAdvertisingEnabled) - ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MAX - : CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX; + mAdvertisingRequest.priority = CHIP_DEVICE_BLE_ADVERTISING_PRIORITY; + mAdvertisingRequest.options = kAdvertisingOptions; + mAdvertisingRequest.minInterval = mFlags.Has(Flags::kFastAdvertisingEnabled) + ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MIN + : CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN; + mAdvertisingRequest.maxInterval = mFlags.Has(Flags::kFastAdvertisingEnabled) + ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_INTERVAL_MAX + : CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX; mAdvertisingRequest.advertisingData = Span(advertisingData); mAdvertisingRequest.scanResponseData = nameSize ? Span(scanResponseData) : Span{}; diff --git a/src/platform/webos/BLEManagerImpl.cpp b/src/platform/webos/BLEManagerImpl.cpp index 3ea67b6ad1c486..0e81ff3eb8233a 100644 --- a/src/platform/webos/BLEManagerImpl.cpp +++ b/src/platform/webos/BLEManagerImpl.cpp @@ -500,7 +500,7 @@ bool BLEManagerImpl::SubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const { bool result = false; result = SubscribeCharacteristicToWebOS(conId, static_cast(svcId->bytes), - static_cast(charId->bytes)); + static_cast(charId->bytes)); return result; } diff --git a/src/platform/webos/ChipDeviceScanner.h b/src/platform/webos/ChipDeviceScanner.h index 084d45d9ac0201..aab6e5db8d8ecc 100644 --- a/src/platform/webos/ChipDeviceScanner.h +++ b/src/platform/webos/ChipDeviceScanner.h @@ -58,8 +58,8 @@ class ChipDeviceScanner ChipDeviceScanner(LSHandle * handle, ChipDeviceScannerDelegate * delegate); ChipDeviceScanner(ChipDeviceScannerDelegate * delegate); - ChipDeviceScanner(ChipDeviceScanner &&) = default; - ChipDeviceScanner(const ChipDeviceScanner &) = delete; + ChipDeviceScanner(ChipDeviceScanner &&) = default; + ChipDeviceScanner(const ChipDeviceScanner &) = delete; ChipDeviceScanner & operator=(const ChipDeviceScanner &) = delete; ~ChipDeviceScanner(); diff --git a/src/platform/webos/DnssdImpl.h b/src/platform/webos/DnssdImpl.h index e7111800d3edff..694a5fd1c5c2b5 100644 --- a/src/platform/webos/DnssdImpl.h +++ b/src/platform/webos/DnssdImpl.h @@ -101,7 +101,7 @@ class Poller class MdnsAvahi { public: - MdnsAvahi(const MdnsAvahi &) = delete; + MdnsAvahi(const MdnsAvahi &) = delete; MdnsAvahi & operator=(const MdnsAvahi &) = delete; CHIP_ERROR Init(DnssdAsyncReturnCallback initCallback, DnssdAsyncReturnCallback errorCallback, void * context); diff --git a/src/protocols/bdx/tests/TestBdxTransferSession.cpp b/src/protocols/bdx/tests/TestBdxTransferSession.cpp index b246f459392752..9be2d7f5ffc885 100644 --- a/src/protocols/bdx/tests/TestBdxTransferSession.cpp +++ b/src/protocols/bdx/tests/TestBdxTransferSession.cpp @@ -578,8 +578,8 @@ void TestBadAcceptMessageFields(nlTestSuite * inSuite, void * inContext) // Verify AcceptTransfer() returns error for choosing unsupported transfer control mode TransferSession::TransferAcceptData acceptData2; - acceptData2.ControlMode = (driveMode == TransferControlFlags::kReceiverDrive) ? TransferControlFlags::kSenderDrive - : TransferControlFlags::kReceiverDrive; + acceptData2.ControlMode = (driveMode == TransferControlFlags::kReceiverDrive) ? TransferControlFlags::kSenderDrive + : TransferControlFlags::kReceiverDrive; acceptData2.MaxBlockSize = maxBlockSize; acceptData2.StartOffset = commonOffset; acceptData2.Length = commonLength; diff --git a/src/protocols/secure_channel/PASESession.cpp b/src/protocols/secure_channel/PASESession.cpp index e2adc530903db0..966bc1dbe8dae0 100644 --- a/src/protocols/secure_channel/PASESession.cpp +++ b/src/protocols/secure_channel/PASESession.cpp @@ -272,11 +272,11 @@ CHIP_ERROR PASESession::SendPBKDFParamRequest() const size_t mrpParamsSize = mLocalMRPConfig.HasValue() ? TLV::EstimateStructOverhead(sizeof(uint16_t), sizeof(uint16_t)) : 0; const size_t max_msg_len = TLV::EstimateStructOverhead(kPBKDFParamRandomNumberSize, // initiatorRandom, - sizeof(uint16_t), // initiatorSessionId - sizeof(PasscodeId), // passcodeId, - sizeof(uint8_t), // hasPBKDFParameters - mrpParamsSize // MRP Parameters - ); + sizeof(uint16_t), // initiatorSessionId + sizeof(PasscodeId), // passcodeId, + sizeof(uint8_t), // hasPBKDFParameters + mrpParamsSize // MRP Parameters + ); System::PacketBufferHandle req = System::PacketBufferHandle::New(max_msg_len); VerifyOrReturnError(!req.IsNull(), CHIP_ERROR_NO_MEMORY); diff --git a/src/protocols/secure_channel/tests/TestDefaultSessionResumptionStorage.cpp b/src/protocols/secure_channel/tests/TestDefaultSessionResumptionStorage.cpp index 547fb2aa9c9f2c..82e755b783b4b8 100644 --- a/src/protocols/secure_channel/tests/TestDefaultSessionResumptionStorage.cpp +++ b/src/protocols/secure_channel/tests/TestDefaultSessionResumptionStorage.cpp @@ -274,7 +274,7 @@ void TestInPlaceSave(nlTestSuite * inSuite, void * inContext) { uint16_t size = 0; auto rv = storage.SyncGetKeyValue(chip::SimpleSessionResumptionStorage::GetStorageKey(vector.resumptionId).KeyName(), - nullptr, size); + nullptr, size); NL_TEST_ASSERT(inSuite, rv == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND); } } diff --git a/src/protocols/secure_channel/tests/TestPASESession.cpp b/src/protocols/secure_channel/tests/TestPASESession.cpp index 0db3244379f3ca..9e7f4356c9d005 100644 --- a/src/protocols/secure_channel/tests/TestPASESession.cpp +++ b/src/protocols/secure_channel/tests/TestPASESession.cpp @@ -59,7 +59,7 @@ constexpr uint32_t sTestPaseMessageCount = 5; constexpr uint32_t sTestSpake2p01_PinCode = 20202021; constexpr uint32_t sTestSpake2p01_IterationCount = 1000; constexpr uint8_t sTestSpake2p01_Salt[] = { 0x53, 0x50, 0x41, 0x4B, 0x45, 0x32, 0x50, 0x20, - 0x4B, 0x65, 0x79, 0x20, 0x53, 0x61, 0x6C, 0x74 }; + 0x4B, 0x65, 0x79, 0x20, 0x53, 0x61, 0x6C, 0x74 }; constexpr Spake2pVerifier sTestSpake2p01_PASEVerifier = { .mW0 = { 0xB9, 0x61, 0x70, 0xAA, 0xE8, 0x03, 0x34, 0x68, 0x84, 0x72, 0x4F, 0xE9, 0xA3, 0xB2, 0x87, 0xC3, 0x03, 0x30, 0xC2, 0xA6, 0x60, 0x37, 0x5D, 0x17, 0xBB, 0x20, 0x5A, 0x8C, 0xF1, 0xAE, 0xCB, 0x35, diff --git a/src/protocols/user_directed_commissioning/UDCClientState.h b/src/protocols/user_directed_commissioning/UDCClientState.h index 36e14b0798ee84..6dc494bdffc33d 100644 --- a/src/protocols/user_directed_commissioning/UDCClientState.h +++ b/src/protocols/user_directed_commissioning/UDCClientState.h @@ -58,10 +58,10 @@ class UDCClientState public: UDCClientState() : mPeerAddress(PeerAddress::Uninitialized()) {} - UDCClientState(UDCClientState &&) = default; - UDCClientState(const UDCClientState &) = default; + UDCClientState(UDCClientState &&) = default; + UDCClientState(const UDCClientState &) = default; UDCClientState & operator=(const UDCClientState &) = default; - UDCClientState & operator=(UDCClientState &&) = default; + UDCClientState & operator=(UDCClientState &&) = default; const PeerAddress GetPeerAddress() const { return mPeerAddress; } void SetPeerAddress(const PeerAddress & address) { mPeerAddress = address; } diff --git a/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp b/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp index 8e9684f461abf3..a2f82e8bd60370 100644 --- a/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp +++ b/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp @@ -308,7 +308,7 @@ void TestUDCClientState(nlTestSuite * inSuite, void * inContext) const ByteSpan & value = GetSpan(rotatingIdLongString); rotatingIdLongLen = Encoding::HexToBytes(reinterpret_cast(value.data()), value.size(), rotatingIdLong, - chip::Dnssd::kMaxRotatingIdLen * 2); + chip::Dnssd::kMaxRotatingIdLen * 2); NL_TEST_ASSERT(inSuite, rotatingIdLongLen > chip::Dnssd::kMaxRotatingIdLen); diff --git a/src/pybindings/pycontroller/ControllerBindings/PyChip_ChipError.cpp b/src/pybindings/pycontroller/ControllerBindings/PyChip_ChipError.cpp index 72564d75d3914e..d1fc3cf67b11ac 100644 --- a/src/pybindings/pycontroller/ControllerBindings/PyChip_ChipError.cpp +++ b/src/pybindings/pycontroller/ControllerBindings/PyChip_ChipError.cpp @@ -59,9 +59,9 @@ void bind_PyChip_ChipError(std::function bool", pybind11::arg("other")); - cl.def("__ne__", (bool (chip::ChipError::*)(const class chip::ChipError &) const) & chip::ChipError::operator!=, + cl.def("__ne__", (bool(chip::ChipError::*)(const class chip::ChipError &) const) & chip::ChipError::operator!=, "C++: chip::ChipError::operator!=(const class chip::ChipError &) const --> bool", pybind11::arg("other")); cl.def_static("IsSuccess", (bool (*)(unsigned int)) & chip::ChipError::IsSuccess, "C++: chip::ChipError::IsSuccess(unsigned int) --> bool", pybind11::arg("error")); diff --git a/src/system/SystemLayer.h b/src/system/SystemLayer.h index 566abb2a0a3378..427bf00c99c3eb 100644 --- a/src/system/SystemLayer.h +++ b/src/system/SystemLayer.h @@ -207,7 +207,7 @@ class DLL_EXPORT Layer private: // Copy and assignment NOT DEFINED - Layer(const Layer &) = delete; + Layer(const Layer &) = delete; Layer & operator=(const Layer &) = delete; }; diff --git a/src/system/SystemMutex.h b/src/system/SystemMutex.h index 4a1f135f5e9efd..c2d1b0eaa16543 100644 --- a/src/system/SystemMutex.h +++ b/src/system/SystemMutex.h @@ -148,7 +148,7 @@ class DLL_EXPORT CHIP_CAPABILITY("mutex") Mutex k_mutex mZephyrMutex; #endif // CHIP_SYSTEM_CONFIG_ZEPHYR_LOCKING - Mutex(const Mutex &) = delete; + Mutex(const Mutex &) = delete; Mutex & operator=(const Mutex &) = delete; }; diff --git a/src/system/SystemPacketBuffer.h b/src/system/SystemPacketBuffer.h index 3c9d9aa1ff5cc0..88db4196438c1d 100644 --- a/src/system/SystemPacketBuffer.h +++ b/src/system/SystemPacketBuffer.h @@ -670,7 +670,7 @@ class DLL_EXPORT PacketBufferHandle #endif // CHIP_SYSTEM_CONFIG_USE_LWIP private: - PacketBufferHandle(const PacketBufferHandle &) = delete; + PacketBufferHandle(const PacketBufferHandle &) = delete; PacketBufferHandle & operator=(const PacketBufferHandle &) = delete; // The caller's ownership is transferred to this. diff --git a/src/system/SystemTimer.h b/src/system/SystemTimer.h index b8f727e566846e..c512a0c845ddd6 100644 --- a/src/system/SystemTimer.h +++ b/src/system/SystemTimer.h @@ -100,7 +100,7 @@ class DLL_EXPORT TimerData #endif // CHIP_SYSTEM_CONFIG_USE_DISPATCH // Not defined - TimerData(const TimerData &) = delete; + TimerData(const TimerData &) = delete; TimerData & operator=(const TimerData &) = delete; }; diff --git a/src/test_driver/efr32/include/FreeRTOSConfig.h b/src/test_driver/efr32/include/FreeRTOSConfig.h index d63a41b4fa92e7..bb486f66231af6 100644 --- a/src/test_driver/efr32/include/FreeRTOSConfig.h +++ b/src/test_driver/efr32/include/FreeRTOSConfig.h @@ -237,7 +237,7 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ #define configENABLE_BACKWARD_COMPATIBILITY (1) #define configSUPPORT_STATIC_ALLOCATION (1) #define configSUPPORT_DYNAMIC_ALLOCATION (1) -#define configTOTAL_HEAP_SIZE ((size_t)(20 * 1024)) +#define configTOTAL_HEAP_SIZE ((size_t) (20 * 1024)) /* Optional functions - most linkers will remove unused functions anyway. */ #define INCLUDE_vTaskPrioritySet (1) diff --git a/src/test_driver/openiotsdk/unit-tests/freertos-config/FreeRTOSConfig.h b/src/test_driver/openiotsdk/unit-tests/freertos-config/FreeRTOSConfig.h index 960b03ef96a7b4..45490483523535 100644 --- a/src/test_driver/openiotsdk/unit-tests/freertos-config/FreeRTOSConfig.h +++ b/src/test_driver/openiotsdk/unit-tests/freertos-config/FreeRTOSConfig.h @@ -40,12 +40,12 @@ extern uint32_t SystemCoreClock; // Minimal stack size [words] <0-65535> // Stack for idle task and default task stack in words. // Default: 4kB -#define configMINIMAL_STACK_SIZE ((uint16_t)(4 * 1024)) +#define configMINIMAL_STACK_SIZE ((uint16_t) (4 * 1024)) // Total heap size [bytes] <0-0xFFFFFFFF> // Heap memory size in bytes. // Default: 8kB -#define configTOTAL_HEAP_SIZE ((size_t)(8 * 1024)) +#define configTOTAL_HEAP_SIZE ((size_t) (8 * 1024)) // Kernel tick frequency [Hz] <0-0xFFFFFFFF> // Kernel tick rate in Hz. diff --git a/src/tools/chip-cert/CertUtils.cpp b/src/tools/chip-cert/CertUtils.cpp index 7ef3e6b109d3e5..7ca215b526017a 100644 --- a/src/tools/chip-cert/CertUtils.cpp +++ b/src/tools/chip-cert/CertUtils.cpp @@ -290,8 +290,8 @@ bool SetCertTimeField(ASN1_TIME * asn1Time, const struct tm & value) char timeStr[ASN1UniversalTime::kASN1TimeStringMaxLength + 1]; MutableCharSpan timeSpan(timeStr); ASN1UniversalTime val = { .Year = static_cast((value.tm_year == kX509NoWellDefinedExpirationDateYear) - ? kX509NoWellDefinedExpirationDateYear - : (value.tm_year + 1900)), + ? kX509NoWellDefinedExpirationDateYear + : (value.tm_year + 1900)), .Month = static_cast(value.tm_mon + 1), .Day = static_cast(value.tm_mday), .Hour = static_cast(value.tm_hour), diff --git a/src/transport/CryptoContext.h b/src/transport/CryptoContext.h index ca2100b455c631..b08efdabbc9dcd 100644 --- a/src/transport/CryptoContext.h +++ b/src/transport/CryptoContext.h @@ -49,7 +49,7 @@ class DLL_EXPORT CryptoContext CryptoContext(const CryptoContext &) = delete; explicit CryptoContext(Crypto::SymmetricKeyContext * context) : mKeyContext(context) {} CryptoContext & operator=(const CryptoContext &) = delete; - CryptoContext & operator=(CryptoContext &&) = delete; + CryptoContext & operator=(CryptoContext &&) = delete; /** * Whether the current node initiated the session, or it is responded to a session request. diff --git a/src/transport/SecureSession.h b/src/transport/SecureSession.h index dc122039b7cd29..185ba1f5e86275 100644 --- a/src/transport/SecureSession.h +++ b/src/transport/SecureSession.h @@ -110,10 +110,10 @@ class SecureSession : public Session, public ReferenceCounted