[Python-checkins] cpython (merge default -> default): merge
christian.heimes
python-checkins at python.org
Mon Oct 21 11:59:49 CEST 2013
http://hg.python.org/cpython/rev/bdca806a0649
changeset: 86545:bdca806a0649
parent: 86543:1f466354a85b
parent: 86544:7f4e0c869c2e
user: Christian Heimes <christian at cheimes.de>
date: Mon Oct 21 11:59:34 2013 +0200
summary:
merge
files:
Modules/_hashopenssl.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -513,10 +513,11 @@
* Also OpenSSL < 1.0 don't provide PKCS5_PBKDF2_HMAC(), only
* PKCS5_PBKDF2_SHA1.
*/
-int PKCS5_PBKDF2_HMAC_fast(const char *pass, int passlen,
- const unsigned char *salt, int saltlen,
- int iter, const EVP_MD *digest,
- int keylen, unsigned char *out)
+static int
+PKCS5_PBKDF2_HMAC_fast(const char *pass, int passlen,
+ const unsigned char *salt, int saltlen,
+ int iter, const EVP_MD *digest,
+ int keylen, unsigned char *out)
{
unsigned char digtmp[EVP_MAX_MD_SIZE], *p, itmp[4];
int cplen, j, k, tkeylen, mdlen;
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list