Merge branch 'master' into idea-bespoke-vectors

* master: (246 commits)
  Fixed python3 incompatibility
  Removed dependency on setuptools for version check
  don't need to move these definitions
  conditional NIDs for 0.9.8e
  x509 changes for 0.9.8e support
  more changes for 0.9.8e support, this time in the ssl.h headers
  macro switches in evp for 0.9.8e
  bind some error constants conditionally for 0.9.8e support
  BIO macro switch for 0.9.8e support
  move some nids
  conditionally bind AES_wrap/unwrap for 0.9.8e support
  Add GPG key fingerprint for lvh
  change comparison to be easier to read
  ridiculous workaround time
  whoops
  Missing imports
  Convert stuff
  Add binding for DSA_new
  Fix drop in coverage levels by removing branches
  Added check to turn of CC backend for OS X version < 10.8
  ...

Conflicts:
	docs/development/test-vectors.rst

1 files changed, 8 insertions, 8 deletions

diff --git a/tests/hazmat/primitives/test_camellia.py b/tests/hazmat/primitives/test_camellia.py
index 7c56f6f9..25bd0ff9 100644
--- a/tests/hazmat/primitives/test_camellia.py
+++ b/tests/hazmat/primitives/test_camellia.py
@@ -22,7 +22,7 @@ from cryptography.hazmat.primitives.ciphers import algorithms, modes
 
 from .utils import generate_encrypt_test
 from ...utils import (
-    load_cryptrec_vectors, load_openssl_vectors
+    load_cryptrec_vectors, load_nist_vectors
 )
 
 
@@ -33,7 +33,7 @@ from ...utils import (
     skip_message="Does not support Camellia ECB",
 )
 @pytest.mark.cipher
-class TestCamellia_ECB(object):
+class TestCamelliaModeECB(object):
     test_ECB = generate_encrypt_test(
         load_cryptrec_vectors,
         os.path.join("ciphers", "Camellia"),
@@ -54,9 +54,9 @@ class TestCamellia_ECB(object):
     skip_message="Does not support Camellia CBC",
 )
 @pytest.mark.cipher
-class TestCamellia_CBC(object):
+class TestCamelliaModeCBC(object):
     test_CBC = generate_encrypt_test(
-        load_openssl_vectors,
+        load_nist_vectors,
         os.path.join("ciphers", "Camellia"),
         ["camellia-cbc.txt"],
         lambda key, **kwargs: algorithms.Camellia(binascii.unhexlify(key)),
@@ -71,9 +71,9 @@ class TestCamellia_CBC(object):
     skip_message="Does not support Camellia OFB",
 )
 @pytest.mark.cipher
-class TestCamellia_OFB(object):
+class TestCamelliaModeOFB(object):
     test_OFB = generate_encrypt_test(
-        load_openssl_vectors,
+        load_nist_vectors,
         os.path.join("ciphers", "Camellia"),
         ["camellia-ofb.txt"],
         lambda key, **kwargs: algorithms.Camellia(binascii.unhexlify(key)),
@@ -88,9 +88,9 @@ class TestCamellia_OFB(object):
     skip_message="Does not support Camellia CFB",
 )
 @pytest.mark.cipher
-class TestCamellia_CFB(object):
+class TestCamelliaModeCFB(object):
     test_CFB = generate_encrypt_test(
-        load_openssl_vectors,
+        load_nist_vectors,
         os.path.join("ciphers", "Camellia"),
         ["camellia-cfb.txt"],
         lambda key, **kwargs: algorithms.Camellia(binascii.unhexlify(key)),