Move more comments that confuse indent

[openssl.git] / apps / ca.c

diff --git a/apps/ca.c b/apps/ca.c
index 0cb498b9d967fd348ec83b7442e337ae2cbb07e0..b1311d6b196b342d7ebcee812ca4e115910dff2d 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -655,7 +655,7 @@ bad:
                        oid_bio=BIO_new_file(p,"r");
                        if (oid_bio == NULL) 
                                {
-                               /*
+                               /*-
                                BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);
                                ERR_print_errors(bio_err);
                                */
@@ -709,7 +709,7 @@ bad:
                ERR_clear_error();
 #ifdef RL_DEBUG
        if (!p)
-               BIO_printf(bio_err, "DEBUG: unique_subject undefined\n", p);
+               BIO_printf(bio_err, "DEBUG: unique_subject undefined\n");
 #endif
 #ifdef RL_DEBUG
        BIO_printf(bio_err, "DEBUG: configured unique_subject is %d\n",
@@ -1497,7 +1497,8 @@ bad:
                        }
 
                
-               if (crlnumberfile != NULL)      /* we have a CRL number that need updating */
+               /* we have a CRL number that need updating */
+               if (crlnumberfile != NULL)
                        if (!save_serial(crlnumberfile,"new",crlnumber,NULL)) goto err;
 
                if (crlnumber)
@@ -1628,12 +1629,14 @@ static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
                {
                ok=0;
                BIO_printf(bio_err,"Signature verification problems....\n");
+               ERR_print_errors(bio_err);
                goto err;
                }
        if (i == 0)
                {
                ok=0;
                BIO_printf(bio_err,"Signature did not match the certificate request\n");
+               ERR_print_errors(bio_err);
                goto err;
                }
        else
@@ -2052,7 +2055,13 @@ again2:
 
        if (enddate == NULL)
                X509_time_adj_ex(X509_get_notAfter(ret),days, 0, NULL);
-       else ASN1_TIME_set_string(X509_get_notAfter(ret),enddate);
+       else
+               {
+               int tdays;
+               ASN1_TIME_set_string(X509_get_notAfter(ret),enddate);
+               ASN1_TIME_diff(&tdays, NULL, NULL, X509_get_notAfter(ret));
+               days = tdays;
+               }
 
        if (!X509_set_subject_name(ret,subject)) goto err;
 
@@ -2794,6 +2803,9 @@ char *make_revocation_str(int rev_type, char *rev_arg)
 
        revtm = X509_gmtime_adj(NULL, 0);
 
+       if (!revtm)
+               return NULL;
+
        i = revtm->length + 1;
 
        if (reason) i += strlen(reason) + 1;
@@ -2818,7 +2830,8 @@ char *make_revocation_str(int rev_type, char *rev_arg)
        return str;
        }
 
-/* Convert revocation field to X509_REVOKED entry 
+/*-
+ * Convert revocation field to X509_REVOKED entry 
  * return code:
  * 0 error
  * 1 OK