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

Merge pull request #3194 from SparkiDev/unit_fix_1

Browse Source 
Fix unit.test to not fail randomly
This commit is contained in:
toddouska
2020-08-06 10:51:12 -07:00
committed by GitHub
parent 462f4f9e45 8afd629a30
commit 4e9d49556e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ssl.c
View File

@ -36911,6 +36911,11 @@ static int CopyX509NameToCertName(WOLFSSL_X509_NAME* n, CertName* cName)
return ret; return ret;
} }
if ((x509->serialSz == 0) && (cert.serialSz <= EXTERNAL_SERIAL_SIZE)) {
XMEMCPY(x509->serial, cert.serial, cert.serialSz);
x509->serialSz = cert.serialSz;
}
/* Dispose of the public key object. */ /* Dispose of the public key object. */
#ifndef NO_RSA #ifndef NO_RSA
if (x509->pubKeyOID == RSAk) if (x509->pubKeyOID == RSAk)

12
tests/api.c
View File

@ -26783,6 +26783,8 @@ static void test_wolfSSL_X509_sign(void)
long clientKeySz = (long)sizeof_client_key_der_2048; long clientKeySz = (long)sizeof_client_key_der_2048;
long clientPubKeySz = (long)sizeof_client_keypub_der_2048; long clientPubKeySz = (long)sizeof_client_keypub_der_2048;
#endif #endif
byte sn[16];
int snSz = sizeof(sn);
printf(testingFmt, "wolfSSL_X509_sign\n"); printf(testingFmt, "wolfSSL_X509_sign\n");
@ -26851,12 +26853,14 @@ static void test_wolfSSL_X509_sign(void)
AssertIntEQ(X509_get_ext_count(x509), SSL_FAILURE); AssertIntEQ(X509_get_ext_count(x509), SSL_FAILURE);
#endif #endif
AssertIntEQ(wolfSSL_X509_get_serial_number(x509, sn, &snSz),
WOLFSSL_SUCCESS);
#ifndef WOLFSSL_ALT_NAMES #ifndef WOLFSSL_ALT_NAMES
/* Valid case - size should be 798 */ /* Valid case - size should be 798 with 16 byte serial number */
AssertIntEQ(ret, 798); AssertIntEQ(ret, 782 + snSz);
#else /* WOLFSSL_ALT_NAMES */ #else /* WOLFSSL_ALT_NAMES */
/* Valid case - size should be 927 */ /* Valid case - size should be 927 with 16 byte serial number */
AssertIntEQ(ret, 927); AssertIntEQ(ret, 911 + snSz);
#endif /* WOLFSSL_ALT_NAMES */ #endif /* WOLFSSL_ALT_NAMES */
X509_NAME_free(name); X509_NAME_free(name);