WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1847 from kaleb-himes/ASN_T_LONG 

Address a potential out of bounds write
pull/1850/head
JacobBarthelmeh 2018-09-24 10:51:49 -06:00 committed by GitHub
parent 3be25441fa 29d60ec7e9
commit 4855246fc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl.c
View File

@ -19018,7 +19018,7 @@ WOLFSSL_ASN1_TIME* wolfSSL_ASN1_TIME_adj(WOLFSSL_ASN1_TIME *s, time_t t,
XMEMCPY(data_ptr,(byte *)utc_str, ASN_UTC_TIME_SIZE); XMEMCPY(data_ptr,(byte *)utc_str, ASN_UTC_TIME_SIZE);
/* GeneralizedTime */ /* GeneralizedTime */
} else { } else {
char gt_str[ASN_GENERALIZED_TIME_SIZE]; char gt_str[ASN_GENERALIZED_TIME_MAX];
int gt_year,gt_mon,gt_day,gt_hour,gt_min,gt_sec; int gt_year,gt_mon,gt_day,gt_hour,gt_min,gt_sec;
byte *data_ptr = NULL; byte *data_ptr = NULL;
@ -19028,7 +19028,7 @@ WOLFSSL_ASN1_TIME* wolfSSL_ASN1_TIME_adj(WOLFSSL_ASN1_TIME *s, time_t t,
gt_hour = ts->tm_hour; gt_hour = ts->tm_hour;
gt_min = ts->tm_min; gt_min = ts->tm_min;
gt_sec = ts->tm_sec; gt_sec = ts->tm_sec;
XSNPRINTF((char *)gt_str, ASN_GENERALIZED_TIME_SIZE, XSNPRINTF((char *)gt_str, ASN_GENERALIZED_TIME_MAX,
"%4d%02d%02d%02d%02d%02dZ", "%4d%02d%02d%02d%02d%02dZ",
gt_year, gt_mon, gt_day, gt_hour, gt_min,gt_sec); gt_year, gt_mon, gt_day, gt_hour, gt_min,gt_sec);
data_ptr = s->data; data_ptr = s->data;

1
wolfssl/wolfcrypt/asn.h
View File

@ -104,6 +104,7 @@ enum ASN_Tags {
#define ASN_UTC_TIME_SIZE 14 #define ASN_UTC_TIME_SIZE 14
#define ASN_GENERALIZED_TIME_SIZE 16 #define ASN_GENERALIZED_TIME_SIZE 16
#define ASN_GENERALIZED_TIME_MAX 68
enum DN_Tags { enum DN_Tags {
ASN_COMMON_NAME = 0x03, /* CN */ ASN_COMMON_NAME = 0x03, /* CN */