From 40afce08a073d64363dc12bf1bdd520337c875c2 Mon Sep 17 00:00:00 2001 From: Ayrx Date: Sun, 13 Apr 2014 19:17:52 +0800 Subject: Fixed wrong vectors --- docs/development/test-vectors.rst | 6 +++--- .../CMAC/nist-800-38b-3des.txt | 8 ++++---- .../CMAC/nist-800-38b-aes128.txt | 22 ++++++++++++++++++++++ .../cryptography_vectors/CMAC/rfc4493-aes128.txt | 22 ---------------------- 4 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 vectors/cryptography_vectors/CMAC/nist-800-38b-aes128.txt delete mode 100644 vectors/cryptography_vectors/CMAC/rfc4493-aes128.txt 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/nist-800-38b-aes128.txt b/vectors/cryptography_vectors/CMAC/nist-800-38b-aes128.txt new file mode 100644 index 00000000..7219d39d --- /dev/null +++ b/vectors/cryptography_vectors/CMAC/nist-800-38b-aes128.txt @@ -0,0 +1,22 @@ +# AES-128-CMAC Test Vectors +# NIST SP_800-38B + +COUNT = 0 +KEY = 2b7e151628aed2a6abf7158809cf4f3c +MESSAGE = +OUTPUT = bb1d6929e95937287fa37d129b756746 + +COUNT = 1 +KEY = 2b7e151628aed2a6abf7158809cf4f3c +MESSAGE = 6bc1bee22e409f96e93d7e117393172a +OUTPUT = 070a16b46b4d4144f79bdd9dd04a287c + +COUNT = 2 +KEY = 2b7e151628aed2a6abf7158809cf4f3c +MESSAGE = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411 +OUTPUT = dfa66747de9ae63030ca32611497c827 + +COUNT = 3 +KEY = 2b7e151628aed2a6abf7158809cf4f3c +MESSAGE = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +OUTPUT = 51f0bebf7e3b9d92fc49741779363cfe diff --git a/vectors/cryptography_vectors/CMAC/rfc4493-aes128.txt b/vectors/cryptography_vectors/CMAC/rfc4493-aes128.txt deleted file mode 100644 index 76857a86..00000000 --- a/vectors/cryptography_vectors/CMAC/rfc4493-aes128.txt +++ /dev/null @@ -1,22 +0,0 @@ -# AES-128-CMAC Test Vectors -# RFC 4493 - -COUNT = 0 -KEY = 2b7e151628aed2a6abf7158809cf4f3c -MESSAGE = -OUTPUT = bb1d6929e95937287fa37d129b756746 - -COUNT = 1 -KEY = 2b7e151628aed2a6abf7158809cf4f3c -MESSAGE = 6bc1bee22e409f96e93d7e117393172a -OUTPUT = 070a16b46b4d4144f79bdd9dd04a287c - -COUNT = 2 -KEY = 2b7e151628aed2a6abf7158809cf4f3c -MESSAGE = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411 -OUTPUT = dfa66747de9ae63030ca32611497c827 - -COUNT = 3 -KEY = 2b7e151628aed2a6abf7158809cf4f3c -MESSAGE = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 -OUTPUT = 51f0bebf7e3b9d92fc49741779363cfe -- cgit v1.2.3