Fixes tox dependancies and adds tests for stripping the pkcs5 padding

Author: rszalski

requirements_tox.txt

@@ -0,0 +1,15 @@
+click==6.6
+Django==1.10.2
+Flask==0.11.1
+itsdangerous==0.24
+Jinja2==2.8
+MarkupSafe==0.23
+mock==2.0.0
+pbr==1.10.0
+pytest==3.0.3
+six==1.10.0
+tox>=1.7.2
+virtualenv==13.1.2
+future==0.15.2
+Werkzeug==0.11.11
+wheel==0.24.0

tox.ini

@@ -1,24 +1,54 @@
 [tox]
 envlist = py26,py27,py33,py34,py35,py36
           {py26,py27,py33,py34,py35,py36}-{oldest,cryptography14,requests26,protobuf30}
-          py36-macOS
+          {py26,py36}-macOS
           py36-macOS-{oldest,cryptography14,requests26,protobuf30}
 skip_missing_interpreters = True
 
 [testenv]
 commands = py.test -c {posargs:pytest.ini}
 whitelist_externals = py.test
                       macOS: env
-deps = future011,oldest: future==0.11.0
+
+
+; Tox doesn't allow us to combine main requirements.txt with specific deps versions,
+; since it will result in 'multiple deps error'.
+; The solution is to omit those deps in a tox-specific requirements.txt file
+; and maintain 2 sets of deps by explicitly stating them in tox.ini
+deps =
        protobuf30,oldest: protobuf==3.0.0
        requests20,oldest: requests==2.0.0
        cryptography14,oldest: cryptography==1.4
-       future013: future>=0.13,<0.14
        requests26: requests>=2.6,<2.7
+       -rrequirements_tox.txt
+
+[testenv:py26]
+; Make sure those are the same as in requirements.txt
+; they will be used in envs that do not specify specific, older versions of these packages.
+deps =
+    cryptography==1.5.2
+    protobuf==3.1.0.post1
+    requests==2.11.1
+    -rrequirements_tox.txt
 
-[testenv:py36]
 platform  = win32|linux2|linux|cygwin
 
+[testenv:py27]
+deps = {[testenv:py26]deps}
+
+[testenv:py33]
+deps = {[testenv:py26]deps}
+
+[testenv:py34]
+deps = {[testenv:py26]deps}
+
+[testenv:py35]
+deps = {[testenv:py26]deps}
+
+[testenv:py36]
+platform = {[testenv:py26]platform}
+deps = {[testenv:py26]deps}
+
 [testenv:py36-oldest]
 platform = {[testenv:py36]platform}
 
@@ -38,6 +68,10 @@ platform = {[testenv:py36]platform}
 install_command = env LDFLAGS="-L/usr/local/opt/openssl/lib" CFLAGS="-I/usr/local/opt/openssl/include" pip install {opts} {packages}
 platform = darwin
 
+[testenv:py26-macOS]
+install_command = {[testenv:macOS]install_command}
+platform = {[testenv:macOS]platform}
+
 [testenv:py36-macOS]
 install_command = {[testenv:macOS]install_command}
 platform = {[testenv:macOS]platform}

yoti/tests/test_crypto.py

@@ -3,6 +3,8 @@
 
 import pytest
 
+from yoti.crypto import Crypto
+
 
 @pytest.mark.parametrize('invalid_token', [
     '',
@@ -22,3 +24,12 @@ def test_given_proper_encrypted_token__decrypting_should_yield_decrypted_token(
     decrypted_token = crypto.decrypt_token(encrypted_request_token).decode('utf-8')
     assert decrypted_token == expected_token
 
+
+@pytest.mark.parametrize('with_padding,stripped', [
+    (b'\xfa\x01', b'\xfa'),
+    (b'\xfa\x06\x06\x06\x06\x06\x06', b'\xfa'),
+    (b'\xfa\x08\x08\x08\x08\x08\x08\x08\x08', b'\xfa'),
+])
+def test_strip_pkcs5_padding(with_padding, stripped):
+    assert Crypto.strip_pkcs5_padding(with_padding) == stripped
+