arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

added generalized time for certificates

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@232 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
This commit is contained in:
cameronrich 2013-11-14 18:34:36 +00:00
parent 97f9f969a3
commit e6f9ae68c1
2 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ssl/asn1.c
View File

@ -205,11 +205,13 @@ int asn1_get_private_key(const uint8_t *buf, int len, RSA_CTX **rsa_ctx)
*/ */
static int asn1_get_utc_time(const uint8_t *buf, int *offset, time_t *t) static int asn1_get_utc_time(const uint8_t *buf, int *offset, time_t *t)
{ {
int ret = X509_NOT_OK, len, t_offset; int ret = X509_NOT_OK, len, t_offset, abs_year;
struct tm tm; struct tm tm;
if (buf[(*offset)++] != ASN1_UTC_TIME) /* see http://tools.ietf.org/html/rfc5280#section-4.1.2.5 */
goto end_utc_time; if (buf[*offset] == ASN1_UTC_TIME)
{
(*offset)++;
len = get_asn1_length(buf, offset); len = get_asn1_length(buf, offset);
t_offset = *offset; t_offset = *offset;
@ -227,8 +229,40 @@ static int asn1_get_utc_time(const uint8_t *buf, int *offset, time_t *t)
*t = mktime(&tm); *t = mktime(&tm);
*offset += len; *offset += len;
ret = X509_OK; ret = X509_OK;
}
else if (buf[*offset] == ASN1_GENERALIZED_TIME)
{
(*offset)++;
len = get_asn1_length(buf, offset);
t_offset = *offset;
memset(&tm, 0, sizeof(struct tm));
abs_year = ((buf[t_offset] - '0')*1000 +
(buf[t_offset+1] - '0')*100 + (buf[t_offset+2] - '0')*10 +
(buf[t_offset+3] - '0'));
if (abs_year <= 1901)
{
tm.tm_year = 1;
tm.tm_mon = 0;
tm.tm_mday = 1;
}
else
{
tm.tm_year = abs_year - 1900;
tm.tm_mon = (buf[t_offset+4] - '0')*10 + (buf[t_offset+5] - '0') - 1;
tm.tm_mday = (buf[t_offset+6] - '0')*10 + (buf[t_offset+7] - '0');
tm.tm_hour = (buf[t_offset+8] - '0')*10 + (buf[t_offset+9] - '0');
tm.tm_min = (buf[t_offset+10] - '0')*10 + (buf[t_offset+11] - '0');
tm.tm_sec = (buf[t_offset+12] - '0')*10 + (buf[t_offset+13] - '0');
*t = mktime(&tm);
}
*offset += len;
ret = X509_OK;
}
end_utc_time:
return ret; return ret;
} }

1
ssl/crypto_misc.h
View File

@ -112,6 +112,7 @@ const char * x509_display_error(int error);
#define ASN1_TELETEX_STR 0x14 #define ASN1_TELETEX_STR 0x14
#define ASN1_IA5_STR 0x16 #define ASN1_IA5_STR 0x16
#define ASN1_UTC_TIME 0x17 #define ASN1_UTC_TIME 0x17
#define ASN1_GENERALIZED_TIME 0x18
#define ASN1_UNICODE_STR 0x1e #define ASN1_UNICODE_STR 0x1e
#define ASN1_SEQUENCE 0x30 #define ASN1_SEQUENCE 0x30
#define ASN1_CONTEXT_DNSNAME 0x82 #define ASN1_CONTEXT_DNSNAME 0x82