Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SPAKE2p pairing code to match spec #4166

Merged
merged 6 commits into from
Dec 12, 2020

Conversation

pan-apple
Copy link
Contributor

Problem

The current pairing code is based on the earlier version of the spec, and the spec has evolved since then. The code needs updates to match the latest specifications.

Summary of Changes

  • update message handshake to include PBKDF param exchange
  • update msg types and error codes
  • add error handling via error message handshake

Fixes #4135

@pan-apple
Copy link
Contributor Author

rebased

- update message handshake to include PBKDF param exchange
- update msg types and error codes
- add error handling via error message handshake
@pan-apple
Copy link
Contributor Author

rebased

@pan-apple
Copy link
Contributor Author

@saurabhst, @jelderton, @BroderickCarlin , do you have any comments?

@github-actions
Copy link

Size increase report for "nrfconnect-example-build" from 27d3ea8

File Section File VM
chip-lighting.elf text 1224 1224
chip-lighting.elf bss 0 544
chip-lighting.elf rodata 264 260
chip-lighting.elf shell_root_cmds_sections -8 -8
chip-lock.elf text 1224 1224
chip-lock.elf bss 0 544
chip-lock.elf rodata 264 260
chip-lock.elf shell_root_cmds_sections -8 -8
Full report output
BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-lighting.elf and ./pull_artifact/chip-lighting.elf:

sections,vmsize,filesize
.debug_info,0,7272
.debug_loc,0,3139
.debug_line,0,2734
.debug_str,0,1285
text,1224,1224
.symtab,0,624
.strtab,0,623
bss,544,0
.debug_ranges,0,512
.debug_abbrev,0,426
.debug_frame,0,368
rodata,260,264
.debug_aranges,0,88
.shstrtab,0,1
shell_root_cmds_sections,-8,-8

Comparing ./master_artifact/chip-shell.elf and ./pull_artifact/chip-shell.elf:

sections,vmsize,filesize

Comparing ./master_artifact/chip-lock.elf and ./pull_artifact/chip-lock.elf:

sections,vmsize,filesize
.debug_info,0,7272
.debug_loc,0,3147
.debug_line,0,2734
.debug_str,0,1285
text,1224,1224
.symtab,0,624
.strtab,0,623
bss,544,0
.debug_ranges,0,512
.debug_abbrev,0,426
.debug_frame,0,368
rodata,260,264
.debug_aranges,0,88
.shstrtab,0,-3
shell_root_cmds_sections,-8,-8


@github-actions
Copy link

Size increase report for "esp32-example-build" from 27d3ea8

File Section File VM
chip-all-clusters-app.elf .flash.text 1296 1296
chip-all-clusters-app.elf .dram0.bss 0 544
chip-all-clusters-app.elf .flash.rodata 280 280
Full report output
BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-all-clusters-app.elf and ./pull_artifact/chip-all-clusters-app.elf:

sections,vmsize,filesize
.debug_info,0,7482
.debug_line,0,5232
.debug_loc,0,2626
.flash.text,1296,1296
.debug_str,0,1257
.debug_ranges,0,768
.strtab,0,673
.dram0.bss,544,0
.debug_abbrev,0,444
.flash.rodata,280,280
.debug_frame,0,240
.symtab,0,160
.debug_aranges,0,80
.shstrtab,0,-1
.xt.prop._ZTVN4chip11DeviceLayer37DeviceNetworkProvisioningDelegateImplE,0,-1
[Unmapped],0,-280


src/crypto/CHIPCryptoPAL.cpp Show resolved Hide resolved
src/crypto/CHIPCryptoPAL.h Outdated Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Outdated Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Outdated Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Outdated Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Outdated Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Outdated Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Outdated Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Outdated Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Outdated Show resolved Hide resolved
src/transport/SecurePairingSession.cpp Outdated Show resolved Hide resolved
@bzbarsky-apple bzbarsky-apple merged commit 34d8115 into project-chip:master Dec 12, 2020
@pan-apple pan-apple deleted the issue4135 branch December 12, 2020 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update SPAKE2P pairing state machine code to match spec
6 participants