diff options
| author | Damien Miller <djm@mindrot.org> | 2013-07-29 22:19:16 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-07-29 22:19:16 +1000 |
| commit | 5c27645fd36e792752938d3ed185e76bd8def296 (patch) | |
| tree | 82955bc164627239ef9390d219a59dbf58226048 | |
| parent | fc240313d5a10d1e34858da866eb7a4574b1fd1c (diff) | |
| download | py-bcrypt-5c27645fd36e792752938d3ed185e76bd8def296.tar.gz | |
fix -Wpointer-sign warnings
| -rw-r--r-- | bcrypt/bcrypt_pbkdf.c | 2 | ||||
| -rw-r--r-- | bcrypt/bcrypt_python.c | 2 | ||||
| -rw-r--r-- | bcrypt/pybc_blf.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bcrypt/bcrypt_pbkdf.c b/bcrypt/bcrypt_pbkdf.c index c41d5a6..fe9403f 100644 --- a/bcrypt/bcrypt_pbkdf.c +++ b/bcrypt/bcrypt_pbkdf.c @@ -91,7 +91,7 @@ bcrypt_hash(u_int8_t *sha2pass, u_int8_t *sha2salt, u_int8_t *out) } int -bcrypt_pbkdf(const char *pass, size_t passlen, const u_int8_t *salt, size_t saltlen, +bcrypt_pbkdf(const u_int8_t *pass, size_t passlen, const u_int8_t *salt, size_t saltlen, u_int8_t *key, size_t keylen, unsigned int rounds) { PYBC_SHA2_CTX ctx; diff --git a/bcrypt/bcrypt_python.c b/bcrypt/bcrypt_python.c index fd59bbb..1c141e2 100644 --- a/bcrypt/bcrypt_python.c +++ b/bcrypt/bcrypt_python.c @@ -280,7 +280,7 @@ bcrypt_kdf(PyObject *self, PyObject *args, PyObject *kw_args) if (ret != 0) PyErr_SetString(PyExc_ValueError, "kdf failed"); else - o = PyBytes_FromStringAndSize(key, desired_key_bytes); + o = PyBytes_FromStringAndSize((char *)key, desired_key_bytes); bzero(key, desired_key_bytes); free(key); return o; diff --git a/bcrypt/pybc_blf.h b/bcrypt/pybc_blf.h index 28ca2e4..d890e4d 100644 --- a/bcrypt/pybc_blf.h +++ b/bcrypt/pybc_blf.h @@ -83,7 +83,7 @@ void pybc_blf_enc(pybc_blf_ctx *, u_int32_t *, u_int16_t); u_int32_t pybc_Blowfish_stream2word(const u_int8_t *, u_int16_t, u_int16_t *); /* KDF interface */ -int bcrypt_pbkdf(const char *pass, size_t passlen, +int bcrypt_pbkdf(const u_int8_t *pass, size_t passlen, const u_int8_t *salt, size_t saltlen, u_int8_t *key, size_t keylen, unsigned int rounds); |