wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-04 05:04:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

wolfSSL_ASN1_TIME_get_data() changed

Browse Source
This commit is contained in:
Go Hosohara
2018-07-03 17:16:10 +09:00
parent 29d3303995
commit 3bf776baf4
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@@ -34088,18 +34088,16 @@ int wolfSSL_ASN1_TIME_get_length(WOLFSSL_ASN1_TIME *t)
return (int)t->data[1]; return (int)t->data[1];
} }
int wolfSSL_ASN1_TIME_get_data(WOLFSSL_ASN1_TIME *t, unsigned char* data) unsigned char* wolfSSL_ASN1_TIME_get_data(WOLFSSL_ASN1_TIME *t)
{ {
char *dptr = NULL; unsigned char *dptr = NULL;
WOLFSSL_ENTER("wolfSSL_ASN1_TIME_get_data"); WOLFSSL_ENTER("wolfSSL_ASN1_TIME_get_data");
if (t == NULL || data == NULL) if (t == NULL)
return WOLFSSL_FAILURE; return NULL;
dptr = (char*)t->data + 2; dptr = t->data + 2;
XSTRNCPY((char*)data, dptr, t->data[1]); return dptr;
return WOLFSSL_SUCCESS;
} }
WOLFSSL_ASN1_TIME *wolfSSL_ASN1_TIME_to_generalizedtime(WOLFSSL_ASN1_TIME *t, WOLFSSL_ASN1_TIME *wolfSSL_ASN1_TIME_to_generalizedtime(WOLFSSL_ASN1_TIME *t,

6
tests/api.c
View File

@@ -19753,7 +19753,7 @@ static void test_wolfSSL_ASN1_TIME_to_generalizedtime(void){
WOLFSSL_ASN1_TIME *out; WOLFSSL_ASN1_TIME *out;
WOLFSSL_ASN1_TIME *gtime; WOLFSSL_ASN1_TIME *gtime;
int tlen = 0; int tlen = 0;
unsigned char data[ASN_GENERALIZED_TIME_SIZE]; unsigned char *data;
printf(testingFmt, "wolfSSL_ASN1_TIME_to_generalizedtime()"); printf(testingFmt, "wolfSSL_ASN1_TIME_to_generalizedtime()");
@@ -19769,7 +19769,7 @@ static void test_wolfSSL_ASN1_TIME_to_generalizedtime(void){
tlen = wolfSSL_ASN1_TIME_get_length(t); tlen = wolfSSL_ASN1_TIME_get_length(t);
AssertIntEQ(tlen, ASN_UTC_TIME_SIZE); AssertIntEQ(tlen, ASN_UTC_TIME_SIZE);
wolfSSL_ASN1_TIME_get_data(t,data); data = wolfSSL_ASN1_TIME_get_data(t);
AssertStrEQ((char*)data, "050727123456Z"); AssertStrEQ((char*)data, "050727123456Z");
gtime = wolfSSL_ASN1_TIME_to_generalizedtime(t, &out); gtime = wolfSSL_ASN1_TIME_to_generalizedtime(t, &out);
AssertIntEQ(gtime->data[0], ASN_GENERALIZED_TIME); AssertIntEQ(gtime->data[0], ASN_GENERALIZED_TIME);
@@ -19787,7 +19787,7 @@ static void test_wolfSSL_ASN1_TIME_to_generalizedtime(void){
tlen = wolfSSL_ASN1_TIME_get_length(t); tlen = wolfSSL_ASN1_TIME_get_length(t);
AssertIntEQ(tlen, ASN_GENERALIZED_TIME_SIZE); AssertIntEQ(tlen, ASN_GENERALIZED_TIME_SIZE);
wolfSSL_ASN1_TIME_get_data(t,data); data = wolfSSL_ASN1_TIME_get_data(t);
AssertStrEQ((char*)data, "20050727123456Z"); AssertStrEQ((char*)data, "20050727123456Z");
gtime = wolfSSL_ASN1_TIME_to_generalizedtime(t, &out); gtime = wolfSSL_ASN1_TIME_to_generalizedtime(t, &out);
AssertIntEQ(gtime->data[0], ASN_GENERALIZED_TIME); AssertIntEQ(gtime->data[0], ASN_GENERALIZED_TIME);

2
wolfssl/ssl.h
View File

@@ -2997,7 +2997,7 @@ WOLFSSL_API void wolfSSL_EC_POINT_dump(const char *msg, const WOLFSSL_EC_POINT *
WOLFSSL_API const char *wolfSSL_ASN1_tag2str(int tag); WOLFSSL_API const char *wolfSSL_ASN1_tag2str(int tag);
WOLFSSL_API int wolfSSL_ASN1_STRING_print_ex(WOLFSSL_BIO *out, WOLFSSL_ASN1_STRING *str, unsigned long flags); WOLFSSL_API int wolfSSL_ASN1_STRING_print_ex(WOLFSSL_BIO *out, WOLFSSL_ASN1_STRING *str, unsigned long flags);
WOLFSSL_API int wolfSSL_ASN1_TIME_get_length(WOLFSSL_ASN1_TIME *t); WOLFSSL_API int wolfSSL_ASN1_TIME_get_length(WOLFSSL_ASN1_TIME *t);
WOLFSSL_API int wolfSSL_ASN1_TIME_get_data(WOLFSSL_ASN1_TIME *t, unsigned char *data); WOLFSSL_API unsigned char* wolfSSL_ASN1_TIME_get_data(WOLFSSL_ASN1_TIME *t);
WOLFSSL_API WOLFSSL_ASN1_TIME *wolfSSL_ASN1_TIME_to_generalizedtime(WOLFSSL_ASN1_TIME *t, WOLFSSL_API WOLFSSL_ASN1_TIME *wolfSSL_ASN1_TIME_to_generalizedtime(WOLFSSL_ASN1_TIME *t,
WOLFSSL_ASN1_TIME **out); WOLFSSL_ASN1_TIME **out);
WOLFSSL_API int wolfSSL_i2c_ASN1_INTEGER(WOLFSSL_ASN1_INTEGER *a, unsigned char **pp); WOLFSSL_API int wolfSSL_i2c_ASN1_INTEGER(WOLFSSL_ASN1_INTEGER *a, unsigned char **pp);