diff options
| author | beck <> | 2002-05-21 01:49:11 +0000 |
|---|---|---|
| committer | beck <> | 2002-05-21 01:49:11 +0000 |
| commit | 7ebf0f8371844decf17c65829147760ed09339a6 (patch) | |
| tree | b39f86312e7ebfd4945e393b8949356694ad06fe /src/lib/libcrypto/asn1 | |
| parent | 2117eaece54016b776476220b41b97441e75b0e0 (diff) | |
| download | openbsd-7ebf0f8371844decf17c65829147760ed09339a6.tar.gz openbsd-7ebf0f8371844decf17c65829147760ed09339a6.tar.bz2 openbsd-7ebf0f8371844decf17c65829147760ed09339a6.zip | |
Merge openssl-0.9.7-stable-SNAP-20020519
Diffstat (limited to 'src/lib/libcrypto/asn1')
| -rw-r--r-- | src/lib/libcrypto/asn1/p5_pbev2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c index 43dfe09479..91e1c8987d 100644 --- a/src/lib/libcrypto/asn1/p5_pbev2.c +++ b/src/lib/libcrypto/asn1/p5_pbev2.c | |||
| @@ -116,6 +116,8 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, | |||
| 116 | if (RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0) | 116 | if (RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0) |
| 117 | goto err; | 117 | goto err; |
| 118 | 118 | ||
| 119 | EVP_CIPHER_CTX_init(&ctx); | ||
| 120 | |||
| 119 | /* Dummy cipherinit to just setup the IV */ | 121 | /* Dummy cipherinit to just setup the IV */ |
| 120 | EVP_CipherInit_ex(&ctx, cipher, NULL, NULL, iv, 0); | 122 | EVP_CipherInit_ex(&ctx, cipher, NULL, NULL, iv, 0); |
| 121 | if(EVP_CIPHER_param_to_asn1(&ctx, scheme->parameter) < 0) { | 123 | if(EVP_CIPHER_param_to_asn1(&ctx, scheme->parameter) < 0) { |