From 9f4a73c12a165513b0052fcba89cdf66f55a8e28 Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Tue, 30 May 2023 12:56:11 +0600
Subject: [PATCH] Fix OPENSSL_ENGINE

---
 ublinux/rc.preinit.d/51-autologin     |  5 ++-
 ublinux/rc.preinit.d/56-openssl-gost  | 46 ---------------------------
 ublinux/templates/ublinux-data.ini    |  4 +--
 ublinux/templates/ublinux-data_ru.ini |  4 +--
 4 files changed, 8 insertions(+), 51 deletions(-)
 delete mode 100755 ublinux/rc.preinit.d/56-openssl-gost

diff --git a/ublinux/rc.preinit.d/51-autologin b/ublinux/rc.preinit.d/51-autologin
index d9f37f6..8521571 100755
--- a/ublinux/rc.preinit.d/51-autologin
+++ b/ublinux/rc.preinit.d/51-autologin
@@ -21,7 +21,10 @@ SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
 SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
 
     PASS_ADMUID=$(grep "^$(grep ":${ADMUID}:${ADMUID}:" ${ROOTFS}/etc/passwd | cut -d: -f1):" ${ROOTFS}/etc/shadow | cut -d: -f2) #"
-    [[ ${PASS_ADMUID} == ${NOSECUREROOTPASSWD} && ${PASS_ADMUID} == ${DEFAULTPASSWD} ]] && echo "AUTOLOGINUSER=yes" >>  ${SYSCONF}/desktop && AUTOLOGINUSER=yes
+    if [[ -z ${AUTOLOGINUSER} ]] && [[ ${PASS_ADMUID} == ${NOSECUREROOTPASSWD} && ${PASS_ADMUID} == ${DEFAULTPASSWD} ]]; then 
+	echo "AUTOLOGINUSER=yes" >>  ${SYSCONF}/desktop 
+	AUTOLOGINUSER=yes
+    fi
     AUTOLOGINUSER_CMDLINE=$(cmdline_value autologin) && [[ -n ${AUTOLOGINUSER_CMDLINE} ]] && AUTOLOGINUSER=${AUTOLOGINUSER_CMDLINE}
     
     if [[ -z "${AUTOLOGINUSER}" ]]; then
diff --git a/ublinux/rc.preinit.d/56-openssl-gost b/ublinux/rc.preinit.d/56-openssl-gost
deleted file mode 100755
index d6fb74d..0000000
--- a/ublinux/rc.preinit.d/56-openssl-gost
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-#
-# Initial script for Live operating system
-# This script are launching before starting init from linux-live script.
-# Current dir allways must be set to root (/)
-# All system path must be relative, except initrd dirs
-
-ENABLED=yes
-[ "$ENABLED" != "yes" ] && exit 0
-DEBUGMODE=no
-
-PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
-
-unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=.
-SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
-SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
-debug_mode "$0" "$@"
-
-SYSCONF="${ROOTFS}/${SYSCONF}"
-SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
-SOURCE=${SYSCONF}/security; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
-
-exec_openssl_gost(){
-## Настройка OpenSSL ГОСТ
-    FILE_OPENSSL_CONF="${ROOTFS}/etc//etc/ssl/openssl.cnf"
-    FILE_OPENSSL_GOST_CONF="${ROOTFS}/etc//etc/ssl/gost.cnf"
-    TXT_OPENSSL_GOST_CONF="$(sed -r '/^\s*$/d' "${FILE_OPENSSL_GOST_CONF}")"
-    TXT_ENABLE_GOST_CONF="openssl_conf = openssl_gost"
-
-    if [[ ${OPENSSL_GOST,,} == @(y|yes|enable) ]]; then
-    # Enable GOST
-	grep -q "${TXT_ENABLE_GOST_CONF}" "${FILE_OPENSSL_CONF}" || sed "0,/^[a-zA-Z0-9\[]/s//${TXT_ENABLE_GOST_CONF}\n&/" -i "${FILE_OPENSSL_CONF}"
-	grep -q "${TXT_OPENSSL_GOST_CONF%%$'\n'*}" "${FILE_OPENSSL_CONF}" || cat ${FILE_OPENSSL_GOST_CONF} >> "${FILE_OPENSSL_CONF}"
-    elif [[ ${OPENSSL_GOST,,} == @(n|no|disable) ]]; then
-    ## Disable GOST
-	sed "/${TXT_ENABLE_GOST_CONF}/d" -i "${FILE_OPENSSL_CONF}"
-	sed "/${TXT_OPENSSL_GOST_CONF%%$'\n'*}/,/${TXT_OPENSSL_GOST_CONF##*$'\n'}/d" -i "${FILE_OPENSSL_CONF}"
-    fi
-}
-
-################
-##### MAIN #####
-################
-
-    exec_openssl_gost $@
-    
\ No newline at end of file
diff --git a/ublinux/templates/ublinux-data.ini b/ublinux/templates/ublinux-data.ini
index 57dc454..5b3fa67 100644
--- a/ublinux/templates/ublinux-data.ini
+++ b/ublinux/templates/ublinux-data.ini
@@ -30,7 +30,7 @@
 [/etc/ublinux/config]
 ## Config verison
 ## Версия конфигурации
-VERSION=2.19
+VERSION=2.20
 
 ## Additional boot parameters
 ## Дополнительные параметры загрузки, только для управления модулями
@@ -413,7 +413,7 @@ NSSWITCHWINBIND=yes
 ## Настройка безопасности, ограничений
 [/etc/ublinux/security]
 ## Включить поддержку OpenSSL алгоритмов ГОСТ GOST2012-GOST8912-GOST8912 GOST2001-GOST89-GOST89
-## OPENSSL_GOST=yes
+## OPENSSL_ENGINE=gost
 
 ## Отключить виртуальные терминалы и запретить переключение на них из X11
 ##   ACCESS_DENIED_VTX11=yes|no*|enable|disable|y|n
diff --git a/ublinux/templates/ublinux-data_ru.ini b/ublinux/templates/ublinux-data_ru.ini
index 57dc454..5b3fa67 100644
--- a/ublinux/templates/ublinux-data_ru.ini
+++ b/ublinux/templates/ublinux-data_ru.ini
@@ -30,7 +30,7 @@
 [/etc/ublinux/config]
 ## Config verison
 ## Версия конфигурации
-VERSION=2.19
+VERSION=2.20
 
 ## Additional boot parameters
 ## Дополнительные параметры загрузки, только для управления модулями
@@ -413,7 +413,7 @@ NSSWITCHWINBIND=yes
 ## Настройка безопасности, ограничений
 [/etc/ublinux/security]
 ## Включить поддержку OpenSSL алгоритмов ГОСТ GOST2012-GOST8912-GOST8912 GOST2001-GOST89-GOST89
-## OPENSSL_GOST=yes
+## OPENSSL_ENGINE=gost
 
 ## Отключить виртуальные терминалы и запретить переключение на них из X11
 ##   ACCESS_DENIED_VTX11=yes|no*|enable|disable|y|n