Skip to content

Commit d490bf2

Browse files
authored
Merge branch 'master' into workflows
2 parents f525db8 + f7b8d34 commit d490bf2

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

crypto.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ reserved for use in authentication and session key establishment.
429429
today could be stored for a decade or two and then decrypted by a
430430
future quantum computer, so even data produced today could be at
431431
risk.
432-
432+
433433
The response to this uncertain threat has been to develop suites of
434434
cryptographic algorithms for which no quantum solution is
435435
known. This is the field of "Post-Quantum Cryptography". Note the
@@ -446,9 +446,6 @@ reserved for use in authentication and session key establishment.
446446
change, the requirement for *crypto-agility*—the ability to swap
447447
out one set of algorithms for another—is now well established.
448448

449-
450-
451-
452449
3.4 Message Authentication
453450
---------------------------------
454451

@@ -635,7 +632,6 @@ authenticated. We won't go into details here, but there is now a set of
635632
integrated algorithms that produce both ciphertext and authentication
636633
codes using a combination of ciphers and hash functions.
637634

638-
639635
Now that we have seen some of the building blocks for encryption and
640636
authentication, we have the foundations for building some complete security
641637
solutions. Before we get to those, however, we address the issue of how participants

0 commit comments

Comments
 (0)