(cert2epi): don't include subject if its null

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17368 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-30 07:36:27 +00:00
parent 832c728396
commit fa7b5da860

View File

@@ -177,20 +177,25 @@ cert2epi(hx509_context context, void *ctx, hx509_cert c)
if (ret) if (ret)
return ret; return ret;
id.subjectName = calloc(1, sizeof(*id.subjectName)); if (hx509_name_is_null_p(subject) != 0) {
if (id.subjectName == NULL) {
hx509_name_free(&subject); id.subjectName = calloc(1, sizeof(*id.subjectName));
free_ExternalPrincipalIdentifier(&id); if (id.subjectName == NULL) {
return ENOMEM; hx509_name_free(&subject);
} free_ExternalPrincipalIdentifier(&id);
return ENOMEM;
}
ret = hx509_name_to_der_name(subject, &id.subjectName->data, ret = hx509_name_to_der_name(subject, &id.subjectName->data,
&id.subjectName->length); &id.subjectName->length);
hx509_name_free(&subject); if (ret) {
if (ret) { hx509_name_free(&subject);
free_ExternalPrincipalIdentifier(&id); free_ExternalPrincipalIdentifier(&id);
return ret; return ret;
}
} }
hx509_name_free(&subject);
id.issuerAndSerialNumber = calloc(1, sizeof(*id.issuerAndSerialNumber)); id.issuerAndSerialNumber = calloc(1, sizeof(*id.issuerAndSerialNumber));
if (id.issuerAndSerialNumber == NULL) { if (id.issuerAndSerialNumber == NULL) {