diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-06-08 00:09:51 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-06-08 00:09:51 +0000 |
| commit | 8eb57af5fed7a133cdb2a968081c355249c00b98 (patch) | |
| tree | 90c43c1df2e1c3ef81f4c6f4643ba8b561830aad /crypto/asn1/p5_pbev2.c | |
| parent | 1aad3392e531aa9d32583b435ba4f0b296ee4d27 (diff) | |
Complete support for PKCS#5 v2.0. Still needs extensive testing.
Diffstat (limited to 'crypto/asn1/p5_pbev2.c')
| -rw-r--r-- | crypto/asn1/p5_pbev2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c index 51e587e923..10364a0561 100644 --- a/crypto/asn1/p5_pbev2.c +++ b/crypto/asn1/p5_pbev2.c @@ -153,7 +153,7 @@ PBKDF2PARAM *d2i_PBKDF2PARAM(PBKDF2PARAM **a, unsigned char **pp, void PBKDF2PARAM_free (PBKDF2PARAM *a) { if(a==NULL) return; - ASN1_OCTET_STRING_free(a->salt); + ASN1_TYPE_free(a->salt); ASN1_INTEGER_free(a->iter); ASN1_INTEGER_free(a->keylength); X509_ALGOR_free(a->prf); @@ -164,8 +164,8 @@ void PBKDF2PARAM_free (PBKDF2PARAM *a) * yes I know this is horrible! */ -X509_ALGOR *PKCS5_pbe2_set(EVP_CIPHER *cipher, int iter, unsigned char *salt, - int saltlen) +X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, + unsigned char *salt, int saltlen) { X509_ALGOR *scheme = NULL, *kalg = NULL, *ret = NULL; int alg_nid; |