Ok, propose a release date of March 15th with a code freeze a few days before

[openssl.git] / apps / req.c

diff --git a/apps/req.c b/apps/req.c
index 523139ecda528c456e3ead0b629249be5ebef9b2..b2c1bb2578920ad1f401f6a93ec41af04ab3c525 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -335,7 +335,7 @@ bad:
                BIO_printf(bio_err,"where options  are\n");
                BIO_printf(bio_err," -inform arg    input format - one of DER TXT PEM\n");
                BIO_printf(bio_err," -outform arg   output format - one of DER TXT PEM\n");
-               BIO_printf(bio_err," -in arg        inout file\n");
+               BIO_printf(bio_err," -in arg        input file\n");
                BIO_printf(bio_err," -out arg       output file\n");
                BIO_printf(bio_err," -text          text form of request\n");
                BIO_printf(bio_err," -noout         do not output REQ\n");
@@ -349,7 +349,7 @@ bad:
                BIO_printf(bio_err," -newkey dsa:file generate a new DSA key, parameters taken from CA in 'file'\n");
 
                BIO_printf(bio_err," -[digest]      Digest to sign with (md5, sha1, md2, mdc2)\n");
-               BIO_printf(bio_err," -config file   request templace file.\n");
+               BIO_printf(bio_err," -config file   request template file.\n");
                BIO_printf(bio_err," -new           new request.\n");
                BIO_printf(bio_err," -x509          output a x509 structure instead of a cert. req.\n");
                BIO_printf(bio_err," -days          number of days a x509 generated by -x509 is valid for.\n");
@@ -657,10 +657,18 @@ loop:
                        ext_ctx.issuer_cert = x509ss;
                        ext_ctx.subject_cert = x509ss;
                        ext_ctx.subject_req = NULL;
+                       ext_ctx.crl = NULL;
+                       ext_ctx.flags = 0;
 
                        /* Add extensions */
                        if(extensions && !X509V3_EXT_add_conf(req_conf, 
-                                       &ext_ctx, extensions, x509ss)) goto end;
+                                       &ext_ctx, extensions, x509ss))
+                           {
+                           BIO_printf(bio_err,
+                                      "Error Loading extension section %s\n",
+                                      extensions);
+                           goto end;
+                           }
 
                        if (!(i=X509_sign(x509ss,pkey,digest)))
                                goto end;