[Python-modules-commits] [python-bcrypt] 01/04: New upstream version 3.1.4
Daniel Stender
stender at moszumanska.debian.org
Sun Nov 5 10:08:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
stender pushed a commit to branch debian/master
in repository python-bcrypt.
commit 21d37d69d8e7cf600171d03b7c5f05e1816bef14
Author: Daniel Stender <stender at debian.org>
Date: Sun Nov 5 11:00:32 2017 +0100
New upstream version 3.1.4
---
MANIFEST.in | 5 ++++-
PKG-INFO | 8 +++++++-
README.rst | 5 +++++
setup.py | 4 ++--
src/_csrc/bcrypt_pbkdf.c | 4 ++--
src/_csrc/blf.h | 3 ++-
src/_csrc/pycabcrypt.h | 6 ++++++
src/bcrypt.egg-info/PKG-INFO | 8 +++++++-
src/bcrypt.egg-info/requires.txt | 2 +-
src/bcrypt/__about__.py | 2 +-
src/bcrypt/__init__.py | 2 +-
tox.ini | 6 +++---
12 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
index 200c135..61fe982 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,10 @@ include src/build_bcrypt.py
recursive-include src/_csrc *
recursive-include tests *.py
-exclude requirements.txt tasks.py .travis.yml wheel-scripts
+exclude requirements.txt tasks.py .travis.yml wheel-scripts Jenkinsfile
+
+exclude .jenkins
+recursive-exclude .jenkins *
recursive-exclude wheel-scripts *
diff --git a/PKG-INFO b/PKG-INFO
index 63b372a..8f64a8c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: bcrypt
-Version: 3.1.3
+Version: 3.1.4
Summary: Modern password hashing for your software and your servers
Home-page: https://github.com/pyca/bcrypt/
Author: The Python Cryptographic Authority developers
Author-email: cryptography-dev at python.org
License: Apache License, Version 2.0
+Description-Content-Type: UNKNOWN
Description: bcrypt
======
@@ -45,6 +46,11 @@ Description: bcrypt
Changelog
=========
+ 3.1.4
+ -----
+
+ * Fixed compilation with mingw and on illumos.
+
3.1.3
-----
* Fixed a compilation issue on Solaris.
diff --git a/README.rst b/README.rst
index 7ac19d9..6cba9e5 100644
--- a/README.rst
+++ b/README.rst
@@ -37,6 +37,11 @@ For Fedora and RHEL-derivatives, the following command will ensure that the requ
Changelog
=========
+3.1.4
+-----
+
+* Fixed compilation with mingw and on illumos.
+
3.1.3
-----
* Fixed a compilation issue on Solaris.
diff --git a/setup.py b/setup.py
index 13a98f3..2bbb432 100644
--- a/setup.py
+++ b/setup.py
@@ -206,11 +206,11 @@ setup(
],
extras_require={
"tests": [
- "pytest",
+ "pytest>=3.2.1",
],
},
tests_require=[
- "pytest",
+ "pytest>=3.2.1",
],
package_dir={"": "src"},
diff --git a/src/_csrc/bcrypt_pbkdf.c b/src/_csrc/bcrypt_pbkdf.c
index 453fdaa..306d7e7 100644
--- a/src/_csrc/bcrypt_pbkdf.c
+++ b/src/_csrc/bcrypt_pbkdf.c
@@ -16,12 +16,12 @@
*/
#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
#include "pycabcrypt.h"
-#include <stdlib.h>
#include "blf.h"
#include "sha2.h"
-#include <string.h>
#define MINIMUM(a,b) (((a) < (b)) ? (a) : (b))
diff --git a/src/_csrc/blf.h b/src/_csrc/blf.h
index 82ab948..5f06171 100644
--- a/src/_csrc/blf.h
+++ b/src/_csrc/blf.h
@@ -31,11 +31,12 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "pycabcrypt.h"
#ifndef _BLF_H_
#define _BLF_H_
+#include "pycabcrypt.h"
+
/* Schneier states the maximum key length to be 56 bytes.
* The way how the subkeys are initialized by the key up
* to (N+2)*4 i.e. 72 bytes are utilized.
diff --git a/src/_csrc/pycabcrypt.h b/src/_csrc/pycabcrypt.h
index b71f577..b905459 100644
--- a/src/_csrc/pycabcrypt.h
+++ b/src/_csrc/pycabcrypt.h
@@ -1,3 +1,6 @@
+#ifndef PYCABCRYPT
+#define PYCABCRYPT
+
#include <sys/types.h>
#include <string.h>
#include <stdio.h>
@@ -30,3 +33,6 @@ int bcrypt_hashpass(const char *key, const char *salt, char *encrypted, size_t e
int encode_base64(char *, const u_int8_t *, size_t);
int timingsafe_bcmp(const void *b1, const void *b2, size_t n);
int bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt, size_t saltlen, uint8_t *key, size_t keylen, unsigned int rounds);
+
+#endif
+
diff --git a/src/bcrypt.egg-info/PKG-INFO b/src/bcrypt.egg-info/PKG-INFO
index 63b372a..8f64a8c 100644
--- a/src/bcrypt.egg-info/PKG-INFO
+++ b/src/bcrypt.egg-info/PKG-INFO
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: bcrypt
-Version: 3.1.3
+Version: 3.1.4
Summary: Modern password hashing for your software and your servers
Home-page: https://github.com/pyca/bcrypt/
Author: The Python Cryptographic Authority developers
Author-email: cryptography-dev at python.org
License: Apache License, Version 2.0
+Description-Content-Type: UNKNOWN
Description: bcrypt
======
@@ -45,6 +46,11 @@ Description: bcrypt
Changelog
=========
+ 3.1.4
+ -----
+
+ * Fixed compilation with mingw and on illumos.
+
3.1.3
-----
* Fixed a compilation issue on Solaris.
diff --git a/src/bcrypt.egg-info/requires.txt b/src/bcrypt.egg-info/requires.txt
index f08dc5f..8cc7749 100644
--- a/src/bcrypt.egg-info/requires.txt
+++ b/src/bcrypt.egg-info/requires.txt
@@ -2,4 +2,4 @@ cffi>=1.1
six>=1.4.1
[tests]
-pytest
+pytest>=3.2.1
diff --git a/src/bcrypt/__about__.py b/src/bcrypt/__about__.py
index 1d49d7a..4ddaae5 100644
--- a/src/bcrypt/__about__.py
+++ b/src/bcrypt/__about__.py
@@ -26,7 +26,7 @@ __title__ = "bcrypt"
__summary__ = "Modern password hashing for your software and your servers"
__uri__ = "https://github.com/pyca/bcrypt/"
-__version__ = "3.1.3"
+__version__ = "3.1.4"
__author__ = "The Python Cryptographic Authority developers"
__email__ = "cryptography-dev at python.org"
diff --git a/src/bcrypt/__init__.py b/src/bcrypt/__init__.py
index 9fcb421..ed4d3da 100644
--- a/src/bcrypt/__init__.py
+++ b/src/bcrypt/__init__.py
@@ -33,7 +33,7 @@ from .__about__ import (
__all__ = [
"__title__", "__summary__", "__uri__", "__version__", "__author__",
"__email__", "__license__", "__copyright__",
- "gensalt", "hashpw", "kdf",
+ "gensalt", "hashpw", "kdf", "checkpw",
]
diff --git a/tox.ini b/tox.ini
index 6417ccd..3fb82a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,10 +2,10 @@
envlist = py26,py27,pypy,py33,py34,py35,py36,pep8,py3pep8,packaging
[testenv]
-# If you add a new dep here you probably need to add it in setup.py as well
+extras =
+ tests
deps =
coverage
- pytest
commands =
coverage run -m pytest --strict {posargs}
coverage report -m --fail-under 100
@@ -19,7 +19,7 @@ commands =
flake8 .
[testenv:py3pep8]
-basepython = python3.3
+basepython = python3
deps =
flake8
flake8-import-order
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-bcrypt.git
More information about the Python-modules-commits
mailing list