GitLab

This reverts commit aa1faf82, i.e. it relands fccf3a8f.

(After thinking about structure padding and writing a comment, I forgot
to actually handle it! Probably too complex anyway; do something dumber.)

> Revert "Give the desktop a public key in QR handshakes."
>
> This reverts commit fccf3a8f.
>
> Reason for revert:
> This CL breaks on Linux MSan bot
> FidoCableDiscoveryTest.TestDiscoveryFindsNewAppleDevice
> FidoCableDiscoveryTest.TestDiscoveryFindsIncorrectDevice
>
> First failure:
> https://ci.chromium.org/p/chromium/builders/ci/Linux%20MSan%20Tests/22909
>
> Original change's description:
> > Give the desktop a public key in QR handshakes.
> >
> > This change switches the QR-based handshake from NNpsk0 to KNpsk0. I.e.
> > it gives the desktop a public-key. That key is included in the QR code
> > and means that an attacker who sees the QR code cannot impersonate the
> > desktop and pair with the phone. (The other direction is still possible,
> > however, and seems fundamental without the user entering a confirmation
> > code on the desktop.)
> >
> > BUG=1002262
> >
> > Change-Id: I7254a8aa17df71d2bcabb4371a1c18914ed20641
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2109032
> > Commit-Queue: Adam Langley <agl@chromium.org>
> > Auto-Submit: Adam Langley <agl@chromium.org>
> > Reviewed-by: Martin Kreichgauer <martinkr@google.com>
> > Cr-Commit-Position: refs/heads/master@{#752196}
>
> TBR=agl@chromium.org,martinkr@google.com
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 1002262
> Change-Id: Id75ad0bab2862b3dafe73d20cf762883cc24faf9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2113771
> Reviewed-by: Vadym Doroshenko <dvadym@chromium.org>
> Commit-Queue: Vadym Doroshenko <dvadym@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#752403}

BUG=10022628

Change-Id: I993eab544edd2eca6bc5c5923f9dab9b2d07c393
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2115799
Commit-Queue: Adam Langley <agl@chromium.org>
Auto-Submit: Adam Langley <agl@chromium.org>
Reviewed-by: Martin Kreichgauer <martinkr@google.com>
Cr-Commit-Position: refs/heads/master@{#752586}