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

fixes for WOLFSSL_DUAL_ALG_CERTS: "cannot take address of bit-field ‘altKeyType’" and "‘altPrivateKeyType’" in ProcessBufferTryDecode(), "‘heap’ undeclared" in ProcessBufferCertAltPublicKey(), "‘consumed’ undeclared" in ProcessFile(), "‘keySz’ undeclared" in wolfSSL_CTX_use_PrivateKey_Id().

Browse Source
This commit is contained in:
Daniel Pouzzner
2024-04-18 13:49:44 -05:00
parent 08b42b7c93
commit e48f06bd53
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssl_load.c
View File

@ -1757,6 +1757,7 @@ static int ProcessBufferCertAltPublicKey(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
DecodedCert* cert, int checkKeySz) DecodedCert* cert, int checkKeySz)
{ {
int ret = 0; int ret = 0;
void* heap = WOLFSSL_HEAP(ctx, ssl);
byte keyType = 0; byte keyType = 0;
int keySz = 0; int keySz = 0;
#ifndef NO_RSA #ifndef NO_RSA
@ -2575,9 +2576,14 @@ int ProcessFile(WOLFSSL_CTX* ctx, const char* fname, int format, int type,
#endif #endif
#ifdef WOLFSSL_DUAL_ALG_CERTS #ifdef WOLFSSL_DUAL_ALG_CERTS
else if (type == PRIVATEKEY_TYPE) { else if (type == PRIVATEKEY_TYPE) {
/* Load all other certificate types. */ /* When support for dual algorithm certificates is enabled, the
* private key file may contain both the primary and the
* alternative private key. Hence, we have to parse both of them.
*/
long consumed = 0;
ret = ProcessBuffer(ctx, content.buffer, sz, format, type, ssl, ret = ProcessBuffer(ctx, content.buffer, sz, format, type, ssl,
NULL, userChain, verify); &consumed, userChain, verify);
if ((ret == 1) && (consumed < sz)) { if ((ret == 1) && (consumed < sz)) {
ret = ProcessBuffer(ctx, content.buffer + consumed, ret = ProcessBuffer(ctx, content.buffer + consumed,
sz - consumed, format, ALT_PRIVATEKEY_TYPE, ssl, NULL, 0, sz - consumed, format, ALT_PRIVATEKEY_TYPE, ssl, NULL, 0,
@ -3951,7 +3957,7 @@ int wolfSSL_CTX_use_PrivateKey_Id(WOLFSSL_CTX* ctx, const unsigned char* id,
#ifdef WOLFSSL_DUAL_ALG_CERTS #ifdef WOLFSSL_DUAL_ALG_CERTS
/* Set the ID for the alternative key, too. User can still override that /* Set the ID for the alternative key, too. User can still override that
* afterwards. */ * afterwards. */
ret = wolfSSL_CTX_use_AltPrivateKey_id(ctx, id, sz, devId, keySz); ret = wolfSSL_CTX_use_AltPrivateKey_Id(ctx, id, sz, devId);
#endif #endif
} }

4
wolfssl/internal.h
View File

@ -3585,7 +3585,7 @@ struct WOLFSSL_CTX {
#ifdef WOLFSSL_DUAL_ALG_CERTS #ifdef WOLFSSL_DUAL_ALG_CERTS
DerBuffer* altPrivateKey; DerBuffer* altPrivateKey;
byte altPrivateKeyType:6; byte altPrivateKeyType;
byte altPrivateKeyId:1; byte altPrivateKeyId:1;
byte altPrivateKeyLabel:1; byte altPrivateKeyLabel:1;
int altPrivateKeySz; int altPrivateKeySz;
@ -4560,7 +4560,7 @@ typedef struct Buffers {
int keyDevId; /* Device Id for key */ int keyDevId; /* Device Id for key */
#ifdef WOLFSSL_DUAL_ALG_CERTS #ifdef WOLFSSL_DUAL_ALG_CERTS
DerBuffer* altKey; /* WOLFSSL_CTX owns, unless we own */ DerBuffer* altKey; /* WOLFSSL_CTX owns, unless we own */
byte altKeyType:6; /* Type of alt key */ byte altKeyType; /* Type of alt key */
byte altKeyId:1; /* Key data is an id not data */ byte altKeyId:1; /* Key data is an id not data */
byte altKeyLabel:1; /* Key data is a label not data */ byte altKeyLabel:1; /* Key data is a label not data */
int altKeySz; /* Size of alt key */ int altKeySz; /* Size of alt key */