Spliddles.

CVS patchset: 6870
CVS date: 2003/05/22 18:05:07

diff --git a/beecrypt/dhaes.c b/beecrypt/dhaes.c
index 2c518c9..6c415a2 100644 (file)
--- a/beecrypt/dhaes.c
+++ b/beecrypt/dhaes.c
@@ -84,7 +84,7 @@ int dhaes_pUsable(const dhaes_pParameters* params)
 
        /* 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)
@@ -182,7 +182,7 @@ int dhaes_pContextFree(dhaes_pContext* ctxt)
 
 /**
  */
-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;
@@ -196,7 +196,7 @@ static int dhaes_pContextSetup(dhaes_pContext* ctxt, const mpnumber* private, co
 
        /* 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);
@@ -228,7 +228,7 @@ static int dhaes_pContextSetup(dhaes_pContext* ctxt, const mpnumber* private, co
        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;

diff --git a/beecrypt/tests/beetest.c b/beecrypt/tests/beetest.c
index 7477ff5..3a63590 100644 (file)
--- a/beecrypt/tests/beetest.c
+++ b/beecrypt/tests/beetest.c
@@ -273,8 +273,8 @@ static void testBlockCiphers(void)
                                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))
                                {
@@ -292,7 +292,7 @@ static void testBlockCiphers(void)
                                        #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;
@@ -301,7 +301,7 @@ static void testBlockCiphers(void)
                                        #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;
@@ -310,7 +310,7 @@ static void testBlockCiphers(void)
                                        #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;
@@ -319,7 +319,7 @@ static void testBlockCiphers(void)
                                        #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;