aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDavid Reid <dreid@dreid.org>2014-01-28 13:33:40 -0800
committerDavid Reid <dreid@dreid.org>2014-02-03 10:05:27 -0800
commitbddcb34bdd000d75a1259d0308f60ffd9b4b3375 (patch)
tree931f45249e93f43e8b1ab0c53db66a5293081dd8 /tests
parent69d16c2c6e0fb6a90ac392cc09cae0baa0c5b692 (diff)
downloadcryptography-bddcb34bdd000d75a1259d0308f60ffd9b4b3375.tar.gz
cryptography-bddcb34bdd000d75a1259d0308f60ffd9b4b3375.tar.bz2
cryptography-bddcb34bdd000d75a1259d0308f60ffd9b4b3375.zip
Remove more leftovers from rebase.
Diffstat (limited to 'tests')
-rw-r--r--tests/test_utils.py45
1 files changed, 2 insertions, 43 deletions
diff --git a/tests/test_utils.py b/tests/test_utils.py
index d00302fd..8ecb33f9 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -20,8 +20,8 @@ import pytest
from .utils import (
load_nist_vectors, load_vectors_from_file, load_cryptrec_vectors,
- load_openssl_vectors, load_hash_vectors, load_hkdf_vectors,
- check_for_iface, check_backend_support, select_backends
+ load_openssl_vectors, load_hash_vectors, check_for_iface,
+ check_backend_support, select_backends
)
@@ -529,44 +529,3 @@ def test_load_nist_gcm_vectors():
'ct': b'15c4db4cbb451211179d57017f',
'fail': True},
]
-
-
-def test_load_hkdf_vectors():
- vector_data = textwrap.dedent("""
- # A.1. Test Case 1
- # Basic test case with SHA-256
-
- Hash = SHA-256
- IKM = 000000
- salt = 111111
- info = 222222
- L = 42
- PRK = 333333
- OKM = 444444
-
- # A.2. Test Case 2
- # Test with SHA-256 and longer inputs/outputs
-
- Hash = SHA-256
- IKM = 000000
- salt =
- info =
- L = 82
- PRK = 333333
- OKM = 444444
- """).splitlines()
-
- assert load_hkdf_vectors(vector_data) == [
- (b"000000",
- b"111111",
- b"222222",
- 42,
- b"333333",
- b"444444"),
- (b"000000",
- b"",
- b"",
- 82,
- b"333333",
- b"444444")
- ]