[Python-checkins] r43594 - in python/trunk: Doc/commontex/license.tex Misc/NEWS Modules/md5.c Modules/md5.h Modules/md5c.c Modules/md5module.c setup.py (original) (raw)

matthias.klose python-checkins at python.org
Mon Apr 3 18:27:51 CEST 2006


Author: matthias.klose Date: Mon Apr 3 18:27:50 2006 New Revision: 43594

Added: python/trunk/Modules/md5.c Removed: python/trunk/Modules/md5c.c Modified: python/trunk/Doc/commontex/license.tex python/trunk/Misc/NEWS python/trunk/Modules/md5.h python/trunk/Modules/md5module.c python/trunk/setup.py Log:

Modified: python/trunk/Doc/commontex/license.tex

-License is also granted to make and use derivative works provided -that such works are identified as "derived from the RSA Data -Security, Inc. MD5 Message-Digest Algorithm" in all material -mentioning or referencing the derived work.

-RSA Data Security, Inc. makes no representations concerning either -the merchantability of this software or the suitability of this -software for any particular purpose. It is provided "as is" -without express or implied warranty of any kind.

-These notices must be retained in any copies of any part of this -documentation and/or software.

Modified: python/trunk/Misc/NEWS

--- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Mon Apr 3 18:27:50 2006 @@ -491,6 +491,9 @@ - datetime.datetime() now has a strptime class method which can be used to create datetime object using a string and format. +- Patch #360466: Replace the MD5 implementation from RSA Data Security Inc + with the implementation from http://sourceforge.net/projects/libmd5-rfc/. + Library

Added: python/trunk/Modules/md5.c

--- (empty file) +++ python/trunk/Modules/md5.c Mon Apr 3 18:27:50 2006 @@ -0,0 +1,381 @@ +/*

+#include <string.h> + +#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown / +#ifdef ARCH_IS_BIG_ENDIAN +# define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1) +#else +# define BYTE_ORDER 0 +#endif + +#define T_MASK ((md5_word_t)~0) +#define T1 / 0xd76aa478 / (T_MASK ^ 0x28955b87) +#define T2 / 0xe8c7b756 / (T_MASK ^ 0x173848a9) +#define T3 0x242070db +#define T4 / 0xc1bdceee / (T_MASK ^ 0x3e423111) +#define T5 / 0xf57c0faf / (T_MASK ^ 0x0a83f050) +#define T6 0x4787c62a +#define T7 / 0xa8304613 / (T_MASK ^ 0x57cfb9ec) +#define T8 / 0xfd469501 / (T_MASK ^ 0x02b96afe) +#define T9 0x698098d8 +#define T10 / 0x8b44f7af / (T_MASK ^ 0x74bb0850) +#define T11 / 0xffff5bb1 / (T_MASK ^ 0x0000a44e) +#define T12 / 0x895cd7be / (T_MASK ^ 0x76a32841) +#define T13 0x6b901122 +#define T14 / 0xfd987193 / (T_MASK ^ 0x02678e6c) +#define T15 / 0xa679438e / (T_MASK ^ 0x5986bc71) +#define T16 0x49b40821 +#define T17 / 0xf61e2562 / (T_MASK ^ 0x09e1da9d) +#define T18 / 0xc040b340 / (T_MASK ^ 0x3fbf4cbf) +#define T19 0x265e5a51 +#define T20 / 0xe9b6c7aa / (T_MASK ^ 0x16493855) +#define T21 / 0xd62f105d / (T_MASK ^ 0x29d0efa2) +#define T22 0x02441453 +#define T23 / 0xd8a1e681 / (T_MASK ^ 0x275e197e) +#define T24 / 0xe7d3fbc8 / (T_MASK ^ 0x182c0437) +#define T25 0x21e1cde6 +#define T26 / 0xc33707d6 / (T_MASK ^ 0x3cc8f829) +#define T27 / 0xf4d50d87 / (T_MASK ^ 0x0b2af278) +#define T28 0x455a14ed +#define T29 / 0xa9e3e905 / (T_MASK ^ 0x561c16fa) +#define T30 / 0xfcefa3f8 / (T_MASK ^ 0x03105c07) +#define T31 0x676f02d9 +#define T32 / 0x8d2a4c8a / (T_MASK ^ 0x72d5b375) +#define T33 / 0xfffa3942 / (T_MASK ^ 0x0005c6bd) +#define T34 / 0x8771f681 / (T_MASK ^ 0x788e097e) +#define T35 0x6d9d6122 +#define T36 / 0xfde5380c / (T_MASK ^ 0x021ac7f3) +#define T37 / 0xa4beea44 / (T_MASK ^ 0x5b4115bb) +#define T38 0x4bdecfa9 +#define T39 / 0xf6bb4b60 / (T_MASK ^ 0x0944b49f) +#define T40 / 0xbebfbc70 / (T_MASK ^ 0x4140438f) +#define T41 0x289b7ec6 +#define T42 / 0xeaa127fa / (T_MASK ^ 0x155ed805) +#define T43 / 0xd4ef3085 / (T_MASK ^ 0x2b10cf7a) +#define T44 0x04881d05 +#define T45 / 0xd9d4d039 / (T_MASK ^ 0x262b2fc6) +#define T46 / 0xe6db99e5 / (T_MASK ^ 0x1924661a) +#define T47 0x1fa27cf8 +#define T48 / 0xc4ac5665 / (T_MASK ^ 0x3b53a99a) +#define T49 / 0xf4292244 / (T_MASK ^ 0x0bd6ddbb) +#define T50 0x432aff97 +#define T51 / 0xab9423a7 / (T_MASK ^ 0x546bdc58) +#define T52 / 0xfc93a039 / (T_MASK ^ 0x036c5fc6) +#define T53 0x655b59c3 +#define T54 / 0x8f0ccc92 / (T_MASK ^ 0x70f3336d) +#define T55 / 0xffeff47d / (T_MASK ^ 0x00100b82) +#define T56 / 0x85845dd1 / (T_MASK ^ 0x7a7ba22e) +#define T57 0x6fa87e4f +#define T58 / 0xfe2ce6e0 / (T_MASK ^ 0x01d3191f) +#define T59 / 0xa3014314 / (T_MASK ^ 0x5cfebceb) +#define T60 0x4e0811a1 +#define T61 / 0xf7537e82 / (T_MASK ^ 0x08ac817d) +#define T62 / 0xbd3af235 / (T_MASK ^ 0x42c50dca) +#define T63 0x2ad7d2bb +#define T64 / 0xeb86d391 */ (T_MASK ^ 0x14792c6e) + + +static void +md5_process(md5_state_t pms, const md5_byte_t data /[64]/) +{

+#if BYTE_ORDER > 0

+#else

+#endif +

+#if BYTE_ORDER == 0 + /* + * Determine dynamically whether this is a big-endian or + * little-endian machine, since we can use a more efficient + * algorithm on the latter. + / + static const int w = 1; + + if (((const md5_byte_t )&w)) / dynamic little-endian / +#endif +#if BYTE_ORDER <= 0 /* little-endian */ + { + /* + * On little-endian machines, we can process properly aligned + * data without copying it. + */ + if (!((data - (const md5_byte_t *)0) & 3)) { + /* data are properly aligned */ + X = (const md5_word_t *)data; + } else { + /* not aligned */ + memcpy(xbuf, data, 64); + X = xbuf; + } + } +#endif +#if BYTE_ORDER == 0 + else /* dynamic big-endian */ +#endif +#if BYTE_ORDER >= 0 / big-endian / + { + / + * On big-endian machines, we must arrange the bytes in the + * right order. + */ + const md5_byte_t xp = data; + int i; + +# if BYTE_ORDER == 0 + X = xbuf; / (dynamic only) / +# else +# define xbuf X / (static only) */ +# endif + for (i = 0; i < 16; ++i, xp += 4) + xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24); + } +#endif

+#define F(x, y, z) (((x) & (y)) | (~(x) & (z))) +#define SET(a, b, c, d, k, s, Ti)\

+#undef SET +

+#define G(x, y, z) (((x) & (z)) | ((y) & ~(z))) +#define SET(a, b, c, d, k, s, Ti)\

+#undef SET +

+#define H(x, y, z) ((x) ^ (y) ^ (z)) +#define SET(a, b, c, d, k, s, Ti)\

+#undef SET +

+#define I(x, y, z) ((y) ^ ((x) | ~(z))) +#define SET(a, b, c, d, k, s, Ti)\

+#undef SET +

+} + +void +md5_init(md5_state_t *pms) +{

+} + +void +md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes) +{

Modified: python/trunk/Modules/md5.h

-License is also granted to make and use derivative works provided -that such works are identified as "derived from the RSA Data -Security, Inc. MD5 Message-Digest Algorithm" in all material -mentioning or referencing the derived work.

-RSA Data Security, Inc. makes no representations concerning either -the merchantability of this software or the suitability of this -software for any particular purpose. It is provided "as is" -without express or implied warranty of any kind. + L. Peter Deutsch + ghost at aladdin.com -These notices must be retained in any copies of any part of this -documentation and/or software. + / +/ IdIdId / +/ + Independent implementation of MD5 (RFC 1321). + + This code implements the MD5 Algorithm defined in RFC 1321, whose + text is available at + http://www.ietf.org/rfc/rfc1321.txt + The code is derived from the text of the RFC, including the test suite + (section A.5) but excluding the rest of Appendix A. It does not include + any code or documentation that is identified in the RFC as being + copyrighted. + + The original and principal author of md5.h is L. Peter Deutsch + <ghost at aladdin.com>. Other authors are noted in the change history + that follows (in reverse chronological order): + + 2002-04-13 lpd Removed support for non-ANSI compilers; removed + references to Ghostscript; clarified derivation from RFC 1321; + now handles byte order either statically or dynamically. + 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. + 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5); + added conditionalization for C++ compilation from Martin + Purschke <purschke at bnl.gov>. + 1999-05-03 lpd Original version. / -/ ========== include global.h ========== / -/ GLOBAL.H - RSAREF types and constants +#ifndef md5_INCLUDED +# define md5_INCLUDED + +/* + * This package supports both compile-time and run-time determination of CPU + * byte order. If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be + * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is + * defined as non-zero, the code will be compiled to run only on big-endian + * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to + * run on either big- or little-endian CPUs, but will run slightly less + * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined. / -/ POINTER defines a generic pointer type */ -typedef unsigned char POINTER; +typedef unsigned char md5_byte_t; / 8-bit byte / +typedef unsigned int md5_word_t; / 32-bit word / -/ UINT4 defines a four byte word / -#if SIZEOF_LONG == 4 -typedef unsigned long int UINT4; -#elif SIZEOF_SHORT == 4 -typedef unsigned short int UINT4; -#elif INT_MAX == 2147483647 -typedef unsigned int UINT4; -#else -#error "Can't find a 4-byte integral type" +/ Define the state of the MD5 Algorithm. / +typedef struct md5_state_s { + md5_word_t count[2]; / message length in bits, lsw first / + md5_word_t abcd[4]; / digest buffer / + md5_byte_t buf[64]; / accumulate block / +} md5_state_t; + +#ifdef __cplusplus +extern "C" +{ #endif -/ ========== End global.h; continue md5.h ========== / +/ Initialize the algorithm. */ +void md5_init(md5_state_t pms); + +/ Append a string to the message. */ +void md5_append(md5_state_t *pms, const md5_byte_t data, int nbytes); + +/ Finish the message and return the digest. */ +void md5_finish(md5_state_t pms, md5_byte_t digest[16]); + +#ifdef __cplusplus +} / end extern "C" / +#endif -/ MD5 context. / -typedef struct { - UINT4 state[4]; / state (ABCD) / - UINT4 count[2]; / number of bits, modulo 2^64 (lsb first) / - unsigned char buffer[64]; / input buffer */ -} MD5_CTX;

-/* Rename all exported symbols to avoid conflicts with similarly named - symbols in some systems' standard C libraries... */

-#define MD5Init _Py_MD5Init -#define MD5Update _Py_MD5Update -#define MD5Final _Py_MD5Final

-void MD5Init(MD5_CTX *); -void MD5Update(MD5_CTX *, unsigned char *, unsigned int); -void MD5Final(unsigned char [16], MD5_CTX ); +#endif / md5_INCLUDED */

Deleted: /python/trunk/Modules/md5c.c

--- /python/trunk/Modules/md5c.c Mon Apr 3 18:27:50 2006 +++ (empty file) @@ -1,289 +0,0 @@ -/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm - */

-License to copy and use this software is granted provided that it -is identified as the "RSA Data Security, Inc. MD5 Message-Digest -Algorithm" in all material mentioning or referencing this software -or this function.

-License is also granted to make and use derivative works provided -that such works are identified as "derived from the RSA Data -Security, Inc. MD5 Message-Digest Algorithm" in all material -mentioning or referencing the derived work.

-RSA Data Security, Inc. makes no representations concerning either -the merchantability of this software or the suitability of this -software for any particular purpose. It is provided "as is" -without express or implied warranty of any kind.

-These notices must be retained in any copies of any part of this -documentation and/or software. - */

-#include "Python.h" -#include "md5.h"

-/* Constants for MD5Transform routine. */

-#define S11 7 -#define S12 12 -#define S13 17 -#define S14 22 -#define S21 5 -#define S22 9 -#define S23 14 -#define S24 20 -#define S31 4 -#define S32 11 -#define S33 16 -#define S34 23 -#define S41 6 -#define S42 10 -#define S43 15 -#define S44 21

-static void MD5Transform(UINT4[4], unsigned char[64]);

-}

-}

-};

-/* F, G, H and I are basic MD5 functions. */ -#define F(x, y, z) (((x) & (y)) | ((x) & (z))) -#define G(x, y, z) (((x) & (z)) | ((y) & (z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) -#define I(x, y, z) ((y) ^ ((x) | (~z)))

-/* ROTATE_LEFT rotates x left n bits. */ -#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))

-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. - Rotation is separate from addition to prevent recomputation. - */ -#define FF(a, b, c, d, x, s, ac) {
- (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac);
- (a) = ROTATE_LEFT ((a), (s));
- (a) += (b);
- } -#define GG(a, b, c, d, x, s, ac) {
- (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac);
- (a) = ROTATE_LEFT ((a), (s));
- (a) += (b);
- } -#define HH(a, b, c, d, x, s, ac) {
- (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac);
- (a) = ROTATE_LEFT ((a), (s));
- (a) += (b);
- } -#define II(a, b, c, d, x, s, ac) {
- (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac);
- (a) = ROTATE_LEFT ((a), (s));
- (a) += (b);
- }

-}

-}

-/* MD5 finalization. Ends an MD5 message-digest operation, writing the - message digest and zeroing the context. - */ -void -MD5Final(unsigned char digest[16], MD5_CTX *context) -{ - unsigned char bits[8]; - unsigned int index, padLen;

-}

-}

Modified: python/trunk/Modules/md5module.c

--- python/trunk/Modules/md5module.c (original) +++ python/trunk/Modules/md5module.c Mon Apr 3 18:27:50 2006 @@ -15,7 +15,7 @@

typedef struct { PyObject_HEAD

} md5object;

static PyTypeObject MD5type; @@ -31,7 +31,7 @@ if (md5p == NULL) return NULL;

@@ -56,7 +56,7 @@ if (!PyArg_ParseTuple(args, "s#:update", &cp, &len)) return NULL;

@@ -73,12 +73,12 @@ static PyObject * md5_digest(md5object *self) {

@@ -94,14 +94,14 @@ static PyObject * md5_hexdigest(md5object *self) {

@@ -272,7 +272,7 @@ return NULL;

 if (cp)

Modified: python/trunk/setup.py

--- python/trunk/setup.py (original) +++ python/trunk/setup.py Mon Apr 3 18:27:50 2006 @@ -549,8 +549,8 @@ exts.append( Extension('_sha', ['shamodule.c']) ) # The _md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The



More information about the Python-checkins mailing list