wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 02:37:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3030 from TakayukiMatsuo/usertime

Browse Source 
ASN1_TIME_new in correct macro condition
This commit is contained in:
Chris Conlon
2020-06-15 17:49:44 -05:00
committed by GitHub
parent aa7168df0b b883617c0d
commit b9f13dba61
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ssl.c
View File

@ -46337,22 +46337,7 @@ err_exit:
} }
#if !defined(NO_ASN_TIME) && !defined(USER_TIME) && !defined(TIME_OVERRIDES) #if !defined(NO_ASN_TIME) && !defined(USER_TIME) && !defined(TIME_OVERRIDES)
WOLFSSL_ASN1_TIME* wolfSSL_ASN1_TIME_new(void)
{
WOLFSSL_ASN1_TIME* ret = (WOLFSSL_ASN1_TIME*)
XMALLOC(sizeof(WOLFSSL_ASN1_TIME), NULL, DYNAMIC_TYPE_OPENSSL);
if (!ret)
return NULL;
XMEMSET(ret, 0, sizeof(WOLFSSL_ASN1_TIME));
return ret;
}
void wolfSSL_ASN1_TIME_free(WOLFSSL_ASN1_TIME* t)
{
if (t) {
XFREE(t, NULL, DYNAMIC_TYPE_OPENSSL);
}
}
WOLFSSL_ASN1_TIME* wolfSSL_ASN1_TIME_adj(WOLFSSL_ASN1_TIME *s, time_t t, WOLFSSL_ASN1_TIME* wolfSSL_ASN1_TIME_adj(WOLFSSL_ASN1_TIME *s, time_t t,
int offset_day, long offset_sec) int offset_day, long offset_sec)
@ -46438,6 +46423,23 @@ WOLFSSL_ASN1_TIME* wolfSSL_ASN1_TIME_adj(WOLFSSL_ASN1_TIME *s, time_t t,
#endif /* !NO_ASN_TIME && !USER_TIME && !TIME_OVERRIDES */ #endif /* !NO_ASN_TIME && !USER_TIME && !TIME_OVERRIDES */
#ifndef NO_ASN_TIME #ifndef NO_ASN_TIME
WOLFSSL_ASN1_TIME* wolfSSL_ASN1_TIME_new(void)
{
WOLFSSL_ASN1_TIME* ret = (WOLFSSL_ASN1_TIME*)
XMALLOC(sizeof(WOLFSSL_ASN1_TIME), NULL, DYNAMIC_TYPE_OPENSSL);
if (!ret)
return NULL;
XMEMSET(ret, 0, sizeof(WOLFSSL_ASN1_TIME));
return ret;
}
void wolfSSL_ASN1_TIME_free(WOLFSSL_ASN1_TIME* t)
{
if (t) {
XFREE(t, NULL, DYNAMIC_TYPE_OPENSSL);
}
}
/* not a compatibility function - length getter for opaque type */ /* not a compatibility function - length getter for opaque type */
int wolfSSL_ASN1_TIME_get_length(WOLFSSL_ASN1_TIME *t) int wolfSSL_ASN1_TIME_get_length(WOLFSSL_ASN1_TIME *t)
{ {