diff options
| author | Christian Heimes <christian@cheimes.de> | 2013-10-21 09:59:34 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2013-10-21 09:59:34 (GMT) |
| commit | 3ac1eb16d5c4b779da38895597ee5d7caf3d22bd (patch) | |
| tree | 7f586dd3206025c84d537890950e7cd4aeb3856c | |
| parent | a3fdcaa5d6b5c0f07548a66c5d603f802059988b (diff) | |
| parent | c6564b9474fb3250db80f44784b1e79f330953a9 (diff) | |
| download | cpython-3ac1eb16d5c4b779da38895597ee5d7caf3d22bd.zip cpython-3ac1eb16d5c4b779da38895597ee5d7caf3d22bd.tar.gz cpython-3ac1eb16d5c4b779da38895597ee5d7caf3d22bd.tar.bz2 | |
merge
| -rw-r--r-- | Modules/_hashopenssl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 3f796c3..d715500 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -513,10 +513,11 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict) * 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; |