From 781cd3a3544e0efad5fd47de6d3c8fadbed94285 Mon Sep 17 00:00:00 2001 From: NareshM1702 Date: Thu, 25 Jun 2026 13:27:01 +0530 Subject: [PATCH 1/6] RDKB-65607:Update service_sshd.sh --- source/scripts/init/service.d/service_sshd.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/source/scripts/init/service.d/service_sshd.sh b/source/scripts/init/service.d/service_sshd.sh index f7bec950..496d1ddf 100755 --- a/source/scripts/init/service.d/service_sshd.sh +++ b/source/scripts/init/service.d/service_sshd.sh @@ -49,12 +49,16 @@ DEFAULT_WAN_INTERFACE="erouter0" LANIPV6Support=`sysevent get LANIPv6GUASupport` DEVICE_MODE=`deviceinfo.sh -mode` DEVICETYPE=$(dmcli eRT getv Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType | grep value | cut -d ":" -f 3 | tr -d ' ' | tr -s ' ' | tr '[:lower:]' '[:upper:]') -if [ "$DEVICETYPE" = "TEST" ] && [ "$USE_DYNAMICKEYING" = "TRUE" ]; then - USE_DEVKEYS="-f authorized_keys_dev" - echo_t "[utopia]: dropbear using dev authorization keys" +if [ $BUILD_TYPE = "prod" ]; then + if [ $DEVICETYPE = "TEST" ] && [ $USE_DYNAMICKEYING = "TRUE" ]; then + USE_DEVKEYS="-f authorized_keys_dev" + echo_t "[utopia]: dropbear using dev authorization keys" + else + USE_DEVKEYS="" + echo_t "[utopia]: dropbear using prod authorization keys" + fi else - USE_DEVKEYS="" - echo_t "[utopia]: dropbear using prod authorization keys" + USE_DEVKEYS="-f authorized_keys_dev" fi if [ "$BOX_TYPE" = "HUB4" ] || [ "$BOX_TYPE" = "SR300" ] || [ "$BOX_TYPE" = "SE501" ] || [ "$BOX_TYPE" = "WNXL11BWL" ] || [ "$BOX_TYPE" = "SR213" ] || [ "$BOX_TYPE" == "SCER11BEL" ] || [ "$BOX_TYPE" == "SCXF11BFL" ] || [ "$BOX_TYPE" == "XER2" ]; then From 5a8b3ff24148b2f7b89db0d05b05316c587916aa Mon Sep 17 00:00:00 2001 From: NareshM1702 Date: Mon, 29 Jun 2026 12:40:42 +0530 Subject: [PATCH 2/6] Update service_sshd.sh --- source/scripts/init/service.d/service_sshd.sh | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/source/scripts/init/service.d/service_sshd.sh b/source/scripts/init/service.d/service_sshd.sh index 496d1ddf..444eb154 100755 --- a/source/scripts/init/service.d/service_sshd.sh +++ b/source/scripts/init/service.d/service_sshd.sh @@ -48,18 +48,6 @@ WAN_INTERFACE=$(getWanInterfaceName) DEFAULT_WAN_INTERFACE="erouter0" LANIPV6Support=`sysevent get LANIPv6GUASupport` DEVICE_MODE=`deviceinfo.sh -mode` -DEVICETYPE=$(dmcli eRT getv Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType | grep value | cut -d ":" -f 3 | tr -d ' ' | tr -s ' ' | tr '[:lower:]' '[:upper:]') -if [ $BUILD_TYPE = "prod" ]; then - if [ $DEVICETYPE = "TEST" ] && [ $USE_DYNAMICKEYING = "TRUE" ]; then - USE_DEVKEYS="-f authorized_keys_dev" - echo_t "[utopia]: dropbear using dev authorization keys" - else - USE_DEVKEYS="" - echo_t "[utopia]: dropbear using prod authorization keys" - fi -else - USE_DEVKEYS="-f authorized_keys_dev" -fi if [ "$BOX_TYPE" = "HUB4" ] || [ "$BOX_TYPE" = "SR300" ] || [ "$BOX_TYPE" = "SE501" ] || [ "$BOX_TYPE" = "WNXL11BWL" ] || [ "$BOX_TYPE" = "SR213" ] || [ "$BOX_TYPE" == "SCER11BEL" ] || [ "$BOX_TYPE" == "SCXF11BFL" ] || [ "$BOX_TYPE" == "XER2" ]; then CMINTERFACE=$WAN_INTERFACE @@ -161,6 +149,19 @@ do_start() { #chgrp admin $DIR_NAME #chmod 755 $DIR_NAME #fi + DEVICETYPE=$(dmcli eRT getv Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType | grep value | cut -d ":" -f 3 | tr -d ' ' | tr -s ' ' | tr '[:lower:]' '[:upper:]') + if [ $BUILD_TYPE = "prod" ]; then + if [ $DEVICETYPE = "TEST" ] && [ $USE_DYNAMICKEYING = "TRUE" ]; then + USE_DEVKEYS="-f authorized_keys_dev" + echo_t "[utopia]: dropbear using dev authorization keys" + else + USE_DEVKEYS="" + echo_t "[utopia]: dropbear using prod authorization keys" + fi + else + USE_DEVKEYS="-f authorized_keys_dev" + fi + if ([ "$BOX_TYPE" = "XB6" -a "$MANUFACTURE" = "Arris" ] || [ "$MODEL_NUM" = "INTEL_PUMA" ] || [ "$BOX_TYPE" = "VNTXER5" ] || [ "$BOX_TYPE" = "SCER11BEL" -a "$LANIPV6Support" != "true" ] || [ "$BOX_TYPE" = "SCXF11BFL" ] || [ "$BOX_TYPE" == "XER2" ]) ;then get_listen_params From eed20581f03633706b38b24136c910be8f618a0a Mon Sep 17 00:00:00 2001 From: NareshM1702 Date: Wed, 29 Jul 2026 15:59:14 +0530 Subject: [PATCH 3/6] Update service_sshd.sh --- source/scripts/init/service.d/service_sshd.sh | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/source/scripts/init/service.d/service_sshd.sh b/source/scripts/init/service.d/service_sshd.sh index 444eb154..0e11a261 100755 --- a/source/scripts/init/service.d/service_sshd.sh +++ b/source/scripts/init/service.d/service_sshd.sh @@ -149,20 +149,12 @@ do_start() { #chgrp admin $DIR_NAME #chmod 755 $DIR_NAME #fi + USE_DEVKEYS="-f authorized_keys_dev" DEVICETYPE=$(dmcli eRT getv Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType | grep value | cut -d ":" -f 3 | tr -d ' ' | tr -s ' ' | tr '[:lower:]' '[:upper:]') - if [ $BUILD_TYPE = "prod" ]; then - if [ $DEVICETYPE = "TEST" ] && [ $USE_DYNAMICKEYING = "TRUE" ]; then - USE_DEVKEYS="-f authorized_keys_dev" - echo_t "[utopia]: dropbear using dev authorization keys" - else - USE_DEVKEYS="" - echo_t "[utopia]: dropbear using prod authorization keys" - fi - else - USE_DEVKEYS="-f authorized_keys_dev" + if [ "$BUILD_TYPE" = "prod" -a "DEVICETYPE" = "PROD" ]; then + USE_DEVKEYS="" fi - if ([ "$BOX_TYPE" = "XB6" -a "$MANUFACTURE" = "Arris" ] || [ "$MODEL_NUM" = "INTEL_PUMA" ] || [ "$BOX_TYPE" = "VNTXER5" ] || [ "$BOX_TYPE" = "SCER11BEL" -a "$LANIPV6Support" != "true" ] || [ "$BOX_TYPE" = "SCXF11BFL" ] || [ "$BOX_TYPE" == "XER2" ]) ;then get_listen_params CMINTERFACE=$WAN_INTERFACE From 4d08e2055bc615104724607fd344210f182e9c48 Mon Sep 17 00:00:00 2001 From: NareshM1702 Date: Wed, 29 Jul 2026 16:02:26 +0530 Subject: [PATCH 4/6] Update service_sshd.sh --- source/scripts/init/service.d/service_sshd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/scripts/init/service.d/service_sshd.sh b/source/scripts/init/service.d/service_sshd.sh index 0e11a261..f4cc7846 100755 --- a/source/scripts/init/service.d/service_sshd.sh +++ b/source/scripts/init/service.d/service_sshd.sh @@ -152,7 +152,7 @@ do_start() { USE_DEVKEYS="-f authorized_keys_dev" DEVICETYPE=$(dmcli eRT getv Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType | grep value | cut -d ":" -f 3 | tr -d ' ' | tr -s ' ' | tr '[:lower:]' '[:upper:]') if [ "$BUILD_TYPE" = "prod" -a "DEVICETYPE" = "PROD" ]; then - USE_DEVKEYS="" + USE_DEVKEYS="" fi if ([ "$BOX_TYPE" = "XB6" -a "$MANUFACTURE" = "Arris" ] || [ "$MODEL_NUM" = "INTEL_PUMA" ] || [ "$BOX_TYPE" = "VNTXER5" ] || [ "$BOX_TYPE" = "SCER11BEL" -a "$LANIPV6Support" != "true" ] || [ "$BOX_TYPE" = "SCXF11BFL" ] || [ "$BOX_TYPE" == "XER2" ]) ;then From e8c06af9b6077f8654296a024ebe0e5f80ade401 Mon Sep 17 00:00:00 2001 From: NareshM1702 Date: Wed, 29 Jul 2026 16:04:41 +0530 Subject: [PATCH 5/6] Update service_sshd.sh --- source/scripts/init/service.d/service_sshd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/scripts/init/service.d/service_sshd.sh b/source/scripts/init/service.d/service_sshd.sh index f4cc7846..9d52b59f 100755 --- a/source/scripts/init/service.d/service_sshd.sh +++ b/source/scripts/init/service.d/service_sshd.sh @@ -151,7 +151,7 @@ do_start() { #fi USE_DEVKEYS="-f authorized_keys_dev" DEVICETYPE=$(dmcli eRT getv Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType | grep value | cut -d ":" -f 3 | tr -d ' ' | tr -s ' ' | tr '[:lower:]' '[:upper:]') - if [ "$BUILD_TYPE" = "prod" -a "DEVICETYPE" = "PROD" ]; then + if [ "$BUILD_TYPE" = "prod" -a "$DEVICETYPE" = "PROD" ]; then USE_DEVKEYS="" fi From f7eca5933e3d60632be6794a6c59120fc4533f66 Mon Sep 17 00:00:00 2001 From: NareshM1702 Date: Thu, 30 Jul 2026 14:25:59 +0530 Subject: [PATCH 6/6] Update service_sshd.sh --- source/scripts/init/service.d/service_sshd.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/source/scripts/init/service.d/service_sshd.sh b/source/scripts/init/service.d/service_sshd.sh index 9d52b59f..a25b6182 100755 --- a/source/scripts/init/service.d/service_sshd.sh +++ b/source/scripts/init/service.d/service_sshd.sh @@ -149,6 +149,7 @@ do_start() { #chgrp admin $DIR_NAME #chmod 755 $DIR_NAME #fi + # Use prod keys only when both the build and deviceType RFC are prod; dev keys otherwise USE_DEVKEYS="-f authorized_keys_dev" DEVICETYPE=$(dmcli eRT getv Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType | grep value | cut -d ":" -f 3 | tr -d ' ' | tr -s ' ' | tr '[:lower:]' '[:upper:]') if [ "$BUILD_TYPE" = "prod" -a "$DEVICETYPE" = "PROD" ]; then