Fixes from sanitizer build

Fix OID index in SetNameRdnItems for multi attributes.
Stop warning about strncpy to small.
Fix casting in ASN1_SIMPLE to use consistent type.
This commit is contained in:
Sean Parkinson
2022-03-11 14:27:50 +10:00
parent c78bfa4db8
commit c3eab0dcdd
3 changed files with 4 additions and 3 deletions

View File

@ -28418,7 +28418,7 @@ int wolfSSL_X509_VERIFY_PARAM_set1_ip_asc(WOLFSSL_X509_VERIFY_PARAM *param,
param->ipasc[0] = '\0';
}
else {
XSTRNCPY(param->ipasc, ipasc, WOLFSSL_MAX_IPSTR - 1);
XSTRNCPY(param->ipasc, ipasc, WOLFSSL_MAX_IPSTR);
param->ipasc[WOLFSSL_MAX_IPSTR-1] = '\0';
}
ret = WOLFSSL_SUCCESS;

View File

@ -22994,7 +22994,7 @@ static int SetNameRdnItems(ASNSetData* dataASN, ASNItem* namesASN,
break;
}
/* Copy data into dynamic vars. */
SetRdnItems(namesASN + idx, dataASN + idx, nameOid[type],
SetRdnItems(namesASN + idx, dataASN + idx, nameOid[i],
NAME_OID_SZ, name->name[j].type,
(byte*)name->name[j].value, name->name[j].sz);
}

View File

@ -146,7 +146,8 @@ typedef enum {
static const WOLFSSL_ASN1_TEMPLATE type##_member_data[]
#define ASN1_SIMPLE(type, member, member_type) \
{ (char*)&__##type##_dummy_struct.member - (char*)&__##type##_dummy_struct, \
{ ((size_t)&__##type##_dummy_struct.member - \
(size_t)&__##type##_dummy_struct), \
WOLFSSL_##member_type##_ASN1 }
#define ASN1_SEQUENCE_END(type) \