Check for FindNextFile when defining it rather than FindFirstFile

[oweals/openssl.git] / crypto / asn1 / a_time.c

diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index 0d618873c76ce5745b7c4210af6c4d9a70f3b6aa..d7925bf80ab53bafcd6c0513c6e3980c4fc57c93 100644 (file)
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -66,6 +66,7 @@
 #include "cryptlib.h"
 #include "o_time.h"
 #include <openssl/asn1t.h>
+#include "asn1_locl.h"
 
 IMPLEMENT_ASN1_MSTRING(ASN1_TIME, B_ASN1_TIME)
 
@@ -112,7 +113,7 @@ ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t,
        ts=OPENSSL_gmtime(&t,&data);
        if (ts == NULL)
                {
-               ASN1err(ASN1_F_ASN1_TIME_SET, ASN1_R_ERROR_GETTING_TIME);
+               ASN1err(ASN1_F_ASN1_TIME_ADJ, ASN1_R_ERROR_GETTING_TIME);
                return NULL;
                }
        if (offset_day || offset_sec)
@@ -135,12 +136,11 @@ 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;
-       size_t newlen;
+       int newlen;
 
        if (!ASN1_TIME_check(t)) return NULL;
 
@@ -174,3 +174,56 @@ ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t,
 
        return ret;
        }
+
+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))
+               {
+               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;
+       }
+
+static int asn1_time_to_tm(struct tm *tm, const ASN1_TIME *t)
+       {
+       if (t == NULL)
+               {
+               time_t now_t;
+               time(&now_t);
+               if (OPENSSL_gmtime(&now_t, tm))
+                       return 1;
+               return 0;
+               }
+               
+       if (t->type == V_ASN1_UTCTIME)
+               return asn1_utctime_to_tm(tm, t);
+       else if (t->type == V_ASN1_GENERALIZEDTIME)
+               return asn1_generalizedtime_to_tm(tm, t);
+
+       return 0;
+       }
+
+int ASN1_TIME_diff(int *pday, int *psec,
+                       const ASN1_TIME *from, const ASN1_TIME *to)
+       {
+       struct tm tm_from, tm_to;
+       if (!asn1_time_to_tm(&tm_from, from))
+               return 0;
+       if (!asn1_time_to_tm(&tm_to, to))
+               return 0;
+       return OPENSSL_gmtime_diff(pday, psec, &tm_from, &tm_to);
+       }