remove openssl api dependency in test_openssl_vectors
Update some single quotes to double for consistency
diff --git a/tests/primitives/test_cryptrec.py b/tests/primitives/test_cryptrec.py
index fb2bf19..de26ebd 100644
--- a/tests/primitives/test_cryptrec.py
+++ b/tests/primitives/test_cryptrec.py
@@ -50,8 +50,8 @@
]
)
def test_NTT(self, key, plaintext, ciphertext, api):
- if not api.supports_cipher('camellia-128-ecb'):
- pytest.skip()
+ if not api.supports_cipher("camellia-128-ecb"):
+ pytest.skip("Does not support Camellia ECB")
cipher = BlockCipher(
ciphers.Camellia(binascii.unhexlify(key)),
modes.ECB(),
diff --git a/tests/primitives/test_openssl_vectors.py b/tests/primitives/test_openssl_vectors.py
index ccd0719..acb982a 100644
--- a/tests/primitives/test_openssl_vectors.py
+++ b/tests/primitives/test_openssl_vectors.py
@@ -23,7 +23,6 @@
import pytest
-from cryptography.bindings.openssl.api import api
from cryptography.primitives.block import BlockCipher, ciphers, modes
from ..utils import load_openssl_vectors_from_file
@@ -47,9 +46,9 @@
"camellia-cbc.txt",
]
)
- def test_OpenSSL(self, key, iv, plaintext, ciphertext):
- if not api.supports_cipher('camellia-128-cbc'):
- pytest.skip()
+ def test_OpenSSL(self, key, iv, plaintext, ciphertext, api):
+ if not api.supports_cipher("camellia-128-cbc"):
+ pytest.skip("Does not support Camellia CBC")
cipher = BlockCipher(
ciphers.Camellia(binascii.unhexlify(key)),
modes.CBC(binascii.unhexlify(iv)),
@@ -68,9 +67,9 @@
"camellia-ofb.txt",
]
)
- def test_OpenSSL(self, key, iv, plaintext, ciphertext):
- if not api.supports_cipher('camellia-128-ofb'):
- pytest.skip()
+ def test_OpenSSL(self, key, iv, plaintext, ciphertext, api):
+ if not api.supports_cipher("camellia-128-ofb"):
+ pytest.skip("Does not support Camellia OFB")
cipher = BlockCipher(
ciphers.Camellia(binascii.unhexlify(key)),
modes.OFB(binascii.unhexlify(iv)),
@@ -89,9 +88,9 @@
"camellia-cfb.txt",
]
)
- def test_OpenSSL(self, key, iv, plaintext, ciphertext):
- if not api.supports_cipher('camellia-128-cfb'):
- pytest.skip()
+ def test_OpenSSL(self, key, iv, plaintext, ciphertext, api):
+ if not api.supports_cipher("camellia-128-cfb"):
+ pytest.skip("Does not support Camellia CFB")
cipher = BlockCipher(
ciphers.Camellia(binascii.unhexlify(key)),
modes.CFB(binascii.unhexlify(iv)),