Give CRLDP its standard name.

Max req -x509 use V1 if extensions section absent.

diff --git a/apps/req.c b/apps/req.c
index 5f6ec3d33914072978595169d5f0ba880d5e5c2a..a657eaa50b7e513e23cd767825adf9e5f5390283 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -824,7 +824,7 @@ loop:
                        if ((x509ss=X509_new()) == NULL) goto end;
 
                        /* Set version to V3 */
-                       if(!X509_set_version(x509ss, 2)) goto end;
+                       if(extensions && !X509_set_version(x509ss, 2)) goto end;
                        if (serial)
                                {
                                if (!X509_set_serialNumber(x509ss, serial)) goto end;

diff --git a/crypto/x509v3/v3_crld.c b/crypto/x509v3/v3_crld.c
index 894a8b94d802ded8b59bca39bd548631d524cb1a..f90829c574e7f96579f06ee5811e7b052ebc6cd5 100644 (file)
--- a/crypto/x509v3/v3_crld.c
+++ b/crypto/x509v3/v3_crld.c
@@ -156,7 +156,7 @@ ASN1_SEQUENCE(DIST_POINT) = {
 IMPLEMENT_ASN1_FUNCTIONS(DIST_POINT)
 
 ASN1_ITEM_TEMPLATE(CRL_DIST_POINTS) = 
-       ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, DIST_POINT, DIST_POINT)
+       ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, CRLDistributionPoints, DIST_POINT)
 ASN1_ITEM_TEMPLATE_END(CRL_DIST_POINTS)
 
 IMPLEMENT_ASN1_FUNCTIONS(CRL_DIST_POINTS)