Merge alpha100 branch back to main trunk

1 files changed, 62 insertions, 86 deletions

diff --git a/Modules/md5module.c b/Modules/md5module.c
index 6230cee..68d52f4 100644
--- a/Modules/md5module.c
+++ b/Modules/md5module.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
+Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
+Amsterdam, The Netherlands.
 
                         All Rights Reserved
 
@@ -21,44 +21,43 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
+
 /* MD5 module */
 
-/* This module provides an interface to a message digest algorithm,
-   MD5 in this case */
+/* This module provides an interface to the RSA Data Security,
+   Inc. MD5 Message-Digest Algorithm, described in RFC 1321.
+   It requires the files md5c.c and md5.h (which are slightly changed
+   from the versions in the RFC to avoid the "global.h" file.) */
+
 
 /* MD5 objects */
 
 #include "allobjects.h"
-#include "modsupport.h"		/* For getargs() etc. */
+#include "modsupport.h"
 
 #include "md5.h"
+
 typedef struct {
 	OB_HEAD
         MD5_CTX	md5;		/* the context holder */
 } md5object;
 
-extern typeobject MD5type;	/* Really static, forward */
+staticforward typeobject MD5type;
 
 #define is_md5object(v)		((v)->ob_type == &MD5type)
 
-/* #define MD5_DEBUG */
-
 static md5object *
 newmd5object()
 {
 	md5object *md5p;
 
-
-#ifdef MD5_DEBUG
-	fputs( "md5_object() called...\n", stderr );
-#endif /* def MD5_DEBUG */
 	md5p = NEWOBJ(md5object, &MD5type);
 	if (md5p == NULL)
 		return NULL;
 
 	MD5Init(&md5p->md5);	/* actual initialisation */
 	return md5p;
-} /* newmd5object() */
+}
 
 
 /* MD5 methods */
@@ -67,56 +66,20 @@ static void
 md5_dealloc(md5p)
 	md5object *md5p;
 {
-#ifdef MD5_DEBUG
-	fputs( "md5_dealloc() called...\n", stderr );
-#endif /* def MD5_DEBUG */
-
 	DEL(md5p);
-} /* md5_dealloc() */
-
-
-/* MD5 initialisation */
-
-static object *
-MD5_md5(self, args)
-	object *self;
-	object *args;
-{
-	md5object *md5p;
-	char *cp = (char *)NULL;
-	int len;
-	
-
-#ifdef MD5_DEBUG
-	fputs("MD5_md5() called...\n", stderr);
-#endif /* def MD5_DEBUG */
-
-	if (!getargs(args, "")) {
-		err_clear();
-		if (!getargs(args, "s#", &cp, &len))
-			return NULL;
-	}
-
-	if ((md5p = newmd5object()) == NULL)
-		return NULL;
-
-	if (cp)
-		MD5Update(&md5p->md5, cp, len);
-
-	return (object *)md5p;
-} /* MD5_md5() */
+}
 
 
 /* MD5 methods-as-attributes */
+
 static object *
 md5_update(self, args)
 	md5object *self;
 	object *args;
 {
-	char *cp;
+	unsigned char *cp;
 	int len;
 
-	
 	if (!getargs(args, "s#", &cp, &len))
 		return NULL;
 
@@ -124,9 +87,8 @@ md5_update(self, args)
 
 	INCREF(None);
 	return None;
-} /* md5_update() */
+}
 
-#define DIGESTLEN	16	/* this is used twice--walrus@umich.edu */
 static object *
 md5_digest(self, args)
 	md5object *self;
@@ -134,8 +96,7 @@ md5_digest(self, args)
 {
 
 	MD5_CTX mdContext;
-	char aDigest[DIGESTLEN];
-	
+	unsigned char aDigest[16];
 
 	if (!getnoarg(args))
 		return NULL;
@@ -144,9 +105,8 @@ md5_digest(self, args)
 	mdContext = self->md5;
 	MD5Final(aDigest, &mdContext);
 
-	return newsizedstringobject((char *)aDigest, DIGESTLEN);
-} /* md5_digest() */
-#undef DIGESTLEN
+	return newsizedstringobject((char *)aDigest, 16);
+}
 
 static object *
 md5_copy(self, args)
@@ -155,7 +115,6 @@ md5_copy(self, args)
 {
 	md5object *md5p;
 
-	
 	if (!getnoarg(args))
 		return NULL;
 
@@ -165,13 +124,12 @@ md5_copy(self, args)
 	md5p->md5 = self->md5;
 
 	return (object *)md5p;
-} /* md5_copy() */
+}
 
-		
 static struct methodlist md5_methods[] = {
-	{"update",		md5_update},
-	{"digest",		md5_digest},
-	{"copy",		md5_copy},
+	{"update",		(method)md5_update},
+	{"digest",		(method)md5_digest},
+	{"copy",		(method)md5_copy},
 	{NULL,			NULL}		/* sentinel */
 };
 
@@ -181,31 +139,56 @@ md5_getattr(self, name)
 	char *name;
 {
 	return findmethod(md5_methods, (object *)self, name);
-} /* md5_getattr() */
+}
 
-#ifndef _AIX
-static
-#endif
-typeobject MD5type = {
+static typeobject MD5type = {
 	OB_HEAD_INIT(&Typetype)
 	0,			/*ob_size*/
 	"md5",			/*tp_name*/
 	sizeof(md5object),	/*tp_size*/
 	0,			/*tp_itemsize*/
 	/* methods */
-	md5_dealloc,	/*tp_dealloc*/
-	0,		/*tp_print*/
-	md5_getattr,	/*tp_getattr*/
-	0,		/*tp_setattr*/
-	0,		/*tp_compare*/
-	0,		/*tp_repr*/
-        0,		 /*tp_as_number*/
+	(destructor)md5_dealloc, /*tp_dealloc*/
+	0,			/*tp_print*/
+	(getattrfunc)md5_getattr, /*tp_getattr*/
+	0,			/*tp_setattr*/
+	0,			/*tp_compare*/
+	0,			/*tp_repr*/
+        0,			/*tp_as_number*/
 };
 
+
+/* MD5 functions */
+
+static object *
+MD5_md5(self, args)
+	object *self;
+	object *args;
+{
+	md5object *md5p;
+	unsigned char *cp = NULL;
+	int len;
+
+	if (!getargs(args, "")) {
+		err_clear();
+		if (!getargs(args, "s#", &cp, &len))
+			return NULL;
+	}
+
+	if ((md5p = newmd5object()) == NULL)
+		return NULL;
+
+	if (cp)
+		MD5Update(&md5p->md5, cp, len);
+
+	return (object *)md5p;
+}
+
+
 /* List of functions exported by this module */
 
 static struct methodlist md5_functions[] = {
-	{"md5",			MD5_md5},
+	{"md5",			(method)MD5_md5},
 	{NULL,			NULL}		 /* Sentinel */
 };
 
@@ -215,12 +198,5 @@ static struct methodlist md5_functions[] = {
 void
 initmd5()
 {
-#ifdef MD5_DEBUG
-	fputs( "initmd5() called...\n", stderr );
-#endif /* def MD5_DEBUG */
 	(void)initmodule("md5", md5_functions);
-} /* initmd5() */
-
-#ifdef MAKEDUMMYINT
-int _md5_dummy_int;	/* XXX otherwise, we're .bss-less (DYNLOAD->Jack?) */
-#endif /* def MAKEDUMMYINT */
+}