diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh index 639a1dda..ed71e2a3 100755 --- a/ASTROBOT/G1Voeu.sh +++ b/ASTROBOT/G1Voeu.sh @@ -77,7 +77,6 @@ mkdir -p ~/.zen/tmp/$MOATS && exit 1 echo "# UPGRADING WORLD WHISHKEY DATABASE" - MOATS=$(date -u +"%Y%m%d%H%M%S%4N") mkdir -p ~/.zen/game/world/$PEPPER/$WISHKEY/ ## A la fois Titre du tag et Pepper construction de clef @@ -95,7 +94,7 @@ mkdir -p ~/.zen/tmp/$MOATS ## SEC PASS PROTECTED QRCODE : base58 secFromDunikey.openssl(pass) secFromDunikey=$(cat ~/.zen/tmp/qrtw.dunikey | grep "sec" | cut -d ' ' -f2) echo "$secFromDunikey" > ~/.zen/tmp/${MOATS}/${PSEUDO}.sec - openssl enc -aes-256-cbc -salt -in ~/.zen/tmp/${MOATS}/${PSEUDO}.sec -out "$HOME/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec" -k "$SALT" 2>/dev/null + openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -salt -in ~/.zen/tmp/${MOATS}/${PSEUDO}.sec -out "$HOME/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec" -k "$SALT" 2>/dev/null PASsec=$(cat ~/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec | base58) HPass=$(echo "$SALT" | sha512sum) qrencode -s 12 -o $HOME/.zen/game/players/${PLAYER}/QRsec.png $PASsec diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index 06951356..4ee0c54b 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -200,11 +200,11 @@ DISCO="https://astroport.$(myHostName)/?salt=${USALT}&pepper=${UPEPPER}&logout=$ amzqr "$myASTROPORT/?qrcode=$G1PUB&sslpassdunikeysec=$PASsec&askpass=$HPass&tw=$ASTRONAUTENS" \ -d $HOME/.zen/game/players/${PLAYER} \ -l H \ - -p ${MY_PATH}/../images/plain.png + -p ${MY_PATH}/../images/moa_net.png rm -f ~/.zen/tmp/${MOATS}/${PSEUDO}.sec - ASTROQR=$(ipfs add -q $HOME/.zen/game/players/${PLAYER}/plain_qrcode.png | tail -n 1) + ASTROQR=$(ipfs add -q $HOME/.zen/game/players/${PLAYER}/moa_net_qrcode.png | tail -n 1) ############################################################################ TW ### INITALISATION WIKI dans leurs répertoires de publication IPFS @@ -411,9 +411,9 @@ ln -s ~/.zen/game/players/${PLAYER} ~/.zen/game/players/.current # PASS CRYPTING KEY #~ echo; echo "Sécurisation de vos clefs... "; sleep 1 -#~ openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/${PLAYER}/secret.june" -out "$HOME/.zen/game/players/${PLAYER}/enc.secret.june" -k $PASS 2>/dev/null -#~ openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/${PLAYER}/secret.dunikey" -out "$HOME/.zen/game/players/${PLAYER}/enc.secret.dunikey" -k $PASS 2>/dev/null -#~ openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/${PLAYER}/$KEYFILE -out" "$HOME/.zen/game/players/${PLAYER}/enc.$KEYFILE" -k $PASS 2>/dev/null +openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -salt -in "$HOME/.zen/game/players/${PLAYER}/secret.june" -out "$HOME/.zen/game/players/${PLAYER}/enc.secret.june" -k $PASS 2>/dev/null +#~ openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -salt -in "$HOME/.zen/game/players/${PLAYER}/secret.dunikey" -out "$HOME/.zen/game/players/${PLAYER}/enc.secret.dunikey" -k $PASS 2>/dev/null +#~ openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -salt -in "$HOME/.zen/game/players/${PLAYER}/$KEYFILE -out" "$HOME/.zen/game/players/${PLAYER}/enc.$KEYFILE" -k $PASS 2>/dev/null ## TODO MORE SECURE ?! USE opengpg, natools, etc ... # ${MY_PATH}/natools.py encrypt -p $G1PUB -i ~/.zen/game/players/${PLAYER}/secret.dunikey -o "$HOME/.zen/game/players/${PLAYER}/enc.secret.dunikey" echo