diff options
author | Simo Sorce <simo@redhat.com> | 2015-03-18 14:12:09 -0400 |
---|---|---|
committer | Simo Sorce <simo@redhat.com> | 2015-03-18 14:12:09 -0400 |
commit | 3481090ea41b4a04552da580f44d229735f5dd7e (patch) | |
tree | e8456b1c881fa039ec7e8bdb32d2974e28400d4e /jwcrypto/jws.py | |
parent | 33f36ea10c1db2aaa74818c60933a20a9abe672f (diff) | |
download | jwcrypto-3481090ea41b4a04552da580f44d229735f5dd7e.tar.gz jwcrypto-3481090ea41b4a04552da580f44d229735f5dd7e.tar.xz jwcrypto-3481090ea41b4a04552da580f44d229735f5dd7e.zip |
Change the way operation keys are retrieved
This way we have less confusion about what the function is supposed to
do and less code duplication.
Signed-off-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'jwcrypto/jws.py')
-rw-r--r-- | jwcrypto/jws.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/jwcrypto/jws.py b/jwcrypto/jws.py index 63174d6..e2e97c0 100644 --- a/jwcrypto/jws.py +++ b/jwcrypto/jws.py @@ -83,12 +83,12 @@ class _raw_hmac(_raw_jws): return h def sign(self, key, payload): - skey = base64url_decode(key.sign_key()) + skey = base64url_decode(key.get_op_key('sign')) h = self._hmac_setup(skey, payload) return h.finalize() def verify(self, key, payload, signature): - vkey = base64url_decode(key.verify_key()) + vkey = base64url_decode(key.get_op_key('verify')) h = self._hmac_setup(vkey, payload) try: h.verify(signature) @@ -102,13 +102,13 @@ class _raw_rsa(_raw_jws): self.hashfn = hashfn def sign(self, key, payload): - skey = key.sign_key() + skey = key.get_op_key('sign') signer = skey.signer(self.padfn, self.hashfn) signer.update(payload) return signer.finalize() def verify(self, key, payload, signature): - pkey = key.verify_key() + pkey = key.get_op_key('verify') verifier = pkey.verifier(signature, self.padfn, self.hashfn) verifier.update(payload) verifier.verify() @@ -126,7 +126,7 @@ class _raw_ec(_raw_jws): return e.decode('hex') def sign(self, key, payload): - skey = key.sign_key(self.curve) + skey = key.get_op_key('sign', self.curve) signer = skey.signer(ec.ECDSA(self.hashfn)) signer.update(payload) signature = signer.finalize() @@ -135,7 +135,7 @@ class _raw_ec(_raw_jws): return self.encode_int(r, l) + self.encode_int(s, l) def verify(self, key, payload, signature): - pkey = key.verify_key(self.curve) + pkey = key.get_op_key('verify', self.curve) r = signature[:len(signature)/2] s = signature[len(signature)/2:] enc_signature = ec_utils.encode_rfc6979_signature( |