From 78f328a15924f7150b800ad90d96bb8ea801c2a2 Mon Sep 17 00:00:00 2001 From: TACIXAT Date: Mon, 19 Nov 2018 20:51:48 -0800 Subject: [PATCH] Remove deprecated verifier and replace with verify. --- u2flib_server/model.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/u2flib_server/model.py b/u2flib_server/model.py index 481be51..a91cbcd 100644 --- a/u2flib_server/model.py +++ b/u2flib_server/model.py @@ -175,12 +175,9 @@ def verify(self, app_param, chal_param): cert = x509.load_der_x509_certificate(self.certificate, default_backend()) pubkey = cert.public_key() - verifier = pubkey.verifier(self.signature, ec.ECDSA(hashes.SHA256())) - - verifier.update(b'\0' + app_param + chal_param + self.key_handle + - self.pub_key) + msg = b'\0' + app_param + chal_param + self.key_handle + self.pub_key try: - verifier.verify() + pubkey.verify(self.signature, msg, ec.ECDSA(hashes.SHA256())) except InvalidSignature: raise ValueError('Attestation signature is invalid') @@ -207,13 +204,10 @@ def __init__(self, data): def verify(self, app_param, chal_param, der_pubkey): pubkey = load_der_public_key(PUB_KEY_DER_PREFIX + der_pubkey, default_backend()) - verifier = pubkey.verifier(self.signature, ec.ECDSA(hashes.SHA256())) - verifier.update(app_param + - six.int2byte(self.user_presence) + - struct.pack('>I', self.counter) + - chal_param) + msg = app_param + six.int2byte(self.user_presence) + msg += struct.pack('>I', self.counter) + chal_param try: - verifier.verify() + pubkey.verify(self.signature, msg, ec.ECDSA(hashes.SHA256())) except InvalidSignature: raise ValueError('U2F signature is invalid')