Commit 1c036c64 authored by Todd Short's avatar Todd Short Committed by Matt Caswell
Browse files

Fix #340: Parse ASN1_TIME to struct tm 



This works with ASN1_UTCTIME and ASN1_GENERALIZED_TIME

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3378)
parent 95dd5fb2

crypto/asn1/a_time.c

+15 −8
Original line number Diff line number Diff line
@@ -130,20 +130,26 @@ int ASN1_TIME_set_string(ASN1_TIME *s, const char *str) 
    return 1;

}



static int asn1_time_to_tm(struct tm *tm, const ASN1_TIME *t)

int ASN1_TIME_to_tm(const ASN1_TIME *s, struct tm *tm)

{

    if (t == NULL) {

    if (s == NULL) {

        time_t now_t;



        time(&now_t);

        memset(tm, 0, sizeof(*tm));

        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);

    if (s->type == V_ASN1_UTCTIME) {

        memset(tm, 0, sizeof(*tm));

        return asn1_utctime_to_tm(tm, s);

    }

    if (s->type == V_ASN1_GENERALIZEDTIME) {

        memset(tm, 0, sizeof(*tm));

        return asn1_generalizedtime_to_tm(tm, s);

    }



    return 0;

}
@@ -152,9 +158,10 @@ 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))



    if (!ASN1_TIME_to_tm(from, &tm_from))

        return 0;

    if (!asn1_time_to_tm(&tm_to, to))

    if (!ASN1_TIME_to_tm(to, &tm_to))

        return 0;

    return OPENSSL_gmtime_diff(pday, psec, &tm_from, &tm_to);

}

doc/man3/ASN1_TIME_set.pod

+15 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
=head1 NAME



ASN1_TIME_set, ASN1_TIME_adj, ASN1_TIME_check, ASN1_TIME_set_string,

ASN1_TIME_print, ASN1_TIME_diff - ASN.1 Time functions

ASN1_TIME_print, ASN1_TIME_to_tm, ASN1_TIME_diff - ASN.1 Time functions



=head1 SYNOPSIS
@@ -13,6 +13,7 @@ ASN1_TIME_print, ASN1_TIME_diff - ASN.1 Time functions 
 int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);

 int ASN1_TIME_check(const ASN1_TIME *t);

 int ASN1_TIME_print(BIO *b, const ASN1_TIME *s);

 int ASN1_TIME_to_tm(const ASN1_TIME *s, struct tm *tm);



 int ASN1_TIME_diff(int *pday, int *psec,

                    const ASN1_TIME *from, const ASN1_TIME *to);
@@ -42,6 +43,11 @@ format. It will be of the format MMM DD HH:MM:SS YYYY [GMT], for example 
structure has invalid format it prints out "Bad time value" and returns

an error.



ASN1_TIME_to_tm() converts the time B<s> to the standard B<tm> structure.

If B<s> is NULL, then the current time is converted. The output time is GMT.

Only the B<tm_sec>, B<tm_min>, B<tm_hour>, B<tm_mday>, B<tm_mon> and B<tm_year>

fields are updated.



ASN1_TIME_diff() sets B<*pday> and B<*psec> to the time difference between

B<from> and B<to>. If B<to> represents a time later than B<from> then

one or both (depending on the time difference) of B<*pday> and B<*psec>
@@ -124,12 +130,19 @@ otherwise. 
ASN1_TIME_print() returns 1 if the time is successfully printed out and 0 if

an error occurred (I/O error or invalid time format).



ASN1_TIME_to_tm() returns 1 if the time is successfully parsed and 0 if an

error occured (invalid time format).



ASN1_TIME_diff() returns 1 for success and 0 for failure. It can fail if the

pass ASN1_TIME structure has invalid syntax for example.



=head1 HISTORY



The ASN1_TIME_to_tm() function was added in OpenSSL 1.1.1.



=head1 COPYRIGHT



Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.

Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.



Licensed under the OpenSSL license (the "License").  You may not use

this file except in compliance with the License.  You can obtain a copy

include/openssl/asn1.h

+1 −0
Original line number Diff line number Diff line
@@ -628,6 +628,7 @@ int ASN1_TIME_check(const ASN1_TIME *t); 
ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(const ASN1_TIME *t,

                                                   ASN1_GENERALIZEDTIME **out);

int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);

int ASN1_TIME_to_tm(const ASN1_TIME *s, struct tm *tm);



int i2a_ASN1_INTEGER(BIO *bp, const ASN1_INTEGER *a);

int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size);

util/libcrypto.num

+1 −0
Original line number Diff line number Diff line
@@ -4297,3 +4297,4 @@ UI_method_set_data_duplicator 4239 1_1_1 EXIST::FUNCTION:UI 
UI_dup_user_data                        4240	1_1_1	EXIST::FUNCTION:UI

UI_method_get_data_destructor           4241	1_1_1	EXIST::FUNCTION:UI

ERR_load_strings_const                  4242	1_1_1	EXIST::FUNCTION:

ASN1_TIME_to_tm                         4243	1_1_1	EXIST::FUNCTION: