/* test if keybits length is appropriate for mac */
if ((mackeybits < params->mac->keybitsmin) ||
- (params->mackeybits > params->mac->keybitsmax))
+ (((unsigned)params->mackeybits) > params->mac->keybitsmax))
return 0;
if (((mackeybits - params->mac->keybitsmin) % params->mac->keybitsinc) != 0)
/**
*/
-static int dhaes_pContextSetup(dhaes_pContext* ctxt, const mpnumber* private, const mpnumber* public, const mpnumber* message, cipherOperation op)
+static int dhaes_pContextSetup(dhaes_pContext* ctxt, const mpnumber* privkey, const mpnumber* pubkey, const mpnumber* message, cipherOperation op)
/*@modifies ctxt @*/
{
register int rc;
/* compute the shared secret, Diffie-Hellman style */
mpnzero(&secret);
- if (dlsvdp_pDHSecret(&ctxt->param, private, public, &secret))
+ if (dlsvdp_pDHSecret(&ctxt->param, privkey, pubkey, &secret))
{
mpnfree(&secret);
free(digest);
if (ctxt->hash.algo->digestsize > 0)
{
byte* mackey = digest;
- byte* cipherkey = digest + ((ctxt->mackeybits + 7U) >> 3);
+ byte* cipherkey = digest + ((unsigned)(ctxt->mackeybits + 7) >> 3);
if ((rc = keyedHashFunctionContextSetup(&ctxt->mac, mackey, ctxt->mackeybits)))
goto setup_end;
printf(" encrypt/decrypt test block: ");
testBlockInit((uint8_t*) src_block, tmp->blocksize >> 2);
- (void) blockEncryptCBC(tmp, encrypt_param, enc_block, src_block, 2);
- (void) blockDecryptCBC(tmp, decrypt_param, dec_block, enc_block, 2);
+ (void) blockEncryptCBC(tmp, encrypt_param, enc_block, src_block, 2U);
+ (void) blockDecryptCBC(tmp, decrypt_param, dec_block, enc_block, 2U);
if (memcmp(dec_block, src_block, tmp->blocksize >> 2))
{
#if HAVE_TIME_H
tstart = clock();
#endif
- (void) blockEncryptECB(tmp, encrypt_param, spd_block, spd_block, 1024 * 1024);
+ (void) blockEncryptECB(tmp, encrypt_param, spd_block, spd_block, 1024U * 1024U);
#if HAVE_TIME_H
tstop = clock();
ttime = ((double)(tstop - tstart)) / CLOCKS_PER_SEC;
#if HAVE_TIME_H
tstart = clock();
#endif
- (void) blockDecryptECB(tmp, decrypt_param, spd_block, spd_block, 1024 * 1024);
+ (void) blockDecryptECB(tmp, decrypt_param, spd_block, spd_block, 1024U * 1024U);
#if HAVE_TIME_H
tstop = clock();
ttime = ((double)(tstop - tstart)) / CLOCKS_PER_SEC;
#if HAVE_TIME_H
tstart = clock();
#endif
- (void) blockEncryptCBC(tmp, encrypt_param, spd_block, spd_block, 1024 * 1024);
+ (void) blockEncryptCBC(tmp, encrypt_param, spd_block, spd_block, 1024U * 1024U);
#if HAVE_TIME_H
tstop = clock();
ttime = ((double)(tstop - tstart)) / CLOCKS_PER_SEC;
#if HAVE_TIME_H
tstart = clock();
#endif
- (void) blockDecryptCBC(tmp, decrypt_param, spd_block, spd_block, 1024 * 1024);
+ (void) blockDecryptCBC(tmp, decrypt_param, spd_block, spd_block, 1024U * 1024U);
#if HAVE_TIME_H
tstop = clock();
ttime = ((double)(tstop - tstart)) / CLOCKS_PER_SEC;