diff options
| author | beck <> | 2000-12-15 02:58:47 +0000 |
|---|---|---|
| committer | beck <> | 2000-12-15 02:58:47 +0000 |
| commit | 9200bb13d15da4b2a23e6bc92c20e95b74aa2113 (patch) | |
| tree | 5c52d628ec1e34be76e7ef2a4235d248b7c44d24 /src/lib/libcrypto/evp/evp_key.c | |
| parent | e131d25072e3d4197ba4b9bcc0d1b27d34d6488d (diff) | |
| download | openbsd-9200bb13d15da4b2a23e6bc92c20e95b74aa2113.tar.gz openbsd-9200bb13d15da4b2a23e6bc92c20e95b74aa2113.tar.bz2 openbsd-9200bb13d15da4b2a23e6bc92c20e95b74aa2113.zip | |
openssl-engine-0.9.6 merge
Diffstat (limited to 'src/lib/libcrypto/evp/evp_key.c')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c index 667c21cca8..09b72bf4bd 100644 --- a/src/lib/libcrypto/evp/evp_key.c +++ b/src/lib/libcrypto/evp/evp_key.c | |||
| @@ -116,7 +116,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, unsigned char *salt, | |||
| 116 | EVP_DigestUpdate(&c,&(md_buf[0]),mds); | 116 | EVP_DigestUpdate(&c,&(md_buf[0]),mds); |
| 117 | EVP_DigestUpdate(&c,data,datal); | 117 | EVP_DigestUpdate(&c,data,datal); |
| 118 | if (salt != NULL) | 118 | if (salt != NULL) |
| 119 | EVP_DigestUpdate(&c,salt,8); | 119 | EVP_DigestUpdate(&c,salt,PKCS5_SALT_LEN); |
| 120 | EVP_DigestFinal(&c,&(md_buf[0]),&mds); | 120 | EVP_DigestFinal(&c,&(md_buf[0]),&mds); |
| 121 | 121 | ||
| 122 | for (i=1; i<(unsigned int)count; i++) | 122 | for (i=1; i<(unsigned int)count; i++) |