wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

strncpy gcc warning fixes

Browse Source
This commit is contained in:
Jacob Barthelmeh
2019-08-30 13:34:51 -06:00
parent ef20276ab5
commit 2a750cd18d
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl.c
View File

@@ -12522,7 +12522,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
if (hint == 0) if (hint == 0)
ctx->server_hint[0] = '\0'; ctx->server_hint[0] = '\0';
else { else {
XSTRNCPY(ctx->server_hint, hint, sizeof(ctx->server_hint)); XSTRNCPY(ctx->server_hint, hint, MAX_PSK_ID_LEN);
ctx->server_hint[MAX_PSK_ID_LEN] = '\0'; /* null term */ ctx->server_hint[MAX_PSK_ID_LEN] = '\0'; /* null term */
} }
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
@@ -25324,7 +25324,7 @@ int wolfSSL_RAND_egd(const char* nm)
} }
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
rem.sun_family = AF_UNIX; rem.sun_family = AF_UNIX;
XSTRNCPY(rem.sun_path, nm, sizeof(rem.sun_path)); XSTRNCPY(rem.sun_path, nm, sizeof(rem.sun_path) - 1);
rem.sun_path[sizeof(rem.sun_path)-1] = '\0'; rem.sun_path[sizeof(rem.sun_path)-1] = '\0';
} }

24
wolfcrypt/src/asn.c
View File

@@ -13059,56 +13059,56 @@ static void SetNameFromDcert(CertName* cn, DecodedCert* decoded)
if (decoded->subjectCN) { if (decoded->subjectCN) {
sz = (decoded->subjectCNLen < CTC_NAME_SIZE) ? decoded->subjectCNLen sz = (decoded->subjectCNLen < CTC_NAME_SIZE) ? decoded->subjectCNLen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->commonName, decoded->subjectCN, CTC_NAME_SIZE); XSTRNCPY(cn->commonName, decoded->subjectCN, sz);
cn->commonName[sz] = '\0'; cn->commonName[sz] = '\0';
cn->commonNameEnc = decoded->subjectCNEnc; cn->commonNameEnc = decoded->subjectCNEnc;
} }
if (decoded->subjectC) { if (decoded->subjectC) {
sz = (decoded->subjectCLen < CTC_NAME_SIZE) ? decoded->subjectCLen sz = (decoded->subjectCLen < CTC_NAME_SIZE) ? decoded->subjectCLen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->country, decoded->subjectC, CTC_NAME_SIZE); XSTRNCPY(cn->country, decoded->subjectC, sz);
cn->country[sz] = '\0'; cn->country[sz] = '\0';
cn->countryEnc = decoded->subjectCEnc; cn->countryEnc = decoded->subjectCEnc;
} }
if (decoded->subjectST) { if (decoded->subjectST) {
sz = (decoded->subjectSTLen < CTC_NAME_SIZE) ? decoded->subjectSTLen sz = (decoded->subjectSTLen < CTC_NAME_SIZE) ? decoded->subjectSTLen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->state, decoded->subjectST, CTC_NAME_SIZE); XSTRNCPY(cn->state, decoded->subjectST, sz);
cn->state[sz] = '\0'; cn->state[sz] = '\0';
cn->stateEnc = decoded->subjectSTEnc; cn->stateEnc = decoded->subjectSTEnc;
} }
if (decoded->subjectL) { if (decoded->subjectL) {
sz = (decoded->subjectLLen < CTC_NAME_SIZE) ? decoded->subjectLLen sz = (decoded->subjectLLen < CTC_NAME_SIZE) ? decoded->subjectLLen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->locality, decoded->subjectL, CTC_NAME_SIZE); XSTRNCPY(cn->locality, decoded->subjectL, sz);
cn->locality[sz] = '\0'; cn->locality[sz] = '\0';
cn->localityEnc = decoded->subjectLEnc; cn->localityEnc = decoded->subjectLEnc;
} }
if (decoded->subjectO) { if (decoded->subjectO) {
sz = (decoded->subjectOLen < CTC_NAME_SIZE) ? decoded->subjectOLen sz = (decoded->subjectOLen < CTC_NAME_SIZE) ? decoded->subjectOLen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->org, decoded->subjectO, CTC_NAME_SIZE); XSTRNCPY(cn->org, decoded->subjectO, sz);
cn->org[sz] = '\0'; cn->org[sz] = '\0';
cn->orgEnc = decoded->subjectOEnc; cn->orgEnc = decoded->subjectOEnc;
} }
if (decoded->subjectOU) { if (decoded->subjectOU) {
sz = (decoded->subjectOULen < CTC_NAME_SIZE) ? decoded->subjectOULen sz = (decoded->subjectOULen < CTC_NAME_SIZE) ? decoded->subjectOULen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->unit, decoded->subjectOU, CTC_NAME_SIZE); XSTRNCPY(cn->unit, decoded->subjectOU, sz);
cn->unit[sz] = '\0'; cn->unit[sz] = '\0';
cn->unitEnc = decoded->subjectOUEnc; cn->unitEnc = decoded->subjectOUEnc;
} }
if (decoded->subjectSN) { if (decoded->subjectSN) {
sz = (decoded->subjectSNLen < CTC_NAME_SIZE) ? decoded->subjectSNLen sz = (decoded->subjectSNLen < CTC_NAME_SIZE) ? decoded->subjectSNLen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->sur, decoded->subjectSN, CTC_NAME_SIZE); XSTRNCPY(cn->sur, decoded->subjectSN, sz);
cn->sur[sz] = '\0'; cn->sur[sz] = '\0';
cn->surEnc = decoded->subjectSNEnc; cn->surEnc = decoded->subjectSNEnc;
} }
if (decoded->subjectSND) { if (decoded->subjectSND) {
sz = (decoded->subjectSNDLen < CTC_NAME_SIZE) ? decoded->subjectSNDLen sz = (decoded->subjectSNDLen < CTC_NAME_SIZE) ? decoded->subjectSNDLen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->serialDev, decoded->subjectSND, CTC_NAME_SIZE); XSTRNCPY(cn->serialDev, decoded->subjectSND, sz);
cn->serialDev[sz] = '\0'; cn->serialDev[sz] = '\0';
cn->serialDevEnc = decoded->subjectSNDEnc; cn->serialDevEnc = decoded->subjectSNDEnc;
} }
@@ -13116,21 +13116,21 @@ static void SetNameFromDcert(CertName* cn, DecodedCert* decoded)
if (decoded->subjectBC) { if (decoded->subjectBC) {
sz = (decoded->subjectBCLen < CTC_NAME_SIZE) ? decoded->subjectBCLen sz = (decoded->subjectBCLen < CTC_NAME_SIZE) ? decoded->subjectBCLen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->busCat, decoded->subjectBC, CTC_NAME_SIZE); XSTRNCPY(cn->busCat, decoded->subjectBC, sz);
cn->busCat[sz] = '\0'; cn->busCat[sz] = '\0';
cn->busCatEnc = decoded->subjectBCEnc; cn->busCatEnc = decoded->subjectBCEnc;
} }
if (decoded->subjectJC) { if (decoded->subjectJC) {
sz = (decoded->subjectJCLen < CTC_NAME_SIZE) ? decoded->subjectJCLen sz = (decoded->subjectJCLen < CTC_NAME_SIZE) ? decoded->subjectJCLen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->joiC, decoded->subjectJC, CTC_NAME_SIZE); XSTRNCPY(cn->joiC, decoded->subjectJC, sz);
cn->joiC[sz] = '\0'; cn->joiC[sz] = '\0';
cn->joiCEnc = decoded->subjectJCEnc; cn->joiCEnc = decoded->subjectJCEnc;
} }
if (decoded->subjectJS) { if (decoded->subjectJS) {
sz = (decoded->subjectJSLen < CTC_NAME_SIZE) ? decoded->subjectJSLen sz = (decoded->subjectJSLen < CTC_NAME_SIZE) ? decoded->subjectJSLen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->joiSt, decoded->subjectJS, CTC_NAME_SIZE); XSTRNCPY(cn->joiSt, decoded->subjectJS, sz);
cn->joiSt[sz] = '\0'; cn->joiSt[sz] = '\0';
cn->joiStEnc = decoded->subjectJSEnc; cn->joiStEnc = decoded->subjectJSEnc;
} }
@@ -13138,7 +13138,7 @@ static void SetNameFromDcert(CertName* cn, DecodedCert* decoded)
if (decoded->subjectEmail) { if (decoded->subjectEmail) {
sz = (decoded->subjectEmailLen < CTC_NAME_SIZE) sz = (decoded->subjectEmailLen < CTC_NAME_SIZE)
? decoded->subjectEmailLen : CTC_NAME_SIZE - 1; ? decoded->subjectEmailLen : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->email, decoded->subjectEmail, CTC_NAME_SIZE); XSTRNCPY(cn->email, decoded->subjectEmail, sz);
cn->email[sz] = '\0'; cn->email[sz] = '\0';
} }
} }