feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5930 from miyazakh/subscript_has_char

Browse Source
This commit is contained in:
Chris Conlon
2022-12-28 10:18:43 -07:00
committed by GitHub
parent 9b513fd6bf 684646c8b9
commit aadce3af9c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ssl.c
View File

@ -25200,8 +25200,8 @@ int wolfSSL_ASN1_TIME_check(const WOLFSSL_ASN1_TIME* a)
/* /*
* Convert time to Unix time (GMT). * Convert time to Unix time (GMT).
*/ */
static long long TimeToUnixTime(int sec, int min, int hour, int mday, int mon, static long long TimeToUnixTime(int sec, int minute, int hour, int mday,
int year) int mon, int year)
{ {
/* Number of cumulative days from the previous months, starting from /* Number of cumulative days from the previous months, starting from
* beginning of January. */ * beginning of January. */
@ -25217,8 +25217,8 @@ static long long TimeToUnixTime(int sec, int min, int hour, int mday, int mon,
1969 / 100 - 1969 / 400; 1969 / 100 - 1969 / 400;
return ((((long long) (year - 1970) * 365 + leapDays + return ((((long long) (year - 1970) * 365 + leapDays +
monthDaysCumulative[mon] + mday - 1) * 24 + hour) * 60 + min) * 60 + monthDaysCumulative[mon] + mday - 1) * 24 + hour) * 60 + minute) *
sec; 60 + sec;
} }
int wolfSSL_ASN1_TIME_diff(int *days, int *secs, const WOLFSSL_ASN1_TIME *from, int wolfSSL_ASN1_TIME_diff(int *days, int *secs, const WOLFSSL_ASN1_TIME *from,
@ -29448,10 +29448,10 @@ int wolfSSL_ASN1_STRING_canon(WOLFSSL_ASN1_STRING* asn_out,
/* trimming spaces at the head and tail */ /* trimming spaces at the head and tail */
dst--; dst--;
for (; (len > 0 && XISSPACE(*dst)); len--) { for (; (len > 0 && XISSPACE((unsigned char)*dst)); len--) {
dst--; dst--;
} }
for (; (len > 0 && XISSPACE(*src)); len--) { for (; (len > 0 && XISSPACE((unsigned char)*src)); len--) {
src++; src++;
} }
@ -29462,10 +29462,10 @@ int wolfSSL_ASN1_STRING_canon(WOLFSSL_ASN1_STRING* asn_out,
if (!XISASCII(*src)) { if (!XISASCII(*src)) {
/* keep non-ascii code */ /* keep non-ascii code */
*dst = *src++; *dst = *src++;
} else if (XISSPACE(*src)) { } else if ((*src) > 0 && XISSPACE((unsigned char)*src)) {
*dst = 0x20; /* space */ *dst = 0x20; /* space */
/* remove the rest of spaces */ /* remove the rest of spaces */
while (XISSPACE(*++src) && i++ < len); while (XISSPACE((unsigned char)*++src) && i++ < len);
} else { } else {
*dst = (char)XTOLOWER((unsigned char)*src++); *dst = (char)XTOLOWER((unsigned char)*src++);
} }