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

27
crypto/math/pstm.c
View File

@@ -34,10 +34,7 @@
#include "../cryptoApi.h"
#if defined(USE_MATRIX_RSA) || defined(USE_CL_RSA) \
|| defined(USE_MATRIX_ECC) \
|| defined(USE_MATRIX_DH) || defined(USE_CL_DH) \
|| defined(USE_QUICK_ASSIST_RSA) || defined(USE_QUICK_ASSIST_ECC)
#if defined(USE_MATRIX_RSA) || defined(USE_MATRIX_ECC) || defined(USE_MATRIX_DH) || defined(USE_CL_RSA) || defined(USE_CL_DH) || defined(USE_QUICK_ASSIST_RSA) || defined(USE_QUICK_ASSIST_ECC)
static int32_t pstm_mul_2d(const pstm_int *a, int16_t b, pstm_int *c);
@@ -167,6 +164,20 @@ int32_t pstm_copy(const pstm_int * a, pstm_int * b)
return PSTM_OKAY;
}
/******************************************************************************/
/**
b = |a|.
Copy 'a' to 'b' and make positive.
*/
int32_t pstm_abs(const pstm_int *a, pstm_int *b)
{
if (pstm_copy(a, b) != PSTM_OKAY) {
return PSTM_MEM;
}
b->sign = 0;
return PSTM_OKAY;
}
/******************************************************************************/
/**
Trim unused digits.
@@ -2242,7 +2253,9 @@ int32_t pstm_invmod(psPool_t *pool, const pstm_int *a, const pstm_int *b, pstm_i
}
/* we need y = |a| */
pstm_abs(a, &y);
if ((res = pstm_abs(a, &y)) != PSTM_OKAY) {
goto LBL_X;
}
/* 3. u=x, v=y, A=1, B=0, C=0,D=1 */
if ((res = pstm_init_copy(pool, &u, &x, 0)) != PSTM_OKAY) {
@@ -2360,9 +2373,7 @@ LBL_X: pstm_clear(&x);
/******************************************************************************/
#endif /* USE_MATRIX_RSA || USE_CL_RSA || USE_MATRIX_ECC || USE_MATRIX_DH \
|| USE_CL_DH || USE_QUICK_ASSIST_RSA || USE_QUICK_ASSIST_ECC */
#endif /* USE_MATRIX_RSA || USE_MATRIX_ECC || USE_MATRIX_DH || USE_CL_RSA || USE_CL_DH || USE_QUICK_ASSIST_RSA || USE_QUICK_ASSIST_ECC */
/******************************************************************************/

10
crypto/math/pstm.h
View File

@@ -37,10 +37,7 @@
#include "../cryptoApi.h"
#if defined(USE_MATRIX_RSA) || defined(USE_CL_RSA) \
|| defined(USE_MATRIX_ECC) \
|| defined(USE_MATRIX_DH) || defined(USE_CL_DH) \
|| defined(USE_QUICK_ASSIST_RSA) || defined(USE_QUICK_ASSIST_ECC)
#if defined(USE_MATRIX_RSA) || defined(USE_MATRIX_ECC) || defined(USE_MATRIX_DH) || defined(USE_CL_RSA) || defined(USE_CL_DH) || defined(USE_QUICK_ASSIST_RSA) || defined(USE_QUICK_ASSIST_ECC)
#if defined(PS_PUBKEY_OPTIMIZE_FOR_FASTER_SPEED) && defined(PS_PUBKEY_OPTIMIZE_FOR_SMALLER_RAM)
#error "May only enable either PS_PUBKEY_OPTIMIZE_FOR_FASTER_SPEED or PS_PUBKEY_OPTIMIZE_FOR_SMALLER_RAM"
@@ -155,7 +152,6 @@ typedef struct {
#define pstm_iszero(a) (((a)->used == 0) ? PS_TRUE : PS_FALSE)
#define pstm_iseven(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 0)) ? PS_TRUE : PS_FALSE)
#define pstm_isodd(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? PS_TRUE : PS_FALSE)
#define pstm_abs(a, b) { pstm_copy(a, b); (b)->sign = 0; }
extern void pstm_set(pstm_int *a, pstm_digit b);
extern void pstm_zero(pstm_int *a);
@@ -172,6 +168,7 @@ extern void pstm_clamp(pstm_int *a);
extern int32_t pstm_copy(const pstm_int *a, pstm_int *b);
extern void pstm_exch(pstm_int *a, pstm_int *b);
extern int32_t pstm_abs(const pstm_int *a, pstm_int *b);
extern void pstm_clear(pstm_int *a);
extern void pstm_clear_multi(
@@ -238,8 +235,7 @@ extern int32_t pstm_montgomery_reduce(psPool_t *pool, pstm_int *a, const pstm_in
pstm_digit mp, pstm_digit *paD, uint16_t paDlen);
extern int32_t pstm_montgomery_calc_normalization(pstm_int *a, const pstm_int *b);
#endif /* USE_MATRIX_RSA || USE_MATRIX_ECC || USE_MATRIX_DH || USE_CL_RSA || USE_CL_DH || USE_QUICK_ASSIST_RSA || USE_QUICK_ASSIST_ECC */
#endif /* USE_MATRIX_RSA || USE_CL_RSA || USE_MATRIX_ECC || USE_MATRIX_DH \
|| USE_CL_DH || USE_QUICK_ASSIST_RSA || USE_QUICK_ASSIST_ECC */
#endif /* _h_PSTMATH */

4
crypto/math/pstm_montgomery_reduce.c
View File

@@ -261,7 +261,6 @@ asm( \
:"r0","%cc");
#endif /* __thumb2__ */
/******************************************************************************/
#elif defined(PSTM_MIPS)
/* MIPS32 */
@@ -300,7 +299,6 @@ asm( \
:"r"(cy),"r"(_c[0])\
:"$10");
/******************************************************************************/
#else
@@ -414,7 +412,7 @@ int32_t pstm_montgomery_reduce(psPool_t *pool, pstm_int *a, const pstm_int *m,
x = PS_MEM_FAIL;
}
}
if (paDlen < cSize) {
if (c && c != paD) {
psFree(c, pool);
}
return x;