Skip to content

Commit

Permalink
2.2.1 fixed support for ECDHE in TLS protocol
Browse files Browse the repository at this point in the history
- even though these protocols were offered in the ClientHello, they
were broken
- the supporting extensions were missing and the server never selected
them
  • Loading branch information
HomeACcessoryKid committed Nov 30, 2021
1 parent ac4592a commit acd4330
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 20 deletions.
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.2.1 fixed support for ECDHE in TLS protocol
- even though these protocols were offered in the ClientHello, they were broken
- the supporting extensions were missing and the server never selected them

## 2.2.0 more robust parsing of Location header and added ota_string
- even long headers existing before the Location header will be parsable
- ota_string sysparam added to pass configuration to user app
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ EXTRA_WOLFSSL_CFLAGS = \
-DHAVE_ECC_SIGN \
-DHAVE_ECC_VERIFY \
-DHAVE_ECC_KEY_IMPORT \
-DHAVE_ECC_DHE \
-DHAVE_SUPPORTED_CURVES \

# -DDEBUG_WOLFSSL \
Expand Down
38 changes: 19 additions & 19 deletions deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@ cd life-cycle-manager
- initial steps to be expanded

#### These are the steps if not introducing a new key pair
- create/update the file versions1/latest-pre-release without new-line and setup 2.2.0 version folder
- create/update the file versions1/latest-pre-release without new-line and setup 2.2.1 version folder
```
mkdir versions1/2.2.0v
echo -n 2.2.0 > versions1/2.2.0v/latest-pre-release
cp versions1/certs.sector versions1/certs.sector.sig versions1/2.2.0v
cp versions1/public*key* versions1/2.2.0v
mkdir versions1/2.2.1v
echo -n 2.2.1 > versions1/2.2.1v/latest-pre-release
cp versions1/certs.sector versions1/certs.sector.sig versions1/2.2.1v
cp versions1/public*key* versions1/2.2.1v
```
- set local.mk to the ota-main program
```
make -j6 rebuild OTAVERSION=2.2.0
mv firmware/otamain.bin versions1/2.2.0v
make -j6 rebuild OTAVERSION=2.2.1
mv firmware/otamain.bin versions1/2.2.1v
```
- set local.mk back to ota-boot program
```
make -j6 rebuild OTAVERSION=2.2.0
mv firmware/otaboot.bin versions1/2.2.0v
make -j6 rebuild OTAVERSION=2.2.0 OTABETA=1
cp firmware/otaboot.bin versions1/2.2.0v/otabootbeta.bin
make -j6 rebuild OTAVERSION=2.2.1
mv firmware/otaboot.bin versions1/2.2.1v
make -j6 rebuild OTAVERSION=2.2.1 OTABETA=1
cp firmware/otaboot.bin versions1/2.2.1v/otabootbeta.bin
```
- remove the older version files
#
- update Changelog
- commit this as version 2.2.0
- set up a new github release 2.2.0 as a pre-release using the just commited master...
- commit this as version 2.2.1
- set up a new github release 2.2.1 as a pre-release using the just commited master...
- upload the certs and binaries to the pre-release assets on github
#
- erase the flash and upload the privatekey
Expand All @@ -43,18 +43,18 @@ esptool.py -p /dev/cu.usbserial-* --baud 230400 write_flash 0xf9000 versions1-pr
```
- upload the ota-boot BETA program to the device that contains the private key
```
make flash OTAVERSION=2.2.0 OTABETA=1
make flash OTAVERSION=2.2.1 OTABETA=1
```
- power cycle to prevent the bug for software reset after flash
- setup wifi and select the ota-demo repo without pre-release checkbox
- create the 2 signature files next to the bin file and upload to github one by one
- verify the hashes on the computer
```
openssl sha384 versions1/2.2.0v/otamain.bin
xxd versions1/2.2.0v/otamain.bin.sig
openssl sha384 versions1/2.2.1v/otamain.bin
xxd versions1/2.2.1v/otamain.bin.sig
```

- upload the file versions1/2.2.0v/latest-pre-release to the 'latest release' assets on github
- upload the file versions1/2.2.1v/latest-pre-release to the 'latest release' assets on github

#### Testing

Expand Down Expand Up @@ -107,14 +107,14 @@ esptool.py -p /dev/cu.usbserial-* --baud 230400 write_flash 0xf9000 versionsN-1-
```
- collect public-1.key.sig and store it in the new version folder and copy it to versions1
```
cp versions1/2.2.0v/public-1.key.sig versions1
cp versions1/2.2.1v/public-1.key.sig versions1
```
- then flash the new private key
```
esptool.py -p /dev/cu.usbserial-* --baud 230400 write_flash 0xf9000 versions1-privatekey.der
```
- collect cert.sector.sig and store it in the new version folder and copy it to versions1
```
cp versions1/2.2.0v/certs.sector.sig versions1
cp versions1/2.2.1v/certs.sector.sig versions1
```
- continue with a normal deployment to create the 2 signature files next to the bin files
1 change: 0 additions & 1 deletion versions1/2.2.0v/latest-pre-release

This file was deleted.

File renamed without changes.
1 change: 1 addition & 0 deletions versions1/2.2.1v/latest-pre-release
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.2.1
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit acd4330

Please sign in to comment.