summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-05-17 18:25:59 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-05-17 18:25:59 +0000
commit83231cb376ca275f99adc237be3080fe4e06fb88 (patch)
tree9c4024e6f09c2334893da590b773f78f99a8d5b2 /apps
parent986ad56124466ba4542e817a2d47354af25650d3 (diff)
downloadopenssl-83231cb376ca275f99adc237be3080fe4e06fb88.tar.gz
Fix from HEAD.
Diffstat (limited to 'apps')
-rw-r--r--apps/pkcs12.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index c22c00fce1..5205002041 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -825,12 +825,14 @@ int alg_print (BIO *x, X509_ALGOR *alg)
PBEPARAM *pbe;
const unsigned char *p;
p = alg->parameter->value.sequence->data;
- pbe = d2i_PBEPARAM (NULL, &p, alg->parameter->value.sequence->length);
+ pbe = d2i_PBEPARAM(NULL, &p, alg->parameter->value.sequence->length);
+ if (!pbe)
+ return 1;
BIO_printf (bio_err, "%s, Iteration %ld\n",
OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)),
ASN1_INTEGER_get(pbe->iter));
PBEPARAM_free (pbe);
- return 0;
+ return 1;
}
/* Load all certificates from a given file */