Skip to content

Commit 7a6e37d

Browse files
douzzerdouzzer
authored
Merge pull request #10064 from julek-wolfssl/master
Fixes for wolfclu
2 parents b6d8829 + ed5eac1 commit 7a6e37d

7 files changed

Lines changed: 58 additions & 25 deletions

File tree

‎examples/ocsp_responder/ocsp_responder.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ static int PopulateResponderFromIndex(OcspResponder* responder,
434434
word32 serialLen = 0;
435435
enum Ocsp_Cert_Status status;
436436
time_t revTime = 0;
437-
enum WC_CRL_Reason revReason = CRL_REASON_UNSPECIFIED;
437+
enum WC_CRL_Reason revReason = WC_CRL_REASON_UNSPECIFIED;
438438
word32 validity = 86400;
439439
char* p = entry->serial;
440440
word32 i;
@@ -487,7 +487,7 @@ static int PopulateResponderFromIndex(OcspResponder* responder,
487487
else if (entry->status == 'R') {
488488
status = CERT_REVOKED;
489489
revTime = entry->revocationTime;
490-
revReason = CRL_REASON_UNSPECIFIED;
490+
revReason = WC_CRL_REASON_UNSPECIFIED;
491491
validity = 0;
492492
}
493493
else {

‎src/internal.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31027,7 +31027,7 @@ static void MakePSKPreMasterSecret(Arrays* arrays, byte use_psk_key)
3102731027
XMEMSET(pms, 0, sz);
3102831028
pms += sz;
3102931029
}
31030-
c16toa(arrays->psk_keySz, pms);
31030+
c16toa((word16)arrays->psk_keySz, pms);
3103131031
pms += OPAQUE16_LEN;
3103231032
XMEMCPY(pms, arrays->psk_key, arrays->psk_keySz);
3103331033
arrays->preMasterSz = sz + arrays->psk_keySz + OPAQUE16_LEN * 2;

‎src/ocsp.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2556,8 +2556,8 @@ int wc_OcspResponder_SetCertStatus(OcspResponder* responder,
25562556
if (status == CERT_REVOKED) {
25572557
if (revocationTime <= 0)
25582558
goto out;
2559-
if (revocationReason < CRL_REASON_UNSPECIFIED ||
2560-
revocationReason > CRL_REASON_AA_COMPROMISE)
2559+
if (revocationReason < WC_CRL_REASON_UNSPECIFIED ||
2560+
revocationReason > WC_CRL_REASON_AA_COMPROMISE)
25612561
goto out;
25622562
/* Skip value 7 which is not used */
25632563
if (revocationReason == 7)

‎tests/api/test_ocsp.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@ int test_ocsp_responder(void)
15611561
"./certs/ca-key.der",
15621562
"./certs/server-cert.der",
15631563
CERT_GOOD,
1564-
0, CRL_REASON_UNSPECIFIED,
1564+
0, WC_CRL_REASON_UNSPECIFIED,
15651565
86400, /* validityPeriod - 24 hours */
15661566
0,
15671567
"RSA server cert - GOOD status"
@@ -1572,7 +1572,7 @@ int test_ocsp_responder(void)
15721572
"./certs/ca-key.der",
15731573
"./certs/server-cert.der",
15741574
CERT_REVOKED,
1575-
now, CRL_REASON_KEY_COMPROMISE, /* Revoked due to key compromise */
1575+
now, WC_CRL_REASON_KEY_COMPROMISE, /* Revoked due to key compromise */
15761576
0, /* validityPeriod (not used for REVOKED) */
15771577
OCSP_CERT_REVOKED,
15781578
"RSA server cert - REVOKED status"
@@ -1583,7 +1583,7 @@ int test_ocsp_responder(void)
15831583
"./certs/ca-key.der",
15841584
"./certs/server-cert.der",
15851585
CERT_UNKNOWN,
1586-
0, CRL_REASON_UNSPECIFIED,
1586+
0, WC_CRL_REASON_UNSPECIFIED,
15871587
0, /* validityPeriod (not used for UNKNOWN) */
15881588
OCSP_CERT_UNKNOWN,
15891589
"RSA server cert - UNKNOWN status"
@@ -1594,7 +1594,7 @@ int test_ocsp_responder(void)
15941594
"./certs/ocsp/ocsp-responder-key.der",
15951595
"./certs/ocsp/intermediate1-ca-cert.der",
15961596
CERT_GOOD,
1597-
0, CRL_REASON_UNSPECIFIED,
1597+
0, WC_CRL_REASON_UNSPECIFIED,
15981598
86400, /* validityPeriod - 24 hours */
15991599
0,
16001600
"RSA int1 cert with responder - GOOD status"
@@ -1605,7 +1605,7 @@ int test_ocsp_responder(void)
16051605
"./certs/ocsp/ocsp-responder-key.der",
16061606
"./certs/ocsp/intermediate1-ca-cert.der",
16071607
CERT_REVOKED,
1608-
now, CRL_REASON_KEY_COMPROMISE, /* Revoked due to key compromise */
1608+
now, WC_CRL_REASON_KEY_COMPROMISE, /* Revoked due to key compromise */
16091609
0, /* validityPeriod (not used for REVOKED) */
16101610
OCSP_CERT_REVOKED,
16111611
"RSA int1 cert with responder - REVOKED status"
@@ -1616,7 +1616,7 @@ int test_ocsp_responder(void)
16161616
"./certs/ocsp/ocsp-responder-key.der",
16171617
"./certs/ocsp/intermediate1-ca-cert.der",
16181618
CERT_UNKNOWN,
1619-
0, CRL_REASON_UNSPECIFIED,
1619+
0, WC_CRL_REASON_UNSPECIFIED,
16201620
0, /* validityPeriod (not used for UNKNOWN) */
16211621
OCSP_CERT_UNKNOWN,
16221622
"RSA int1 cert with responder - UNKNOWN status"
@@ -1628,7 +1628,7 @@ int test_ocsp_responder(void)
16281628
"./certs/ca-ecc-key.der",
16291629
"./certs/server-ecc.der",
16301630
CERT_GOOD,
1631-
0, CRL_REASON_UNSPECIFIED,
1631+
0, WC_CRL_REASON_UNSPECIFIED,
16321632
86400, /* validityPeriod - 24 hours */
16331633
0,
16341634
"ECC server cert - GOOD status"
@@ -1639,7 +1639,7 @@ int test_ocsp_responder(void)
16391639
"./certs/ca-ecc-key.der",
16401640
"./certs/server-ecc.der",
16411641
CERT_REVOKED,
1642-
now, CRL_REASON_AFFILIATION_CHANGED,
1642+
now, WC_CRL_REASON_AFFILIATION_CHANGED,
16431643
0, /* validityPeriod (not used for REVOKED) */
16441644
OCSP_CERT_REVOKED,
16451645
"ECC server cert - REVOKED status"
@@ -1650,7 +1650,7 @@ int test_ocsp_responder(void)
16501650
"./certs/ca-ecc-key.der",
16511651
"./certs/server-ecc.der",
16521652
CERT_UNKNOWN,
1653-
0, CRL_REASON_UNSPECIFIED,
1653+
0, WC_CRL_REASON_UNSPECIFIED,
16541654
0, /* validityPeriod (not used for UNKNOWN) */
16551655
OCSP_CERT_UNKNOWN,
16561656
"ECC server cert - UNKNOWN status"

‎wolfcrypt/src/asn.c‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23330,6 +23330,15 @@ static wcchar kDecInfoHeader = "DEK-Info";
2333023330
#if !defined(NO_AES) && defined(HAVE_AES_CBC) && defined(WOLFSSL_AES_256)
2333123331
static wcchar kEncTypeAesCbc256 = "AES-256-CBC";
2333223332
#endif
23333+
#if !defined(NO_AES) && defined(WOLFSSL_AES_COUNTER) && defined(WOLFSSL_AES_128)
23334+
static wcchar kEncTypeAesCtr128 = "AES-128-CTR";
23335+
#endif
23336+
#if !defined(NO_AES) && defined(WOLFSSL_AES_COUNTER) && defined(WOLFSSL_AES_192)
23337+
static wcchar kEncTypeAesCtr192 = "AES-192-CTR";
23338+
#endif
23339+
#if !defined(NO_AES) && defined(WOLFSSL_AES_COUNTER) && defined(WOLFSSL_AES_256)
23340+
static wcchar kEncTypeAesCtr256 = "AES-256-CTR";
23341+
#endif
2333323342

2333423343
int wc_EncryptedInfoGet(EncryptedInfo* info, const char* cipherInfo)
2333523344
{
@@ -23385,6 +23394,30 @@ int wc_EncryptedInfoGet(EncryptedInfo* info, const char* cipherInfo)
2338523394
if (info->ivSz == 0) info->ivSz = AES_IV_SIZE;
2338623395
}
2338723396
else
23397+
#endif
23398+
#if !defined(NO_AES) && defined(WOLFSSL_AES_COUNTER) && defined(WOLFSSL_AES_128)
23399+
if (XSTRCMP(cipherInfo, kEncTypeAesCtr128) == 0) {
23400+
info->cipherType = WC_CIPHER_AES_CTR;
23401+
info->keySz = AES_128_KEY_SIZE;
23402+
if (info->ivSz == 0) info->ivSz = AES_IV_SIZE;
23403+
}
23404+
else
23405+
#endif
23406+
#if !defined(NO_AES) && defined(WOLFSSL_AES_COUNTER) && defined(WOLFSSL_AES_192)
23407+
if (XSTRCMP(cipherInfo, kEncTypeAesCtr192) == 0) {
23408+
info->cipherType = WC_CIPHER_AES_CTR;
23409+
info->keySz = AES_192_KEY_SIZE;
23410+
if (info->ivSz == 0) info->ivSz = AES_IV_SIZE;
23411+
}
23412+
else
23413+
#endif
23414+
#if !defined(NO_AES) && defined(WOLFSSL_AES_COUNTER) && defined(WOLFSSL_AES_256)
23415+
if (XSTRCMP(cipherInfo, kEncTypeAesCtr256) == 0) {
23416+
info->cipherType = WC_CIPHER_AES_CTR;
23417+
info->keySz = AES_256_KEY_SIZE;
23418+
if (info->ivSz == 0) info->ivSz = AES_IV_SIZE;
23419+
}
23420+
else
2338823421
#endif
2338923422
{
2339023423
ret = NOT_COMPILED_IN;

‎wolfcrypt/src/pkcs12.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ static byte* PKCS12_ConcatenateContent(WC_PKCS12* pkcs12,byte* mergedData,
11471147
{
11481148
byte* oldContent;
11491149
word32 oldContentSz;
1150-
word32 newSz;
1150+
word32 newSz = 0;
11511151

11521152
(void)pkcs12;
11531153

‎wolfssl/wolfcrypt/asn.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2921,17 +2921,17 @@ WOLFSSL_LOCAL int OcspDecodeCertID(const byte* input, word32* inOutIdx, word32 i
29212921
#ifdef HAVE_OCSP_RESPONDER
29222922
/* Revocation reason codes from RFC 5280 */
29232923
enum WC_CRL_Reason {
2924-
CRL_REASON_UNSPECIFIED = 0,
2925-
CRL_REASON_KEY_COMPROMISE = 1,
2926-
CRL_REASON_CA_COMPROMISE = 2,
2927-
CRL_REASON_AFFILIATION_CHANGED = 3,
2928-
CRL_REASON_SUPERSEDED = 4,
2929-
CRL_REASON_CESSATION_OF_OPERATION = 5,
2930-
CRL_REASON_CERTIFICATE_HOLD = 6,
2924+
WC_CRL_REASON_UNSPECIFIED = 0,
2925+
WC_CRL_REASON_KEY_COMPROMISE = 1,
2926+
WC_CRL_REASON_CA_COMPROMISE = 2,
2927+
WC_CRL_REASON_AFFILIATION_CHANGED = 3,
2928+
WC_CRL_REASON_SUPERSEDED = 4,
2929+
WC_CRL_REASON_CESSATION_OF_OPERATION = 5,
2930+
WC_CRL_REASON_CERTIFICATE_HOLD = 6,
29312931
/* value 7 is not used */
2932-
CRL_REASON_REMOVE_FROM_CRL = 8,
2933-
CRL_REASON_PRIVILEGE_WITHDRAWN = 9,
2934-
CRL_REASON_AA_COMPROMISE = 10
2932+
WC_CRL_REASON_REMOVE_FROM_CRL = 8,
2933+
WC_CRL_REASON_PRIVILEGE_WITHDRAWN = 9,
2934+
WC_CRL_REASON_AA_COMPROMISE = 10
29352935
};
29362936

29372937
/* Certificate status entry for a single certificate */

0 commit comments

Comments
 (0)