diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 04:58:08 +0100 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 04:58:08 +0100 |
| commit | 6343829a391df59e46e513c84b6264ee71ad9518 (patch) | |
| tree | 9823103bf5828e47081ac906203516bdc332f577 /crypto/evp/evp_key.c | |
| parent | Tolerate -----BEGIN PKCS #7 SIGNED DATA----- header lines as used by some (diff) | |
| download | openssl-6343829a391df59e46e513c84b6264ee71ad9518.tar.xz openssl-6343829a391df59e46e513c84b6264ee71ad9518.zip | |
Revert the size_t modifications from HEAD that had led to more
knock-on work than expected - they've been extracted into a patch
series that can be completed elsewhere, or in a different branch,
before merging back to HEAD.
Diffstat (limited to 'crypto/evp/evp_key.c')
| -rw-r--r-- | crypto/evp/evp_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c index 898ff6f1e5..361ea69ab6 100644 --- a/crypto/evp/evp_key.c +++ b/crypto/evp/evp_key.c @@ -108,7 +108,7 @@ int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) } int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, - const unsigned char *salt, const unsigned char *data, size_t datal, + const unsigned char *salt, const unsigned char *data, int datal, int count, unsigned char *key, unsigned char *iv) { EVP_MD_CTX c; |