Merge pull request #55 from web-push-libs/vapid_update

Vapid update

Author: jrconlin

pywebpush/__init__.py

@@ -249,13 +249,11 @@ def send(self, data=None, headers=None, ttl=0, gcm_key=None, reg_id=None,
                 # use ';' instead of ',' to append the headers.
                 # see https://github.com/webpush-wg/webpush-encryption/issues/6
                 crypto_key += ';'
-            crypto_key += (
-                "keyid=p256dh;dh=" + encoded["crypto_key"].decode('utf8'))
+            crypto_key += ("dh=" + encoded["crypto_key"].decode('utf8'))
             headers.update({
                 'crypto-key': crypto_key,
                 'content-encoding': content_encoding,
-                'encryption': "keyid=p256dh;salt=" +
-                encoded['salt'].decode('utf8'),
+                'encryption': "salt=" + encoded['salt'].decode('utf8'),
             })
         if gcm_key:
             endpoint = 'https://android.googleapis.com/gcm/send'

pywebpush/tests/test_webpush.py

@@ -265,7 +265,7 @@ def test_as_curl(self, opener):
             "-H \"crypto-key: p256ecdsa=",
             "-H \"content-encoding: aesgcm\"",
             "-H \"authorization: WebPush ",
-            "-H \"encryption: keyid=p256dh;salt=",
+            "-H \"encryption: salt=",
             "-H \"ttl: 0\"",
             "-H \"content-length:"
         ]:

requirements.txt

@@ -1,4 +1,4 @@
 cryptography==1.8.1
 http-ece==1.0.1
 requests==2.13.0
-py-vapid==1.2.1
+py-vapid==1.2.2

setup.py

@@ -3,7 +3,7 @@
 
 from setuptools import find_packages, setup
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 
 
 def read_from(file):