Disable CRLDistributionPoints for now, its IMPLICIT code in the asn1 parser.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20189 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -51,7 +51,9 @@ struct hx509_ca_tbs {
|
|||||||
time_t notBefore;
|
time_t notBefore;
|
||||||
time_t notAfter;
|
time_t notAfter;
|
||||||
int pathLenConstraint; /* both for CA and Proxy */
|
int pathLenConstraint; /* both for CA and Proxy */
|
||||||
|
#ifdef HAVE_CRLDistributionPoints
|
||||||
CRLDistributionPoints crldp;
|
CRLDistributionPoints crldp;
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
int
|
int
|
||||||
@@ -67,8 +69,10 @@ hx509_ca_tbs_init(hx509_context context, hx509_ca_tbs *tbs)
|
|||||||
(*tbs)->eku.len = 0;
|
(*tbs)->eku.len = 0;
|
||||||
(*tbs)->eku.val = NULL;
|
(*tbs)->eku.val = NULL;
|
||||||
(*tbs)->pathLenConstraint = 0;
|
(*tbs)->pathLenConstraint = 0;
|
||||||
|
#ifdef HAVE_CRLDistributionPoints
|
||||||
(*tbs)->crldp.len = 0;
|
(*tbs)->crldp.len = 0;
|
||||||
(*tbs)->crldp.val = NULL;
|
(*tbs)->crldp.val = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -83,7 +87,9 @@ hx509_ca_tbs_free(hx509_ca_tbs *tbs)
|
|||||||
free_GeneralNames(&(*tbs)->san);
|
free_GeneralNames(&(*tbs)->san);
|
||||||
free_ExtKeyUsage(&(*tbs)->eku);
|
free_ExtKeyUsage(&(*tbs)->eku);
|
||||||
der_free_heim_integer(&(*tbs)->serial);
|
der_free_heim_integer(&(*tbs)->serial);
|
||||||
|
#ifdef HAVE_CRLDistributionPoints
|
||||||
free_CRLDistributionPoints(&(*tbs)->crldp);
|
free_CRLDistributionPoints(&(*tbs)->crldp);
|
||||||
|
#endif
|
||||||
|
|
||||||
hx509_name_free(&(*tbs)->subject);
|
hx509_name_free(&(*tbs)->subject);
|
||||||
|
|
||||||
@@ -282,6 +288,7 @@ hx509_ca_tbs_add_crl_dp_uri(hx509_context context,
|
|||||||
const char *uri,
|
const char *uri,
|
||||||
hx509_name issuername)
|
hx509_name issuername)
|
||||||
{
|
{
|
||||||
|
#ifdef HAVE_CRLDistributionPoints
|
||||||
GeneralNames crlissuer;
|
GeneralNames crlissuer;
|
||||||
DistributionPoint dp;
|
DistributionPoint dp;
|
||||||
DistributionPointName name;
|
DistributionPointName name;
|
||||||
@@ -341,6 +348,11 @@ out:
|
|||||||
free_DistributionPointName(&name);
|
free_DistributionPointName(&name);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
#else
|
||||||
|
hx509_set_error_string(context, 0, EINVAL,
|
||||||
|
"CRLDistributionPoints not yet supported");
|
||||||
|
return EINVAL;
|
||||||
|
#endif /* HAVE_CRLDistributionPoints */
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@@ -942,6 +954,7 @@ ca_sign(hx509_context context,
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_CRLDistributionPoints
|
||||||
if (tbs->crldp.len) {
|
if (tbs->crldp.len) {
|
||||||
|
|
||||||
ASN1_MALLOC_ENCODE(CRLDistributionPoints, data.data, data.length,
|
ASN1_MALLOC_ENCODE(CRLDistributionPoints, data.data, data.length,
|
||||||
@@ -959,6 +972,7 @@ ca_sign(hx509_context context,
|
|||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
ASN1_MALLOC_ENCODE(TBSCertificate, data.data, data.length,tbsc, &size, ret);
|
ASN1_MALLOC_ENCODE(TBSCertificate, data.data, data.length,tbsc, &size, ret);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
Reference in New Issue
Block a user