Release v2.3.0

Author: kueblc

README.md

@@ -43,52 +43,25 @@ On January 28th, 2019, Tuya started [distributing a patch](https://www.heise.de/
     # git clone https://github.com/ct-Open-Source/tuya-convert
     # cd tuya-convert
     # ./install_prereq.sh
-### flash loader firmware + backup
-    # ./start_flash.sh
-
-Follow the instructions in the start_flash script. It will install our flash loader onto the ESP and connect to the access point created by your wifi adapter.
-
-    WIFI: vtrust-flash
-    IP: 10.42.42.42
-A backup of the original firmware will be created and stored locally
-
-### Device information
-After the firmware backup procedure, the retrieved device information will be shown.
-Please make sure to write down your devices flash mode and size!
-You can show this information again by executing:
-
-    # curl http://10.42.42.42
-### BACKUP only and UNDO
-You can use the flash loader to create a backup only.
-If you want to delete the FLASH loader out of the flash again and go back to the stock software just do following:
-
-    # curl http://10.42.42.42/undo
-### FLASH loader to user2
-The FLASH loader only allows flashing the third party firmware if the loader is running in the userspace user2 starting from 0x81000.
-This will flash the FLASH loader in user2 if it is not already there.
-It will destroy your ability to undo and go back to the original firmware
-
-    # curl http://10.42.42.42/flash2
 
 ### FLASH third-party firmware
 BE SURE THE FIRMWARE FITS YOUR DEVICE!
-1. Place or link your binary file to ./files/thirdparty.bin.
+1. Place your binary file in the `/files/` directory or use one of the included firmware images.
 
 	Currently a Tasmota [v7.0.0.3](https://github.com/arendst/Tasmota/releases) `tasmota-wifiman.bin` build is included. You can update to a [current version](http://thehackbox.org/tasmota) via OTA after the Tuya-Convert process completes successfully. Please note that while we include this for your convenience, we are not affiliated with the Tasmota project and cannot provide support for post installation issues. Please refer to [the respective project](https://github.com/arendst/Tasmota) for configuration and support.
-	
+
 	An ESPurna [1.13.5](https://github.com/xoseperez/espurna/releases/tag/1.13.5) binary is also included (`espurna-base.bin`). Like before, the binary included does not have any specific hardware defined. Once flashed using Tuya-Convert you can update to the device-specific version via any of the means that ESPurna provides (OTA, web interface update, update via telnet or MQTT). Please refer to the [ESPurna project page](http://espurna.io) for more info and support.
 
 	Binary requirements:
-	* full binary including first-stage bootloader
+	* full binary including first-stage bootloader (tested with Arduino eboot and Open-RTOS rBoot)
 	* maximum filesize 512KB for first flash
 
 2. Start flashing process
 
-        # curl http://10.42.42.42/flash3
-
-	Alternatively you can request a certain file to be requested and flashed by the device:
-
-        # curl http://10.42.42.42/flash3?url=http://10.42.42.1/files/certain_file.bin
+	Execute `./start_flash.sh` and follow the instructions.
+	It will install our flash loader onto the ESP and connect to the access point created by your wifi adapter.
+	A backup of the original firmware will be automatically downloaded and stored locally.
+	You can then proceed to flash your desired firmware or revert to the stock firmware.
 
 3. Initial Configuration
 

files/espurna-base.bin renamed to files/espurna.bin

@@ -113,7 +113,7 @@ def post(self):
         print(self.request.headers)
         if payload:
             try:
-                decrypted_payload = unpad(AES.new(options.secKey, AES.MODE_ECB).decrypt(binascii.unhexlify(payload))).decode()
+                decrypted_payload = unpad(AES.new(options.secKey.encode(), AES.MODE_ECB).decrypt(binascii.unhexlify(payload))).decode()
                 if decrypted_payload[0] != "{":
                     raise ValueError("payload is not JSON")
                 print("payload", decrypted_payload)

files/thirdparty.bin renamed to files/tasmota.bin

@@ -0,0 +1,80 @@
+#!/bin/bash
+
+MAGIC=$(printf "\xe9")
+
+while true; do
+	echo
+	echo "Available options:"
+	echo "  0) return to stock"
+	index=0
+	for file in ../files/*.bin; do
+		# skip null glob
+		[[ -e $file ]] || continue
+		# get short name
+		filename=$(basename "$file")
+		# skip files too large or too small
+		filesize=$(stat -c%s "$file")
+		[[ "$filesize" -gt 0x1000 && "$filesize" -le 0x80000 ]] || continue
+		# skip files without magic byte
+		[[ $(head -c 1 "$file") == "$MAGIC" ]] || continue
+		echo "  $((++index))) flash $filename"
+		options[$index]="$filename"
+		# only show first 9 options, accessible with a single keypress
+		if (( index == 9 )); then
+			break
+		fi
+	done
+	echo "  q) quit; do nothing"
+	echo -n "Please select 0-$index: "
+	while true; do
+		read -n 1 -r
+		echo
+		if [[ "$REPLY" =~ ^[0-9]$ && "$REPLY" -ge 0 && "$REPLY" -le $index ]]; then
+			break
+		fi
+		if [[ "$REPLY" =~ ^[Qq]$ ]]; then
+			echo "Leaving device as is..."
+			exit
+		fi
+		echo -n "Invalid selection, please select 0-$index: "
+	done
+
+	if [[ "$REPLY" == 0 ]]; then
+		if curl -s http://10.42.42.42/undo; then
+			echo "Disconnect the device to prevent it from repeating the upgrade"
+			echo "You will need to put the device back into pairing mode and register to use again"
+		else
+			echo "Could not reach the device!"
+		fi
+		break
+	fi
+
+	selection="${options[$REPLY]}"
+	read -p "Are you sure you want to flash $selection? This is the point of no return [y/N] " -n 1 -r
+	echo
+	[[ "$REPLY" =~ ^[Yy]$ ]] || continue
+
+	echo "Attempting to flash $selection, this may take a few seconds..."
+	RESULT=$(curl -s "http://10.42.42.42/flash?url=http://10.42.42.1/files/$selection") ||
+	echo "Could not reach the device!"
+
+	echo "$RESULT"
+	if [[ "$RESULT" =~ failed || -z "$RESULT" ]]; then
+		read -p "Do you want to try something else? [y/N] " -n 1 -r
+		echo
+		[[ "$REPLY" =~ ^[Yy]$ ]] || break
+	else
+		if [[ "$selection" == "tasmota.bin" ]]; then
+			echo "Look for a tasmota-xxxx SSID to which you can connect and configure"
+			echo "Be sure to configure your device for proper function!"
+		elif [[ "$selection" == "espurna.bin" ]]; then
+			echo "Look for an ESPURNA-XXXXXX SSID to which you can connect and configure"
+			echo "Default password is \"fibonacci\""
+			echo "Be sure to upgrade to your device specific firmware for proper function!"
+		fi
+		echo
+		echo "HAVE FUN!"
+		break
+	fi
+done
+

files/upgrade.bin

@@ -21,8 +21,8 @@
 from Crypto.Cipher import AES
 pad = lambda s: s + (16 - len(s) % 16) * chr(16 - len(s) % 16)
 unpad = lambda s: s[:-ord(s[len(s) - 1:])]
-encrypt = lambda msg, key: AES.new(key, AES.MODE_ECB).encrypt(pad(msg))
-decrypt = lambda msg, key: AES.new(key, AES.MODE_ECB).decrypt(unpad(msg))
+encrypt = lambda msg, key: AES.new(key.encode(), AES.MODE_ECB).encrypt(pad(msg))
+decrypt = lambda msg, key: unpad(AES.new(key.encode(), AES.MODE_ECB).decrypt(msg))
 
 def iot_dec(message, local_key):
 	message_clear = decrypt(base64.b64decode(message[19:]), local_key)

files/user2.bin

@@ -9,6 +9,7 @@
 from hashlib import md5
 from binascii import hexlify, unhexlify
 
+IDENTITY_PREFIX = "BAohbmd6aG91IFR1"
 
 def listener(host, port):
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -24,10 +25,15 @@ def client(host, port):
 
 def gen_psk(identity, hint):
     print("ID: %s" % hexlify(identity))
+    # sometimes the device only sends part of the prefix
+    # since it is always the same, we can correct it
+    if identity[1:17] != IDENTITY_PREFIX:
+        print("Prefix: %s" % identity[1:17])
+    identity = IDENTITY_PREFIX + identity[17:]
     key = md5(hint[-16:]).digest()
-    iv = md5(identity[1:]).digest()
+    iv = md5(identity).digest()
     cipher = AES.new(key, AES.MODE_CBC, iv)
-    psk = cipher.encrypt(identity[1:33])
+    psk = cipher.encrypt(identity[:32])
     print("PSK: %s" % hexlify(psk))
     return psk
 

scripts/fake-registration-server.py

@@ -32,7 +32,10 @@ setup () {
 		--address=/#/$GATEWAY
 
 	echo "Starting AP on $WLAN..."
-	sudo hostapd hostapd.conf -i $WLAN
+
+	# Read hostapd.conf with interface from stdin for
+	# backward compatibility (hostapd < v2.6). See #398
+	printf "$(cat hostapd.conf)\ninterface=$WLAN" | sudo hostapd /dev/stdin
 }
 
 cleanup () {