Merge pull request #103 from web-push-libs/crypto

Fixes for cryptography update

Author: pjenvey

pywebpush/__init__.py

@@ -18,6 +18,7 @@
 import requests
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import ec
+from cryptography.hazmat.primitives import serialization
 from py_vapid import Vapid
 
 
@@ -186,7 +187,10 @@ def encode(self, data, content_encoding="aes128gcm"):
         # The server key is an ephemeral ECDH key used only for this
         # transaction
         server_key = ec.generate_private_key(ec.SECP256R1, default_backend())
-        crypto_key = server_key.public_key().public_numbers().encode_point()
+        crypto_key = server_key.public_key().public_bytes(
+            encoding=serialization.Encoding.X962,
+            format=serialization.PublicFormat.UncompressedPoint
+        )
 
         if isinstance(data, six.string_types):
             data = bytes(data.encode('utf8'))

pywebpush/tests/test_webpush.py

@@ -7,6 +7,7 @@
 from nose.tools import eq_, ok_, assert_is_not, assert_raises
 import http_ece
 from cryptography.hazmat.primitives.asymmetric import ec
+from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.backends import default_backend
 import py_vapid
 
@@ -38,8 +39,10 @@ def _gen_subscription_info(self,
 
     def _get_pubkey_str(self, priv_key):
         return base64.urlsafe_b64encode(
-            priv_key.public_key().public_numbers().encode_point()
-        ).strip(b'=')
+            priv_key.public_key().public_bytes(
+                encoding=serialization.Encoding.X962,
+                format=serialization.PublicFormat.UncompressedPoint
+            )).strip(b'=')
 
     def test_init(self):
         # use static values so we know what to look for in the reply
@@ -106,7 +109,6 @@ def test_encode(self):
                     push._repad(encoded['crypto_key']))
             raw_auth = base64.urlsafe_b64decode(
                 push._repad(subscription_info['keys']['auth']))
-
             decoded = http_ece.decrypt(
                 encoded['body'],
                 salt=raw_salt,

setup.py

@@ -4,7 +4,7 @@
 from setuptools import find_packages, setup
 
 
-__version__ = "1.8.0"
+__version__ = "1.9.0"
 
 
 def read_from(file):