Merge branch 'master' into verify-interfaces

Conflicts:
	tests/hazmat/primitives/test_hmac.py

3 files changed, 32 insertions, 105 deletions

diff --git a/cryptography/hazmat/backends/commoncrypto/hmac.py b/cryptography/hazmat/backends/commoncrypto/hmac.py
index 404aac68..c2b6c379 100644
--- a/cryptography/hazmat/backends/commoncrypto/hmac.py
+++ b/cryptography/hazmat/backends/commoncrypto/hmac.py
@@ -18,6 +18,7 @@ from cryptography.exceptions import UnsupportedAlgorithm, _Reasons
 from cryptography.hazmat.primitives import interfaces
 
 
+@utils.register_interface(interfaces.MACContext)
 @utils.register_interface(interfaces.HashContext)
 class _HMACContext(object):
     def __init__(self, backend, key, algorithm, ctx=None):
diff --git a/cryptography/hazmat/backends/openssl/hmac.py b/cryptography/hazmat/backends/openssl/hmac.py
index f22b086f..d5300ea0 100644
--- a/cryptography/hazmat/backends/openssl/hmac.py
+++ b/cryptography/hazmat/backends/openssl/hmac.py
@@ -19,6 +19,7 @@ from cryptography.exceptions import UnsupportedAlgorithm, _Reasons
 from cryptography.hazmat.primitives import interfaces
 
 
+@utils.register_interface(interfaces.MACContext)
 @utils.register_interface(interfaces.HashContext)
 class _HMACContext(object):
     def __init__(self, backend, key, algorithm, ctx=None):
diff --git a/cryptography/hazmat/primitives/asymmetric/ec.py b/cryptography/hazmat/primitives/asymmetric/ec.py
index b27d0458..ced732fb 100644
--- a/cryptography/hazmat/primitives/asymmetric/ec.py
+++ b/cryptography/hazmat/primitives/asymmetric/ec.py
@@ -21,167 +21,92 @@ from cryptography.hazmat.primitives import interfaces
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECT571R1(object):
-    @property
-    def name(self):
-        return "sect571r1"
-
-    @property
-    def key_size(self):
-        return 571
+    name = "sect571r1"
+    key_size = 571
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECT409R1(object):
-    @property
-    def name(self):
-        return "sect409r1"
-
-    @property
-    def key_size(self):
-        return 409
+    name = "sect409r1"
+    key_size = 409
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECT283R1(object):
-    @property
-    def name(self):
-        return "sect283r1"
-
-    @property
-    def key_size(self):
-        return 283
+    name = "sect283r1"
+    key_size = 283
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECT233R1(object):
-    @property
-    def name(self):
-        return "sect233r1"
-
-    @property
-    def key_size(self):
-        return 233
+    name = "sect233r1"
+    key_size = 233
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECT163R2(object):
-    @property
-    def name(self):
-        return "sect163r2"
-
-    @property
-    def key_size(self):
-        return 163
+    name = "sect163r2"
+    key_size = 163
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECT571K1(object):
-    @property
-    def name(self):
-        return "sect571k1"
-
-    @property
-    def key_size(self):
-        return 571
+    name = "sect571k1"
+    key_size = 571
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECT409K1(object):
-    @property
-    def name(self):
-        return "sect409k1"
-
-    @property
-    def key_size(self):
-        return 409
+    name = "sect409k1"
+    key_size = 409
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECT283K1(object):
-    @property
-    def name(self):
-        return "sect283k1"
-
-    @property
-    def key_size(self):
-        return 283
+    name = "sect283k1"
+    key_size = 283
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECT233K1(object):
-    @property
-    def name(self):
-        return "sect233k1"
-
-    @property
-    def key_size(self):
-        return 233
+    name = "sect233k1"
+    key_size = 233
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECT163K1(object):
-    @property
-    def name(self):
-        return "sect163k1"
-
-    @property
-    def key_size(self):
-        return 163
+    name = "sect163k1"
+    key_size = 163
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECP521R1(object):
-    @property
-    def name(self):
-        return "secp521r1"
-
-    @property
-    def key_size(self):
-        return 521
+    name = "secp521r1"
+    key_size = 521
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECP384R1(object):
-    @property
-    def name(self):
-        return "secp384r1"
-
-    @property
-    def key_size(self):
-        return 384
+    name = "secp384r1"
+    key_size = 384
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECP256R1(object):
-    @property
-    def name(self):
-        return "secp256r1"
-
-    @property
-    def key_size(self):
-        return 256
+    name = "secp256r1"
+    key_size = 256
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECP224R1(object):
-    @property
-    def name(self):
-        return "secp224r1"
-
-    @property
-    def key_size(self):
-        return 224
+    name = "secp224r1"
+    key_size = 224
 
 
 @utils.register_interface(interfaces.EllipticCurve)
 class SECP192R1(object):
-    @property
-    def name(self):
-        return "secp192r1"
-
-    @property
-    def key_size(self):
-        return 192
+    name = "secp192r1"
+    key_size = 192
 
 
 _CURVE_TYPES = {