Merge branch 'release/1.3.0'

Author: ahknight

CHANGELOG.rst

@@ -1,10 +1,18 @@
 httpsig Changes
 ---------------
 
+1.3.0 (2019-Nov-28)
+-------------------
+
+* Relax pycryptodome requirements (PR#14 by cveilleux)
+* Ability to supply another signature header like Signature (PR#15 by rbignon)
+* Fixed #2; made Signer.sign() public
+* Dropped Python 3.3, added Python 3.7.
+
 1.2.0 (2018-Mar-28)
 -------------------
 
-* Switched to pycryptodome instead of PyCrypto
+* Switched to pycryptodome instead of PyCrypto (PR#11 by iandouglas)
 * Updated tests with the test data from Draft 8 and verified it still passes.
 * Dropped official Python 3.2 support (pip dropped it so it can't be properly tested)
 * Cleaned up the code to be more PEP8-like.

httpsig/sign.py

@@ -60,7 +60,7 @@ def _sign_hmac(self, data):
         hmac.update(data)
         return hmac.digest()
 
-    def _sign(self, data):
+    def sign(self, data):
         if isinstance(data, six.string_types):
             data = data.encode("ascii")
         signed = None
@@ -114,7 +114,7 @@ def sign(self, headers, host=None, method=None, path=None):
         signable = generate_message(
                     required_headers, headers, host, method, path)
 
-        signature = self._sign(signable)
+        signature = super(HeaderSigner, self).sign(signable)
         headers[self.sign_header] = self.signature_template % signature
 
         return headers

httpsig/tests/test_verify.py

@@ -53,7 +53,7 @@ def test_basic_sign(self):
         BAD = b"this is not the signature you were looking for..."
 
         # generate signed string
-        signature = signer._sign(GOOD)
+        signature = signer.sign(GOOD)
         self.assertTrue(verifier._verify(data=GOOD, signature=signature))
         self.assertFalse(verifier._verify(data=BAD, signature=signature))
 

setup.py

@@ -9,7 +9,6 @@
 
 setup(
     name='httpsig',
-    # version=versioneer.get_version(),
     description="Secure HTTP request signing using the HTTP Signature draft specification",
     long_description=long_description,
     classifiers=[