Merge branch 'urllib3-security-patch'

drGrove · May 4, 2019 · 5edeeb6 · 5edeeb6
2 parents 3a8aae8 + 0ad5e44
commit 5edeeb6
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 41 deletions.
diff --git a/Makefile b/Makefile
@@ -53,9 +53,9 @@ coveralls:
 
 pkg: build
 	@echo "Generating sha256sum of Binary"
-	@sha256sum $(ROOT_DIR)/mtls/mtls > $(ROOT_DIR)/mtls/mtls.sha256sum
+	@sha256sum mtls/mtls > mtls/mtls.sha256sum
 	@echo "Signing binary"
-	@gpg --sign --detach-sign --output $(ROOT_DIR)/mtls/mtls.sig $(ROOT_DIR)/mtls/mtls
+	@gpg --sign --detach-sign --output mtls/mtls.sig mtls/mtls
 
 clean:
 	@rm -r build dist $(PIP_ENV)
diff --git a/Pipfile b/Pipfile
@@ -11,6 +11,7 @@ docker = "==3.7.1"
 [packages]
 cryptography = "==2.4.2"
 python-gnupg = "==0.4.4"
+urllib3 = "==1.24.2"
 requests = "==2.21.0"
 pycodestyle = "==2.4.0"
 click = "==7.0"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/cli.py b/cli.py
@@ -5,7 +5,7 @@
 from mtls import MutualTLS
 
 
-VERSION = 'v0.8.0'
+VERSION = 'v0.8.1'
 HELP_TEXT = ('mtls is a PGP Web of Trust based SSL Client Certificate '
              'generation tool based on Googles Beyond Corp Zero Trust '
              'Authentication. Version {}.'.format(VERSION))

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 -i https://pypi.org/simple
 asn1crypto==0.24.0
 certifi==2019.3.9
-cffi==1.12.2
+cffi==1.12.3
 chardet==3.0.4
 click==7.0
 cryptography==2.4.2
@@ -13,4 +13,4 @@ pyopenssl==19.0.0
 python-gnupg==0.4.4
 requests==2.21.0
 six==1.12.0
-urllib3==1.24.1
+urllib3==1.24.2