1 files changed, 35 insertions, 28 deletions

diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c
index 1978e8d3dc..29d56b827a 100644
--- a/src/lib/libcrypto/asn1/a_time.c
+++ b/src/lib/libcrypto/asn1/a_time.c
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -72,43 +72,45 @@ IMPLEMENT_ASN1_MSTRING(ASN1_TIME, B_ASN1_TIME)
 IMPLEMENT_ASN1_FUNCTIONS(ASN1_TIME)
 
 #if 0
-int i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **pp)
+int
+i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **pp)
 {
-        if(a->type == V_ASN1_UTCTIME || a->type == V_ASN1_GENERALIZEDTIME)
-                                return(i2d_ASN1_bytes((ASN1_STRING *)a,pp,
-                                     a->type ,V_ASN1_UNIVERSAL));
-        ASN1err(ASN1_F_I2D_ASN1_TIME,ASN1_R_EXPECTING_A_TIME);
+        if (a->type == V_ASN1_UTCTIME || a->type == V_ASN1_GENERALIZEDTIME)
+                return(i2d_ASN1_bytes((ASN1_STRING *)a, pp,
+                    a->type, V_ASN1_UNIVERSAL));
+        ASN1err(ASN1_F_I2D_ASN1_TIME, ASN1_R_EXPECTING_A_TIME);
         return -1;
 }
 #endif
 
-
-ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t)
+ASN1_TIME *
+ASN1_TIME_set(ASN1_TIME *s, time_t t)
 {
         return ASN1_TIME_adj(s, t, 0, 0);
 }
 
-ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t,
-                                int offset_day, long offset_sec)
+ASN1_TIME *
+ASN1_TIME_adj(ASN1_TIME *s, time_t t, int offset_day, long offset_sec)
 {
         struct tm *ts;
         struct tm data;
 
-        ts=gmtime_r(&t,&data);
+        ts = gmtime_r(&t, &data);
         if (ts == NULL) {
                 ASN1err(ASN1_F_ASN1_TIME_ADJ, ASN1_R_ERROR_GETTING_TIME);
                 return NULL;
         }
-        if (offset_day || offset_sec) { 
+        if (offset_day || offset_sec) {
                 if (!OPENSSL_gmtime_adj(ts, offset_day, offset_sec))
                         return NULL;
         }
-        if((ts->tm_year >= 50) && (ts->tm_year < 150))
-                        return ASN1_UTCTIME_adj(s, t, offset_day, offset_sec);
+        if ((ts->tm_year >= 50) && (ts->tm_year < 150))
+                return ASN1_UTCTIME_adj(s, t, offset_day, offset_sec);
         return ASN1_GENERALIZEDTIME_adj(s, t, offset_day, offset_sec);
 }
 
-int ASN1_TIME_check(ASN1_TIME *t)
+int
+ASN1_TIME_check(ASN1_TIME *t)
 {
         if (t->type == V_ASN1_GENERALIZEDTIME)
                 return ASN1_GENERALIZEDTIME_check(t);
@@ -118,24 +120,27 @@ int ASN1_TIME_check(ASN1_TIME *t)
 }
 
 /* Convert an ASN1_TIME structure to GeneralizedTime */
-ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out)
+ASN1_GENERALIZEDTIME *
+ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out)
 {
         ASN1_GENERALIZEDTIME *ret;
         char *str;
         int newlen;
 
-        if (!ASN1_TIME_check(t)) return NULL;
+        if (!ASN1_TIME_check(t))
+                return NULL;
 
         if (!out || !*out) {
                 if (!(ret = ASN1_GENERALIZEDTIME_new ()))
                         return NULL;
-                if (out) *out = ret;
-        }
-        else ret = *out;
+                if (out)
+                        *out = ret;
+        } else
+                ret = *out;
 
         /* If already GeneralizedTime just copy across */
         if (t->type == V_ASN1_GENERALIZEDTIME) {
-                if(!ASN1_STRING_set(ret, t->data, t->length))
+                if (!ASN1_STRING_set(ret, t->data, t->length))
                         return NULL;
                 return ret;
         }
@@ -147,22 +152,24 @@ ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZE
         newlen = t->length + 2 + 1;
         str = (char *)ret->data;
         /* Work out the century and prepend */
-        if (t->data[0] >= '5') strlcpy(str, "19", newlen);
-        else strlcpy(str, "20", newlen);
-
+        if (t->data[0] >= '5')
+                strlcpy(str, "19", newlen);
+        else
+                strlcpy(str, "20", newlen);
         strlcat(str, (char *)t->data, newlen);
 
         return ret;
 }
 
-int ASN1_TIME_set_string(ASN1_TIME *s, const char *str)
+int
+ASN1_TIME_set_string(ASN1_TIME *s, const char *str)
 {
         ASN1_TIME t;
 
         t.length = strlen(str);
         t.data = (unsigned char *)str;
         t.flags = 0;
-        
+
         t.type = V_ASN1_UTCTIME;
 
         if (!ASN1_TIME_check(&t)) {
@@ -170,9 +177,9 @@ int ASN1_TIME_set_string(ASN1_TIME *s, const char *str)
                 if (!ASN1_TIME_check(&t))
                         return 0;
         }
-        
+
         if (s && !ASN1_STRING_copy((ASN1_STRING *)s, (ASN1_STRING *)&t))
-                        return 0;
+                return 0;
 
         return 1;
 }