diff options
| author | Ayrx <terrycwk1994@gmail.com> | 2014-04-13 19:17:52 +0800 |
|---|---|---|
| committer | Ayrx <terrycwk1994@gmail.com> | 2014-04-13 19:22:50 +0800 |
| commit | 40afce08a073d64363dc12bf1bdd520337c875c2 (patch) | |
| tree | 3a3e9a096a7ddbe16e78b95a5e109cc0c245e713 | |
| parent | 1d6b77beb61c9daebbe84d27fb5d48958dbc8f89 (diff) | |
| download | cryptography-40afce08a073d64363dc12bf1bdd520337c875c2.tar.gz cryptography-40afce08a073d64363dc12bf1bdd520337c875c2.tar.bz2 cryptography-40afce08a073d64363dc12bf1bdd520337c875c2.zip | |
Fixed wrong vectors
| -rw-r--r-- | docs/development/test-vectors.rst | 6 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/CMAC/nist-800-38b-3des.txt | 8 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/CMAC/nist-800-38b-aes128.txt (renamed from vectors/cryptography_vectors/CMAC/rfc4493-aes128.txt) | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst index 59b3fe90..b5bac556 100644 --- a/docs/development/test-vectors.rst +++ b/docs/development/test-vectors.rst @@ -92,11 +92,11 @@ Two factor authentication CMAC ~~~~ -* AES-128 from :rfc:`4493` +* AES-128 from `NIST SP-800-38B`_ * AES-192 from `NIST SP-800-38B`_ * AES-256 from `NIST SP-800-38B`_ * Three Key 3DES from `NIST SP-800-38B`_ -* Two Key 3DES `NIST SP-800-38B`_ +* Two Key 3DES from `NIST SP-800-38B`_ Creating test vectors --------------------- @@ -147,4 +147,4 @@ header format (substituting the correct information): .. _`NESSIE IDEA vectors`: https://www.cosic.esat.kuleuven.be/nessie/testvectors/bc/idea/Idea-128-64.verified.test-vectors .. _`NESSIE`: https://en.wikipedia.org/wiki/NESSIE .. _`Ed25519 website`: http://ed25519.cr.yp.to/software.html -.. _`NIST SP-800-38B`: http://csrc.nist.gov/publications/nistpubs/800-38B/SP_800-38B.pdf +.. _`NIST SP-800-38B`: http://csrc.nist.gov/publications/nistpubs/800-38B/Updated_CMAC_Examples.pdf diff --git a/vectors/cryptography_vectors/CMAC/nist-800-38b-3des.txt b/vectors/cryptography_vectors/CMAC/nist-800-38b-3des.txt index 7c3ff5ce..60561e05 100644 --- a/vectors/cryptography_vectors/CMAC/nist-800-38b-3des.txt +++ b/vectors/cryptography_vectors/CMAC/nist-800-38b-3des.txt @@ -14,14 +14,14 @@ KEY1 = 8aa83bf8cbda1062 KEY2 = 0bc1bf19fbb6cd58 KEY3 = bc313d4a371ca8b5 MESSAGE = 6bc1bee22e409f96 -OUTPUT = b7a688e122ffaf95 +OUTPUT = 8e8f293136283797 COUNT = 2 KEY1 = 8aa83bf8cbda1062 KEY2 = 0bc1bf19fbb6cd58 KEY3 = bc313d4a371ca8b5 MESSAGE = 6bc1bee22e409f96e93d7e117393172aae2d8a57 -OUTPUT = d32bcebe43d23d80 +OUTPUT = 743ddbe0ce2dc2ed COUNT = 3 KEY1 = 8aa83bf8cbda1062 @@ -43,14 +43,14 @@ KEY1 = 4cf15134a2850dd5 KEY2 = 8a3d10ba80570d38 KEY3 = 4cf15134a2850dd5 MESSAGE = 6bc1bee22e409f96 -OUTPUT = bd2ebf9a3ba00361 +OUTPUT = 4ff2ab813c53ce83 COUNT = 6 KEY1 = 4cf15134a2850dd5 KEY2 = 8a3d10ba80570d38 KEY3 = 4cf15134a2850dd5 MESSAGE = 6bc1bee22e409f96e93d7e117393172aae2d8a57 -OUTPUT = 8ea92435b52660e0 +OUTPUT = 62dd1b471902bd4e COUNT = 7 KEY1 = 4cf15134a2850dd5 diff --git a/vectors/cryptography_vectors/CMAC/rfc4493-aes128.txt b/vectors/cryptography_vectors/CMAC/nist-800-38b-aes128.txt index 76857a86..7219d39d 100644 --- a/vectors/cryptography_vectors/CMAC/rfc4493-aes128.txt +++ b/vectors/cryptography_vectors/CMAC/nist-800-38b-aes128.txt @@ -1,5 +1,5 @@ # AES-128-CMAC Test Vectors -# RFC 4493 +# NIST SP_800-38B COUNT = 0 KEY = 2b7e151628aed2a6abf7158809cf4f3c |