Merge pull request #79 from rohe/verify_params

More specific Exception class

Author: rohe

src/jwkest/ecc.py

@@ -18,6 +18,10 @@
 from math import ceil
 
 
+class ECCException(Exception):
+    pass
+
+
 # Make the EC interface more OO
 class NISTEllipticCurve(object):
     def __init__(self, bits):
@@ -34,7 +38,7 @@ def by_name(name):
         if name == "P-521" or name == b'P-521':
             return NISTEllipticCurve(521)
         else:
-            raise Exception("Unknown curve {0}".format(name))
+            raise ECCException("Unknown curve {0}".format(name))
 
     # Get the name of this curve
     # XXX This only works because we only support prime curves right now

src/jwkest/jwk.py

@@ -242,22 +242,22 @@ def __init__(self, kty="", alg="", use="", kid="", key=None, x5c=None,
         if isinstance(kty, six.string_types):
             self.kty = kty
         else:
-            self.kty = kty.decode("utf8")
+            self.kty = as_unicode(kty)
 
         if isinstance(alg, six.string_types):
             self.alg = alg
         else:
-            self.alg = alg.decode("utf8")
+            self.alg = as_unicode(alg)
 
         if isinstance(use, six.string_types):
             self.use = use
         else:
-            self.use = use.decode("utf8")
+            self.use = as_unicode(use)
 
         if isinstance(kid, six.string_types):
             self.kid = kid
         else:
-            self.kid = kid.decode("utf8")
+            self.kid = as_unicode(kid)
 
         self.x5c = x5c or []
         self.x5t = x5t
@@ -412,6 +412,8 @@ def __init__(self, kty="RSA", alg="", use="", kid="", key=None,
             self.deserialize()
         elif self.key and not (self.n and self.e):
             self._split()
+        elif not self.key and not(self.n and self.e):
+            raise DeSerializationNotPossible('Missing required parameter')
 
     def deserialize(self):
         if self.n and self.e:
@@ -550,8 +552,12 @@ def __init__(self, kty="EC", alg="", use="", kid="", key=None,
         if self.crv and not self.curve:
             self.verify()
             self.deserialize()
-        elif self.key and (not self.crv and not self.curve):
-            self.load_key(key)
+        elif self.key:
+            if not self.crv and not self.curve:
+                self.load_key(key)
+        else:
+            if not (self.x and self.y and self.crv):
+                raise DeSerializationNotPossible('Missing required parameter')
 
     def deserialize(self):
         """