Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fix/ci_example_test_prov_v4.0' into 'release/v4.0'

Browse source 
CI: Fix prov example test exception handle (v4.0)

See merge request espressif/esp-idf!8440
This commit is contained in:
Angus Gratton 2020-05-06 16:59:20 +08:00
commit 08bcb587ec
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/esp_prov/security/security1.py
View file

@ -24,7 +24,7 @@ import proto
from .security import Security from .security import Security
from cryptography.hazmat.backends import default_backend from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives import hashes, serialization
from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey, X25519PublicKey from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey, X25519PublicKey
from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
@ -82,6 +82,12 @@ class Security1(Security):
def __generate_key(self): def __generate_key(self):
# Generate private and public key pair for client # Generate private and public key pair for client
self.client_private_key = X25519PrivateKey.generate() self.client_private_key = X25519PrivateKey.generate()
try:
self.client_public_key = self.client_private_key.public_key().public_bytes(
encoding=serialization.Encoding.Raw,
format=serialization.PublicFormat.Raw)
except TypeError:
# backward compatible call for older cryptography library
self.client_public_key = self.client_private_key.public_key().public_bytes() self.client_public_key = self.client_private_key.public_key().public_bytes()
def _print_verbose(self, data): def _print_verbose(self, data):