Sanity.

CVS patchset: 5489
CVS date: 2002/06/15 18:11:05

diff --git a/beecrypt/aes.c b/beecrypt/aes.c
index e0f6d06..2b2bd8c 100644 (file)
--- a/beecrypt/aes.c
+++ b/beecrypt/aes.c
@@ -30,6 +30,7 @@
 #include "mp32.h"
 #include "debug.h"
 
+/*@-exportheadervar -exportlocal@*/ /* FIX: tables needed by aes asm */
 /**
  */
 /*@observer@*/ /*@unchecked@*/
@@ -729,6 +730,7 @@ const uint32 _ad4[256] = {
     0xe1e1e1e1, 0x69696969, 0x14141414, 0x63636363,
     0x55555555, 0x21212121, 0x0c0c0c0c, 0x7d7d7d7d
 };
+/*@=exportheadervar =exportlocal@*/
 
 /**
  */

diff --git a/beecrypt/beetest.c b/beecrypt/beetest.c
index cf568a4..80e1484 100644 (file)
--- a/beecrypt/beetest.c
+++ b/beecrypt/beetest.c
@@ -31,7 +31,7 @@
 #include "dhaes.h"
 #include "dlkp.h"
 #include "elgamal.h"
-#include "fips180.h"
+#include "sha1.h"
 #include "hmacmd5.h"
 #include "md5.h"
 #include "rsa.h"

diff --git a/beecrypt/config.h b/beecrypt/config.h
index abbffbd..40d61dd 100644 (file)
--- a/beecrypt/config.h
+++ b/beecrypt/config.h
@@ -50,7 +50,7 @@
 #define LEADING_UNDERSCORE     0
 #define NO_UNDERSCORES 1
 
-#define JAVAGLUE 1
+#define JAVAGLUE 0
 
 #define HAVE_ERRNO_H 1
 #define HAVE_STRING_H 1

diff --git a/beecrypt/rsa.c b/beecrypt/rsa.c
index 56c9176..e15a73b 100644 (file)
--- a/beecrypt/rsa.c
+++ b/beecrypt/rsa.c
@@ -61,12 +61,12 @@ int rsapricrt(const rsakp* kp, const mp32number* m, mp32number* c)
        if (m->size > psize || m->size > qsize)
                return -1;
 
-       ptemp = (uint32*) malloc((6*psize+2)*sizeof(uint32));
-       if (ptemp == (uint32*) 0)
+       ptemp = (uint32*) malloc((6*psize+2)*sizeof(*ptemp));
+       if (ptemp == NULL)
                return -1;
 
-       qtemp = (uint32*) malloc((6*qsize+2)*sizeof(uint32));
-       if (qtemp == (uint32*) 0)
+       qtemp = (uint32*) malloc((6*qsize+2)*sizeof(*qtemp));
+       if (qtemp == NULL)
        {
                free(ptemp);
                return -1;