Add HAP Crypto to src/crypto #243

bhaskar-apple · 2020-04-03T20:20:23Z

Problem

No APIs to support symmetric key based payload encryption available in CHIP

Summary of Changes

Adds new files from HAP ADK. These have been scrubbed to replace occurrences of HAP with ADK

src/crypto/CHIPBase+CompilerAbstraction.h
src/crypto/CHIPBase+Crypto.c
src/crypto/CHIPCrypto.h
src/crypto/CHIPOpenSSL.c
src/crypto/Makefile.am
src/crypto/tests/CHIPCryptoTest.c
src/crypto/tests/Makefile.am

fixes #147

This pulls in openssl based crypto methods from HAP

bhaskar-apple · 2020-04-03T20:22:21Z

Here is the same branch in my fork to track that it builds
https://github.com/bhaskar-apple/connectedhomeip/pull/6

hawk248

nice

woody-apple · 2020-04-03T20:47:24Z

@balducci-apple ?

src/crypto/CHIPBase+Crypto.c

gerickson · 2020-04-03T20:58:57Z

Any unit tests you can point to from the HAP open source that fill fast follow or that can be landed concurrently?

bhaskar-apple · 2020-04-03T21:19:38Z

Any unit tests you can point to from the HAP open source that fill fast follow or that can be landed concurrently?

@gerickson
Yes this patch also includes existing HAP tests under src/crypto/tests/CHIPCryptoTest.c

make[5]: Nothing to be done for 'check-am'.
Making check in crypto
Making check in tests
make  TestCrypto
  CC       CHIPCryptoTest.o
  CCLD     TestCrypto
make  check-TESTS
PASS: TestCrypto
============================================================================
Testsuite summary for Chip g1d0901d
============================================================================
# TOTAL: 1
# PASS:  1
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================

gerickson · 2020-04-03T21:20:11Z

Any unit tests you can point to from the HAP open source that fill fast follow or that can be landed concurrently?

Yes this patch has tests that run and pass under src/crypto/tests/CHIPCryptoTest.c

make[5]: Nothing to be done for 'check-am'.
Making check in crypto
Making check in tests
make  TestCrypto
  CC       CHIPCryptoTest.o
  CCLD     TestCrypto
make  check-TESTS
PASS: TestCrypto
============================================================================
Testsuite summary for Chip g1d0901d
============================================================================
# TOTAL: 1
# PASS:  1
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================

Awesome; sorry I missed those on first glance.

src/crypto/CHIPOpenSSL.c

src/crypto/tests/CHIPCryptoTest.c

turon

I'm confused by submission of crypto algorithms that the Security group does not plan to use.

turon · 2020-04-03T21:58:20Z

src/crypto/CHIPBase+Crypto.c

+#ifndef HAVE_CUSTOM_SINGLE_SHOT_CHACHA20_POLY1305
+
+// CHIP : cha cha poly encryption
+void CHIP_chacha20_poly1305_encrypt_aad(uint8_t tag[CHACHA20_POLY1305_TAG_BYTES], uint8_t * c, const uint8_t * m, size_t m_len,


I thought chacha and poly1305 where not part of the plan.

They are the current HAP Security baseline, but we'll be updating these with the new approved items as we have implementations.

I thought from the last readout from Evgeni and Alex on the cryptographic primitives that there was good consensus and alignment on those primitives (SPAKE2+, AES-128, AEAD, etc.). If there is, can we drive ahead with that consensus? Crypto suites seem like a good next layer of the pyramid to lay down that should be non-contentious if my understanding of where that team is at is accurate and up-to-date.

turon · 2020-04-03T21:58:52Z

src/crypto/CHIPCrypto.h

+#define X25519_SCALAR_BYTES 32
+#define X25519_BYTES 32
+
+void CHIP_X25519_scalarmult_base(uint8_t r[X25519_BYTES], const uint8_t n[X25519_SCALAR_BYTES]);


I thought curve 25519 was not plan-of-record.

They are the current HAP Security baseline, but we'll be updating these with the new approved items as we have implementations.

turon · 2020-04-03T21:59:28Z

src/crypto/CHIPOpenSSL.c

+    return B;
+}
+
+void CHIP_srp_public_key(uint8_t pub_b[SRP_PUBLIC_KEY_BYTES], const uint8_t priv_b[SRP_SECRET_KEY_BYTES],


I thought SRP was not plan-of-record.

They are the current HAP Security baseline, but we'll be updating these with the new approved items as we have implementations.

woody-apple

Thanks @bhaskar-apple @balducci-apple Looks like a great start for our baseline

woody-apple · 2020-04-05T20:58:24Z

@BroderickCarlin ?

gerickson

How do we resolve the questions about the cryptographic primitives consensus questions here?

woody-apple · 2020-04-06T17:45:12Z

Those will be handled with in follow up PRS to add the the baseline as agreed on in the secure transport team. I assume @balducci-apple and @bhaskar-apple will have some follow ons (and issues please!)

balducci-apple · 2020-04-06T17:51:32Z

@bhaskar-apple will be providing some issues soon to align with output from the crypto primitives team.

bhaskar-apple · 2020-04-06T18:28:52Z

Those will be handled with in follow up PRS to add the the baseline as agreed on in the secure transport team. I assume @balducci-apple and @bhaskar-apple will have some follow ons (and issues please!)

@woody-apple Yes working on filing issues now

…labs_1.0 Merge in WMN_TOOLS/matter from cherry-pick/doc_updates_v1.0.0 to silabs_1.0 Squashed commit of the following: commit 78067c25ba6423ccc81b612b3aa0b49755039bf7 Author: Ezra Hale <[email protected]> Date: Fri Oct 28 20:01:49 2022 +0000 Pull request #215: Doc updates v1.0.0 Merge in WMN_TOOLS/matter from doc_updates_v1.0.0 to silabs Squashed commit of the following: commit 46f15d6f949cab44c10262869b2d94448d430f72 Author: Ezra Hale <[email protected]> Date: Fri Oct 28 14:10:14 2022 -0400 fixed typos on board names commit 55c9e89b5f006bab627120b2e5b466ba06e9792f Author: Ezra Hale <[email protected]> Date: Fri Oct 28 13:58:31 2022 -0400 updates to boards supported in script and vscode tasks, also few updates to matter bridge readmes commit 49683bfb98730654f592187f373d1b20b6eada2a Author: Ezra Hale <[email protected]> Date: Fri Oct 28 12:13:03 2022 -0400 review of silabs_examples documentation ... and 14 more commits Conflicts: .vscode/tasks.json (resolved by overwriting with our changes as we maintain this file now)

…silabs to silabs_1.0 Merge in WMN_TOOLS/matter from cherry-pick/doc_updates_v1.0.0 to silabs_1.0 Squashed commit of the following: commit 78067c25ba6423ccc81b612b3aa0b49755039bf7 Author: Ezra Hale <[email protected]> Date: Fri Oct 28 20:01:49 2022 +0000 Pull request project-chip#215: Doc updates v1.0.0 Merge in WMN_TOOLS/matter from doc_updates_v1.0.0 to silabs Squashed commit of the following: commit 46f15d6f949cab44c10262869b2d94448d430f72 Author: Ezra Hale <[email protected]> Date: Fri Oct 28 14:10:14 2022 -0400 fixed typos on board names commit 55c9e89b5f006bab627120b2e5b466ba06e9792f Author: Ezra Hale <[email protected]> Date: Fri Oct 28 13:58:31 2022 -0400 updates to boards supported in script and vscode tasks, also few updates to matter bridge readmes commit 49683bfb98730654f592187f373d1b20b6eada2a Author: Ezra Hale <[email protected]> Date: Fri Oct 28 12:13:03 2022 -0400 review of silabs_examples documentation ... and 14 more commits Conflicts: .vscode/tasks.json (resolved by overwriting with our changes as we maintain this file now)

Add HAP Crypto to src/crypto

242d171

This pulls in openssl based crypto methods from HAP

bhaskar-apple requested review from anush-apple, BroderickCarlin, chrisdecenzo, gerickson, hawk248, jelderton, robszewczyk, tpmanley and woody-apple as code owners April 3, 2020 20:20

hawk248 approved these changes Apr 3, 2020

View reviewed changes

balducci-apple reviewed Apr 3, 2020

View reviewed changes

src/crypto/CHIPBase+Crypto.c Outdated Show resolved Hide resolved

rwalker-apple reviewed Apr 3, 2020

View reviewed changes

src/crypto/CHIPOpenSSL.c Show resolved Hide resolved

rwalker-apple reviewed Apr 3, 2020

View reviewed changes

src/crypto/tests/CHIPCryptoTest.c Show resolved Hide resolved

Bhaskar-Sarma added 4 commits April 3, 2020 14:48

Remove unused method

261e5b8

Update CHIP author info in license text

b75fe24

Fix formatting

8fcecea

Fix formatting in CHIPCrypto.h

e526f71

turon requested changes Apr 3, 2020

View reviewed changes

woody-apple approved these changes Apr 3, 2020

View reviewed changes

BroderickCarlin approved these changes Apr 6, 2020

View reviewed changes

woody-apple merged commit 30e3b04 into project-chip:master Apr 6, 2020

gerickson suggested changes Apr 6, 2020

View reviewed changes

bhaskar-apple deleted the BS-HAPCrypto branch April 7, 2020 20:32

austina-csa mentioned this pull request May 29, 2024

Worked on issue 243; replaced input with self.wait_for_user_input; other changes #33672

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add HAP Crypto to src/crypto #243

Add HAP Crypto to src/crypto #243

bhaskar-apple commented Apr 3, 2020

bhaskar-apple commented Apr 3, 2020

hawk248 left a comment

woody-apple commented Apr 3, 2020

gerickson commented Apr 3, 2020

bhaskar-apple commented Apr 3, 2020 •

edited

Loading

gerickson commented Apr 3, 2020

turon left a comment

turon Apr 3, 2020

woody-apple Apr 3, 2020

gerickson Apr 3, 2020

turon Apr 3, 2020

woody-apple Apr 3, 2020

turon Apr 3, 2020

woody-apple Apr 3, 2020

woody-apple left a comment

woody-apple commented Apr 5, 2020

gerickson left a comment

woody-apple commented Apr 6, 2020

balducci-apple commented Apr 6, 2020

bhaskar-apple commented Apr 6, 2020

Add HAP Crypto to src/crypto #243

Add HAP Crypto to src/crypto #243

Conversation

bhaskar-apple commented Apr 3, 2020

Problem

Summary of Changes

bhaskar-apple commented Apr 3, 2020

hawk248 left a comment

Choose a reason for hiding this comment

woody-apple commented Apr 3, 2020

gerickson commented Apr 3, 2020

bhaskar-apple commented Apr 3, 2020 • edited Loading

gerickson commented Apr 3, 2020

turon left a comment

Choose a reason for hiding this comment

turon Apr 3, 2020

Choose a reason for hiding this comment

woody-apple Apr 3, 2020

Choose a reason for hiding this comment

gerickson Apr 3, 2020

Choose a reason for hiding this comment

turon Apr 3, 2020

Choose a reason for hiding this comment

woody-apple Apr 3, 2020

Choose a reason for hiding this comment

turon Apr 3, 2020

Choose a reason for hiding this comment

woody-apple Apr 3, 2020

Choose a reason for hiding this comment

woody-apple left a comment

Choose a reason for hiding this comment

woody-apple commented Apr 5, 2020

gerickson left a comment

Choose a reason for hiding this comment

woody-apple commented Apr 6, 2020

balducci-apple commented Apr 6, 2020

bhaskar-apple commented Apr 6, 2020

bhaskar-apple commented Apr 3, 2020 •

edited

Loading