mars_nwe/mars-matrixssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Coverity scan fixes

Browse Source
This commit is contained in:
J Harper
2016-05-03 17:36:14 -07:00
parent b7583a12f6
commit ac16cf8a1b
64 changed files with 306 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
matrixssl/sslEncode.c
View File

@@ -1077,7 +1077,6 @@ int32 sslEncodeResponse(ssl_t *ssl, psBuf_t *out, uint32 *requiredLen)
return rc;
}
#ifdef USE_DTLS
if (ssl->flags & SSL_FLAGS_DTLS) {
/* This function takes care of writing out entire flights so we know
@@ -1487,7 +1486,6 @@ int32 sslEncodeResponse(ssl_t *ssl, psBuf_t *out, uint32 *requiredLen)
}
#endif
#ifdef ENABLE_SECURE_REHANDSHAKES
/*
The RenegotiationInfo extension lengths are well known
@@ -2128,7 +2126,6 @@ int32 sslEncodeResponse(ssl_t *ssl, psBuf_t *out, uint32 *requiredLen)
return sslEncodeResponse(ssl, out, &alertReqLen);
}
#ifdef USE_SERVER_SIDE_SSL
/* Post-flight write PKA operation. Support is for the signature
generation during ServerKeyExchange write. */
@@ -3190,7 +3187,6 @@ static int32 writeServerHello(ssl_t *ssl, sslBuf_t *out)
extLen += 4;
}
#ifdef USE_STATELESS_SESSION_TICKETS
if (ssl->sid && ssl->sid->sessionTicketState == SESS_TICKET_STATE_RECVD_EXT) {
if (extLen == 0) {
@@ -3356,7 +3352,6 @@ static int32 writeServerHello(ssl_t *ssl, sslBuf_t *out)
*c = 0; c++;
}
#ifdef USE_STATELESS_SESSION_TICKETS
if (ssl->sid &&
ssl->sid->sessionTicketState == SESS_TICKET_STATE_RECVD_EXT) {
@@ -3909,7 +3904,6 @@ static int32 writeServerKeyExchange(ssl_t *ssl, sslBuf_t *out, uint32 pLen,
*c = (ssl->keys->privKey.keysize & 0xFF00) >> 8; c++;
*c = ssl->keys->privKey.keysize & 0xFF; c++;
#ifdef USE_DTLS
if ((ssl->flags & SSL_FLAGS_DTLS) && (ssl->retransmit == 1)) {
/* It is not optimal to have run through the above digest updates
@@ -4132,7 +4126,8 @@ static int32 writeMultiRecordCertificate(ssl_t *ssl, sslBuf_t *out,
psX509Cert_t *cert, *future;
unsigned char *c, *end, *encryptStart;
uint8_t padLen;
uint16_t messageSize, certLen;
uint16_t messageSize;
uint32_t certLen;
int32_t rc;
int32 midWrite, midSizeWrite, countDown, firstOne = 1;
@@ -4286,6 +4281,9 @@ static int32 writeMultiRecordCertificate(ssl_t *ssl, sslBuf_t *out,
*c = (certLen & 0xFF00) >> 8; c++; countDown--;
midSizeWrite = 1;
if (countDown != 0) {
#ifdef TODO
/* Cannot reach here!, countdown is always zero */
#endif
*c = (certLen & 0xFF); c++; countDown--;
midSizeWrite = 0;
}
@@ -4653,6 +4651,19 @@ static int32 writeAlert(ssl_t *ssl, unsigned char level,
uint16_t messageSize;
int32_t rc;
#ifdef USE_SSL_HANDSHAKE_MSG_TRACE
if (ssl->flags & SSL_FLAGS_SERVER) {
psTraceHs("<<< Server");
} else {
psTraceHs("<<< Client");
}
if (description == SSL_ALERT_CLOSE_NOTIFY) {
psTraceHs(" creating ALERT (CLOSE_NOTIFY) message\n");
} else {
psTraceHs(" creating ALERT message\n");
}
#endif
psTraceIntInfo("Creating alert %d\n", description);
c = out->end;
end = out->buf + out->size;
messageSize = 2 + ssl->recordHeadLen;
@@ -4683,7 +4694,6 @@ static int32 writeAlert(ssl_t *ssl, unsigned char level,
return MATRIXSSL_SUCCESS;
}
#ifdef USE_CLIENT_SIDE_SSL
#ifdef USE_TRUSTED_CA_INDICATION
static int32_t trustedCAindicationExtLen(psX509Cert_t *certs)
@@ -4773,7 +4783,6 @@ int32_t matrixSslEncodeClientHello(ssl_t *ssl, sslBuf_t *out,
sslInitHSHash(ssl);
cookieLen = 0;
#ifdef USE_DTLS
if (ssl->flags & SSL_FLAGS_DTLS) {
@@ -4912,7 +4921,6 @@ int32_t matrixSslEncodeClientHello(ssl_t *ssl, sslBuf_t *out,
}
#endif
#ifdef ENABLE_SECURE_REHANDSHAKES
/* Subsequent CLIENT_HELLOs must use a populated RenegotiationInfo extension */
if (ssl->myVerifyDataLen != 0) {
@@ -5309,7 +5317,7 @@ int32_t matrixSslEncodeClientHello(ssl_t *ssl, sslBuf_t *out,
*c = EXT_ELLIPTIC_CURVE & 0xFF; c++;
*c = ((curveListLen + 2) & 0xFF00) >> 8; c++;
*c = (curveListLen + 2) & 0xFF; c++;
*c = (curveListLen & 0xFF00) >> 8; c++;
*c = 0; c++; /* High byte always zero */
*c = curveListLen & 0xFF; c++;
memcpy(c, eccCurveList, curveListLen);
c += curveListLen;
@@ -5486,7 +5494,6 @@ static int32 writeClientKeyExchange(ssl_t *ssl, sslBuf_t *out)
return PS_PLATFORM_FAIL;
}
#ifdef USE_PSK_CIPHER_SUITE
if (ssl->flags & SSL_FLAGS_PSK_CIPHER) {
/* Get the key id to send in the clientKeyExchange message. */
@@ -5643,7 +5650,6 @@ static int32 writeClientKeyExchange(ssl_t *ssl, sslBuf_t *out)
}
}
#ifdef USE_DTLS
if ((ssl->flags & SSL_FLAGS_DTLS) && (ssl->retransmit == 1)) {
/*
@@ -5929,7 +5935,6 @@ static int32 nowDoCvPka(ssl_t *ssl, psBuf_t *out)
return PS_MEM_FAIL;
}
#ifdef USE_TLS_1_2
/* Tweak if needed */
if (ssl->flags & SSL_FLAGS_TLS_1_2) {
@@ -6006,7 +6011,6 @@ static int32 nowDoCvPka(ssl_t *ssl, psBuf_t *out)
#endif /* USE_DTLS */
clearPkaAfter(ssl);
} else {
#endif /* USE_ECC */
@@ -6090,7 +6094,6 @@ static int32 nowDoCvPka(ssl_t *ssl, psBuf_t *out)
#endif /* USE_TLS_1_2 */
#else /* RSA is the 'default' so if that didn't get hit there is a problem */
psTraceInfo("There is no handler for writeCertificateVerify. ERROR\n");
return MATRIXSSL_ERROR;
@@ -6122,7 +6125,6 @@ static int32 writeCertificateVerify(ssl_t *ssl, sslBuf_t *out)
c = out->end;
end = out->buf + out->size;
if ((pkaAfter = getPkaAfter(ssl)) == NULL) {
psTraceInfo("getPkaAfter error for certVerify\n");
return MATRIXSSL_ERROR;
@@ -6397,7 +6399,6 @@ static int32 writeCertificateVerify(ssl_t *ssl, sslBuf_t *out)
#endif /* USE_CLIENT_AUTH */
#endif /* !USE_ONLY_PSK_CIPHER_SUITE */
#else /* USE_CLIENT_SIDE_SSL */
/******************************************************************************/
/*
@@ -6413,7 +6414,6 @@ int32_t matrixSslEncodeClientHello(ssl_t *ssl, sslBuf_t *out,
}
#endif /* USE_CLIENT_SIDE_SSL */
#ifndef USE_ONLY_PSK_CIPHER_SUITE
#if defined(USE_SERVER_SIDE_SSL) && defined(USE_CLIENT_AUTH)
/******************************************************************************/