From 24627530abc89b21082e2e174805d036ec6e8a29 Mon Sep 17 00:00:00 2001
From: andersbangGF <88383809+andersbangGF@users.noreply.github.com>
Date: Wed, 27 Oct 2021 16:32:27 +0200
Subject: [PATCH] Enabled security for both debug and release build of
 pump-apps (#11049)

---
 .../main/include/CHIPProjectConfig.h               | 14 +++-----------
 .../main/include/CHIPProjectConfig.h               | 14 +++-----------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
index c0330d33d649df..3fbfe92feda6d7 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
@@ -28,21 +28,13 @@
 #ifndef CHIP_PROJECT_CONFIG_H
 #define CHIP_PROJECT_CONFIG_H
 
-#if BUILD_RELEASE // release build
-
-// Security and Authentication enabled for release build.
+// Security and Authentication always enabled
 #define CHIP_CONFIG_SECURITY_TEST_MODE 0
 #define CHIP_CONFIG_REQUIRE_AUTH 1
 
-#else // development build
+#if BUILD_RELEASE // release build
 
-// Security and Authentication disabled for development build.
-// For convenience, enable CHIP Security Test Mode and disable the requirement for
-// authentication in various protocols.
-// WARNING: These options make it possible to circumvent basic CHIP security functionality,
-// including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS.
-#define CHIP_CONFIG_SECURITY_TEST_MODE 1
-#define CHIP_CONFIG_REQUIRE_AUTH 0
+#else // development build
 
 /**
  * CHIP_DEVICE_CONFIG_ENABLE_TEST_DEVICE_IDENTITY
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
index c0330d33d649df..3fbfe92feda6d7 100644
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
@@ -28,21 +28,13 @@
 #ifndef CHIP_PROJECT_CONFIG_H
 #define CHIP_PROJECT_CONFIG_H
 
-#if BUILD_RELEASE // release build
-
-// Security and Authentication enabled for release build.
+// Security and Authentication always enabled
 #define CHIP_CONFIG_SECURITY_TEST_MODE 0
 #define CHIP_CONFIG_REQUIRE_AUTH 1
 
-#else // development build
+#if BUILD_RELEASE // release build
 
-// Security and Authentication disabled for development build.
-// For convenience, enable CHIP Security Test Mode and disable the requirement for
-// authentication in various protocols.
-// WARNING: These options make it possible to circumvent basic CHIP security functionality,
-// including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS.
-#define CHIP_CONFIG_SECURITY_TEST_MODE 1
-#define CHIP_CONFIG_REQUIRE_AUTH 0
+#else // development build
 
 /**
  * CHIP_DEVICE_CONFIG_ENABLE_TEST_DEVICE_IDENTITY