From 07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d Mon Sep 17 00:00:00 2001 From: tedu <> Date: Fri, 18 Apr 2014 00:10:08 +0000 Subject: putting most of the braces in the right column is the very least we can do. --- src/lib/libcrypto/asn1/a_time.c | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/lib/libcrypto/asn1/a_time.c') diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c index 4ade88f065..3461660b5f 100644 --- a/src/lib/libcrypto/asn1/a_time.c +++ b/src/lib/libcrypto/asn1/a_time.c @@ -73,55 +73,55 @@ IMPLEMENT_ASN1_FUNCTIONS(ASN1_TIME) #if 0 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); return -1; - } +} #endif 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) - { +{ struct tm *ts; struct tm data; ts=OPENSSL_gmtime(&t,&data); if (ts == NULL) - { + { ASN1err(ASN1_F_ASN1_TIME_ADJ, ASN1_R_ERROR_GETTING_TIME); return NULL; - } + } 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); return ASN1_GENERALIZEDTIME_adj(s, t, offset_day, offset_sec); - } +} int ASN1_TIME_check(ASN1_TIME *t) - { +{ if (t->type == V_ASN1_GENERALIZEDTIME) return ASN1_GENERALIZEDTIME_check(t); else if (t->type == V_ASN1_UTCTIME) return ASN1_UTCTIME_check(t); return 0; - } +} /* Convert an ASN1_TIME structure to GeneralizedTime */ ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out) - { +{ ASN1_GENERALIZEDTIME *ret; char *str; int newlen; @@ -129,20 +129,20 @@ ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZE 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 already GeneralizedTime just copy across */ if (t->type == V_ASN1_GENERALIZEDTIME) - { + { if(!ASN1_STRING_set(ret, t->data, t->length)) return NULL; return ret; - } + } /* grow the string */ if (!ASN1_STRING_set(ret, NULL, t->length + 2)) @@ -157,10 +157,10 @@ ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZE BUF_strlcat(str, (char *)t->data, newlen); return ret; - } +} int ASN1_TIME_set_string(ASN1_TIME *s, const char *str) - { +{ ASN1_TIME t; t.length = strlen(str); @@ -170,14 +170,14 @@ int ASN1_TIME_set_string(ASN1_TIME *s, const char *str) t.type = V_ASN1_UTCTIME; if (!ASN1_TIME_check(&t)) - { + { t.type = V_ASN1_GENERALIZEDTIME; if (!ASN1_TIME_check(&t)) return 0; - } + } if (s && !ASN1_STRING_copy((ASN1_STRING *)s, (ASN1_STRING *)&t)) return 0; return 1; - } +} -- cgit v1.2.3-55-g6feb