From 8c7c098eec345bbd4fece64778c1035f6bc8a548 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sun, 21 Apr 2024 16:43:23 +0200
Subject: [PATCH] stonger UPLANET security applied to derivated keys

---
 RUNTIME/G1Voeu.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/RUNTIME/G1Voeu.sh b/RUNTIME/G1Voeu.sh
index 16d08b5f..83e47ad1 100755
--- a/RUNTIME/G1Voeu.sh
+++ b/RUNTIME/G1Voeu.sh
@@ -42,9 +42,9 @@ mkdir -p ~/.zen/tmp/${MOATS}
 #####################################################
 # CREATION DE LA CLEF DERIVEE "G1VOEU"
 #####################################################
-source ~/.zen/game/players/${PLAYER}/secret.june ## LE PEPPER DU PLAYER DEVIENT LE SALT DU G1VOEU
-[[ ${PEPPER} ]] && echo "Using PLAYER PEPPER AS WISH SALT" && SECRET1=${PEPPER} ##
-[[ ! ${SECRET1} ]] && SECRET1=$(${MY_PATH}/../tools/diceware.sh 3 | xargs)
+source ~/.zen/game/players/${PLAYER}/secret.june ## LE PEPPER DU PLAYER DEVIENT LE SECRET1 DU G1VOEU
+[[ ${PEPPER} ]] && echo "Using PLAYER PEPPER AS WISH SALT" && SECRET1="${PEPPER}${UPLANETNAME}" ##
+[[ ! ${SECRET1} ]] && SECRET1=$(${MY_PATH}/../tools/diceware.sh 12 | xargs)
 
 #~ echo "${SECRET1}"
 
@@ -52,7 +52,7 @@ echo "## TITRE DU G1VOEU ? CapitalGluedWords please"
 [[ ! ${TITRE} ]] && read TITRE
 VoeuName=$(echo "${TITRE}" | sed -r 's/\<./\U&/g' | sed 's/ //g') # VoeuName EST LE TITRE DU VOEU : CapitalGluedWords + EMAIL
 
-SECRET2="${VoeuName} ${PLAYER}" ## SECRET2 est "TitreDuVoeu PLAYER"
+SECRET2="${VoeuName} ${PLAYER} ${SALT}" ## SECRET2 est "TitreDuVoeu PLAYER SALT"
 
 echo "${SECRET2}" && [[ ! ${SECRET2} ]] && echo "EMPTY SECRET2 - ERROR" && exit 1