From b3fa6f529f10882d0768516552dfe322de77f4ab Mon Sep 17 00:00:00 2001
From: George Hotz <george@comma.ai>
Date: Fri, 28 Apr 2017 17:25:37 -0700
Subject: [PATCH] if otp is programmed it works

---
 boardesp/proxy.c         | 47 +++++++++++++++++++++++++++++-----------
 lib/panda.py             |  1 -
 tests/standalone_test.py |  5 ++++-
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/boardesp/proxy.c b/boardesp/proxy.c
index 8a7a056a..e5b7f04f 100644
--- a/boardesp/proxy.c
+++ b/boardesp/proxy.c
@@ -7,6 +7,7 @@
 
 #include "tcp_ota.h"
 #include "driver/spi_interface.h"
+#include "crypto/sha.h"
 
 #define min(a,b) \
  ({ __typeof__ (a) _a = (a); \
@@ -32,16 +33,7 @@ esp_tcp inter_proto;
 uint32_t sendData[0x14] = {0};
 uint32_t recvData[0x40] = {0};
 
-static int ICACHE_FLASH_ATTR spi_comm(char *dat, int len, uint32_t *recvData, int recvDataLen) {
-  // blink the led during SPI comm
-  if (GPIO_REG_READ(GPIO_OUT_ADDRESS) & (1 << pin)) {
-    // set gpio low
-    gpio_output_set(0, (1 << pin), 0, 0);
-  } else {
-    // set gpio high
-    gpio_output_set((1 << pin), 0, 0, 0);
-  }
-
+static int ICACHE_FLASH_ATTR __spi_comm(char *dat, int len, uint32_t *recvData, int recvDataLen) {
   SpiData spiData;
 
   spiData.cmd = 2;
@@ -82,6 +74,18 @@ static int ICACHE_FLASH_ATTR spi_comm(char *dat, int len, uint32_t *recvData, in
   return length;
 }
 
+static int ICACHE_FLASH_ATTR spi_comm(char *dat, int len, uint32_t *recvData, int recvDataLen) {
+  // blink the led during SPI comm
+  if (GPIO_REG_READ(GPIO_OUT_ADDRESS) & (1 << pin)) {
+    // set gpio low
+    gpio_output_set(0, (1 << pin), 0, 0);
+  } else {
+    // set gpio high
+    gpio_output_set((1 << pin), 0, 0, 0);
+  }
+
+  __spi_comm(dat, len, recvData, recvDataLen);
+}
 
 static void ICACHE_FLASH_ATTR tcp_rx_cb(void *arg, char *data, uint16_t len) {
   // nothing too big
@@ -146,13 +150,29 @@ void ICACHE_FLASH_ATTR inter_connect_cb(void *arg) {
 }
 
 void ICACHE_FLASH_ATTR wifi_init() {
+  // default ssid and password
+  char ssid[32];
+  memset(ssid, 0, 32);
+  os_sprintf(ssid, "panda-%08x-BROKEN", system_get_chip_id()); 
+  char password[] = "testing123";
+
+  // fetch secure ssid and password
+  uint8_t digest[SHA_DIGEST_SIZE];
+  char resp[0x20];
+  __spi_comm("\x00\x00\x00\x00\x40\xD0\x00\x00\x00\x00\x20\x00", 0xC, recvData, 0x40);
+  memcpy(resp, recvData+1, 0x20);
+
+  SHA_hash(resp, 0x1C, digest);
+  if (memcmp(digest, resp+0x1C, 4) == 0) {
+    // OTP is valid
+    memcpy(ssid+6, resp, 0x10);
+    memcpy(password, resp+0x10, 10);
+  }
+
   // start wifi AP
   wifi_set_opmode(SOFTAP_MODE);
   struct softap_config config;
   wifi_softap_get_config(&config);
-  char ssid[32];
-  os_sprintf(ssid, "panda-%08x", system_get_chip_id()); 
-  char password[] = "testing123"; //password must be 8 characters or longer
   strcpy(config.ssid, ssid); 
   strcpy(config.password, password);
   config.ssid_len = strlen(ssid);
@@ -232,6 +252,7 @@ void ICACHE_FLASH_ATTR user_init()
   uart0_init(0);
   os_printf("hello\n");
 
+  // needs SPI
   wifi_init();
 
   // support ota upgrades
diff --git a/lib/panda.py b/lib/panda.py
index 218014fa..b51ec209 100644
--- a/lib/panda.py
+++ b/lib/panda.py
@@ -90,7 +90,6 @@ class Panda(object):
 
   def get_serial(self):
     dat = self.handle.controlRead(usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE, 0xd0, 0, 0, 0x20)
-    hexdump(dat)
     assert dat[0x1c:] == hashlib.sha1(dat[0:0x1c]).digest()[0:4]
     return [dat[0:0x10], dat[0x10:0x10+10]]
 
diff --git a/tests/standalone_test.py b/tests/standalone_test.py
index 66137dfe..0404ee86 100755
--- a/tests/standalone_test.py
+++ b/tests/standalone_test.py
@@ -10,6 +10,7 @@ if __name__ == "__main__":
   else:
     p = Panda()
   print p.health()
+  print p.get_serial()
 
   a = 0
   while 1:
@@ -20,6 +21,8 @@ if __name__ == "__main__":
     p.can_send(0xaa, msg, 4)
     time.sleep(0.01)
 
-    print p.can_recv()
+    dat = p.can_recv()
+    if len(dat) > 0:
+      print dat
     a += 1