cf37aaa335
Add missing ASN1_TIME functions Do some cleanup of the ASN1_TIME code. Add ASN1_TIME_normalize() to normalize ASN1_TIME structures. Add ASN1_TIME_compare() to compare two ASN1_TIME structures. Add ASN1_TIME_cmp_time_t() to compare an ASN1_TIME to time_t (generic version of ASN1_UTCTIME_cmp_time_t()). Replace '0' .. '9' compares with isdigit() Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2753)
83 lines
2.1 KiB
C
83 lines
2.1 KiB
C
/*
|
|
* Copyright 1995-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
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
/*
|
|
* GENERALIZEDTIME implementation. Based on UTCTIME
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <time.h>
|
|
#include <ctype.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/asn1.h>
|
|
#include "asn1_locl.h"
|
|
|
|
/* This is the primary function used to parse ASN1_GENERALIZEDTIME */
|
|
int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d)
|
|
{
|
|
/* wrapper around asn1_time_to_tm */
|
|
if (d->type != V_ASN1_GENERALIZEDTIME)
|
|
return 0;
|
|
return asn1_time_to_tm(tm, d);
|
|
}
|
|
|
|
int ASN1_GENERALIZEDTIME_check(const ASN1_GENERALIZEDTIME *d)
|
|
{
|
|
return asn1_generalizedtime_to_tm(NULL, d);
|
|
}
|
|
|
|
int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str)
|
|
{
|
|
ASN1_GENERALIZEDTIME t;
|
|
|
|
t.type = V_ASN1_GENERALIZEDTIME;
|
|
t.length = strlen(str);
|
|
t.data = (unsigned char *)str;
|
|
t.flags = 0;
|
|
|
|
if (!ASN1_GENERALIZEDTIME_check(&t))
|
|
return 0;
|
|
|
|
if (s != NULL && !ASN1_STRING_copy(s, &t))
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
|
|
time_t t)
|
|
{
|
|
return ASN1_GENERALIZEDTIME_adj(s, t, 0, 0);
|
|
}
|
|
|
|
ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,
|
|
time_t t, int offset_day,
|
|
long offset_sec)
|
|
{
|
|
struct tm *ts;
|
|
struct tm data;
|
|
|
|
ts = OPENSSL_gmtime(&t, &data);
|
|
if (ts == NULL)
|
|
return NULL;
|
|
|
|
if (offset_day || offset_sec) {
|
|
if (!OPENSSL_gmtime_adj(ts, offset_day, offset_sec))
|
|
return NULL;
|
|
}
|
|
|
|
return asn1_time_from_tm(s, ts, V_ASN1_GENERALIZEDTIME);
|
|
}
|
|
|
|
int ASN1_GENERALIZEDTIME_print(BIO *bp, const ASN1_GENERALIZEDTIME *tm)
|
|
{
|
|
if (tm->type != V_ASN1_GENERALIZEDTIME)
|
|
return 0;
|
|
return ASN1_TIME_print(bp, tm);
|
|
}
|