fixup! apps: ca,req,x509: Add explicit start and end dates options

apps: Fix formatting Signed-off-by: Stephan Wurm <atomisirsi@gsklan.de>
openssl · Apr 4, 2024 · 7be6702 · 7be6702
1 parent ba18108
commit 7be6702
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/apps/ca.c b/apps/ca.c
@@ -889,10 +889,9 @@ int ca_main(int argc, char **argv)
             BIO_printf(bio_err, "cannot lookup how many days to certify for\n");
             goto end;
         }
-        if (days != 0 && enddate != NULL) {
+        if (days != 0 && enddate != NULL)
             BIO_printf(bio_err,
-                    "Warning: -enddate or -not_after option overriding -days option\n");
-        }
+                       "Warning: -enddate or -not_after option overriding -days option\n");
 
         if (rand_ser) {
             if ((serial = BN_new()) == NULL || !rand_serial(serial, NULL)) {

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
@@ -3281,8 +3281,8 @@ int check_cert_time_string(const char *time, const char *desc)
             || ASN1_TIME_set_string_X509(NULL, time))
         return 1;
     BIO_printf(bio_err,
-            "%s is invalid, it should be \"today\" or have format [CC]YYMMDDHHMMSSZ\n",
-            desc);
+               "%s is invalid, it should be \"today\" or have format [CC]YYMMDDHHMMSSZ\n",
+               desc);
     return 0;
 }
 
@@ -3319,7 +3319,7 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate,
     }
     if (ASN1_TIME_compare(X509_get0_notAfter(x), X509_get0_notBefore(x)) < 0) {
         BIO_printf(bio_err, "%s: end date before start date\n",
-                strict_compare_times ? "Error" : "Warning");
+                   strict_compare_times ? "Error" : "Warning");
         if (strict_compare_times)
             return 0;
     }

diff --git a/apps/req.c b/apps/req.c
@@ -817,9 +817,9 @@ int req_main(int argc, char **argv)
 
             if (!X509_set_issuer_name(new_x509, issuer))
                 goto end;
-            if (days == UNSET_DAYS) {
+            if (days == UNSET_DAYS)
                 days = DEFAULT_DAYS;
-            } else if (not_after != NULL)
+            else if (not_after != NULL)
                 BIO_printf(bio_err,"Warning: -not_after option overriding -days option\n");
             if (!set_cert_times(new_x509, not_before, not_after, days, 1))
                 goto end;

diff --git a/apps/x509.c b/apps/x509.c
@@ -633,9 +633,9 @@ int x509_main(int argc, char **argv)
         BIO_printf(bio_err, "Cannot use -preserve_dates with -days option\n");
         goto err;
     }
-    if (days == UNSET_DAYS) {
+    if (days == UNSET_DAYS)
         days = DEFAULT_DAYS;
-    } else if (not_after != NULL)
+    else if (not_after != NULL)
         BIO_printf(bio_err, "Warning: -not_after option overriding -days option\n");
 
     if (!app_passwd(passinarg, NULL, &passin, NULL)) {