Merge in latest beecrypt-3.0.0 changes.

CVS patchset: 6813
CVS date: 2003/05/05 16:02:02

1 files changed, 5 insertions, 36 deletions

diff --git a/beecrypt/beecrypt.c b/beecrypt/beecrypt.c
index bc5a45b4c..fd3c3fb06 100644
--- a/beecrypt/beecrypt.c
+++ b/beecrypt/beecrypt.c
@@ -53,10 +53,6 @@ typedef struct
 
 #include "debug.h"
 
-/*!\addtogroup ES_m
- * \{
- */
-
 /*@observer@*/ /*@unchecked@*/
 static entropySource entropySourceList[] =
 {
@@ -90,12 +86,12 @@ int entropySourceCount()
 	return ENTROPYSOURCES;
 }
 
-const entropySource* entropySourceGet(int index)
+const entropySource* entropySourceGet(int n)
 {
-	if ((index < 0) || (index >= ENTROPYSOURCES))
+	if ((n < 0) || (n >= ENTROPYSOURCES))
 		return (const entropySource*) 0;
 
-	return entropySourceList+index;
+	return entropySourceList+n;
 }
 
 const entropySource* entropySourceFind(const char* name)
@@ -146,11 +142,6 @@ int entropyGatherNext(byte* data, size_t size)
 	return -1;
 }
 
-/*!\}
- * \addtogroup PRNG_m
- * \{
- */
-
 /*@observer@*/ /*@unchecked@*/
 static const randomGenerator* randomGeneratorList[] =
 {
@@ -251,11 +242,6 @@ int randomGeneratorContextNext(randomGeneratorContext* ctxt, byte* data, size_t
 	return ctxt->rng->next(ctxt->param, data, size);
 }
 
-/*!\}
- * \addtogroup HASH_m
- * \{
- */
-
 /*@observer@*/ /*@unchecked@*/
 static const hashFunction* hashFunctionList[] =
 {
@@ -502,11 +488,6 @@ int hashFunctionContextDigestMatch(hashFunctionContext* ctxt, const mpnumber* d)
 	/*@=mustfree@*/
 }
 
-/*!\}
- * \addtogroup HMAC_m
- * \{
- */
-
 /*@observer@*/ /*@unchecked@*/
 static const keyedHashFunction* keyedHashFunctionList[] =
 {
@@ -770,11 +751,6 @@ int keyedHashFunctionContextDigestMatch(keyedHashFunctionContext* ctxt, const mp
 	/*@=mustfree@*/
 }
 
-/*!\}
- * \addtogroup BC_m
- * \{
- */
-
 /*@observer@*/ /*@unchecked@*/
 static const blockCipher* blockCipherList[] =
 {
@@ -900,9 +876,7 @@ int blockCipherContextFree(blockCipherContext* ctxt)
 	/*@=nullstate@*/
 }
 
-static /*@unused@*/
-int blockCipherContextECB(blockCipherContext* ctxt, void* dst, const void* src, int nblocks)
-	/*@modifies ctxt->param, dst @*/
+int blockCipherContextECB(blockCipherContext* ctxt, uint32_t* dst, const uint32_t* src, size_t nblocks)
 {
 	switch (ctxt->op)
 	{
@@ -923,9 +897,7 @@ int blockCipherContextECB(blockCipherContext* ctxt, void* dst, const void* src,
 	return -1;
 }
 
-static /*@unused@*/
-int blockCipherContextCBC(blockCipherContext* ctxt, void* dst, const void* src, int nblocks)
-	/*@modifies ctxt->param, dst @*/
+int blockCipherContextCBC(blockCipherContext* ctxt, uint32_t* dst, const uint32_t* src, size_t nblocks)
 {
 	switch (ctxt->op)
 	{
@@ -946,9 +918,6 @@ int blockCipherContextCBC(blockCipherContext* ctxt, void* dst, const void* src,
 	return -1;
 }
 
-/*!\}
- */
-
 #if WIN32
 __declspec(dllexport)
 BOOL WINAPI DllMain(HINSTANCE hInst, DWORD wDataSeg, LPVOID lpReserved)