the latest tfm version has fp_rand() available, so we can test this now

This commit is contained in:
Steffen Jaeckel 2017-03-22 18:59:56 +01:00
parent a4671110d5
commit fec05471ae
3 changed files with 12 additions and 9 deletions

View File

@ -7,6 +7,7 @@ addons:
packages:
- binutils
- libtommath-dev
- libtfm-dev
before_script:
- gem install coveralls-lcov
@ -22,9 +23,9 @@ branches:
compiler:
- gcc
- clang
script: bash "${BUILDSCRIPT}" "${BUILDNAME}" "${BUILDOPTIONS}" "makefile V=1" "-DUSE_LTM -DLTM_DESC -I/usr/include" "/usr/lib/x86_64-linux-gnu/libtommath.a"
script:
- bash "${BUILDSCRIPT}" "${BUILDNAME}" "${BUILDOPTIONS}" "makefile" "-DUSE_LTM -DLTM_DESC -DTFM_DESC -I/usr/include" "/usr/lib/x86_64-linux-gnu/libtommath.a"
- bash "${BUILDSCRIPT}" "${BUILDNAME}" "${BUILDOPTIONS}" "makefile.shared" "-DUSE_TFM -DLTM_DESC -DTFM_DESC -I/usr/include" "/usr/lib/x86_64-linux-gnu/libtfm.so"
env:
- |
BUILDSCRIPT="check_source.sh"

View File

@ -492,11 +492,6 @@
#define LTC_PKCS_1
#endif
#if defined(TFM_DESC) && defined(LTC_RSA_BLINDING)
#warning RSA blinding currently not supported in combination with TFM
#undef LTC_RSA_BLINDING
#endif
#if defined(LTC_PELICAN) && !defined(LTC_RIJNDAEL)
#error Pelican-MAC requires LTC_RIJNDAEL
#endif

View File

@ -699,6 +699,13 @@ static int tfm_ecc_projective_add_point(ecc_point *P, ecc_point *Q, ecc_point *R
#endif
static int set_rand(void *a, int size)
{
LTC_ARGCHK(a != NULL);
fp_rand(a, size);
return CRYPT_OK;
}
const ltc_math_descriptor tfm_desc = {
"TomsFastMath",
@ -788,7 +795,7 @@ const ltc_math_descriptor tfm_desc = {
&addmod,
&submod,
NULL,
set_rand,
};