← Back to branch summary

~ubuntu-branches/ubuntu/maverick/openssl/maverick

« back to all changes in this revision

Viewing changes to crypto/evp/p5_crpt2.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2006-05-15 16:00:58 UTC
  • mto: (11.1.1 lenny)
  • mto: This revision was merged to the branch mainline in revision 6.
  • Revision ID: james.westby@ubuntu.com-20060515160058-pg6lnbkkpkwpdj2e
Tags: upstream-0.9.8b
Import upstream version 0.9.8b

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/evp/p5_crpt2.c
201
201
 
202
202
        /* Now decode key derivation function */
203
203
 
 
204
        if(!pbe2->keyfunc->parameter ||
 
205
                 (pbe2->keyfunc->parameter->type != V_ASN1_SEQUENCE))
 
206
                {
 
207
                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
 
208
                goto err;
 
209
                }
 
210
 
204
211
        pbuf = pbe2->keyfunc->parameter->value.sequence->data;
205
212
        plen = pbe2->keyfunc->parameter->value.sequence->length;
206
 
        if(!pbe2->keyfunc->parameter ||
207
 
                 (pbe2->keyfunc->parameter->type != V_ASN1_SEQUENCE) ||
208
 
                                !(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen)) ) {
 
213
        if(!(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen)) ) {
209
214
                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
210
215
                goto err;
211
216
        }