diff --git a/ChangeLog b/ChangeLog index 80c999c1a0..60547d1337 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Aug 16 16:32:21 2001 Akinori MUSHA + + * LEGAL, ext/Setup*, ext/digest/*: Merge from 1.7: Import digest + modules. + + * ext/md5/*: Move to ext/digest/md5. + Thu Aug 16 03:54:36 2001 Usaku Nakamura * lib/mkmf.rb: add -I$(srcdir) to CPPFLAGS. diff --git a/LEGAL b/LEGAL index 39fbdca9ae..41a8deec29 100644 --- a/LEGAL +++ b/LEGAL @@ -118,6 +118,7 @@ missing/strftime.c: missing/strncasecmp.c: missing/strstr.c: missing/strtol.c: +ext/digest/sha1/sha1.[ch]: These files are all under public domain. @@ -198,8 +199,7 @@ missing/vsnprintf.c: From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change paragraph 3 above is now null and void. -ext/md5/md5c.c: -ext/md5/md5.h: +ext/digest/md5/md5.[ch]: These files are under the following license. Ruby uses modified versions of them. @@ -225,6 +225,59 @@ ext/md5/md5.h: L. Peter Deutsch ghost@aladdin.com +ext/digest/rmd160/rmd160.[ch]: + + These files have the following copyright information, and by the + author we are allowed to use it under the new-style BSD license. + + AUTHOR: Antoon Bosselaers, ESAT-COSIC + (Arranged for libc by Todd C. Miller) + DATE: 1 March 1996 + + Copyright (c) Katholieke Universiteit Leuven + 1996, All Rights Reserved + +ext/digest/rmd160/rmd160hl.c: +ext/digest/sha1/sha1hl.c: + + These files are under the beer-ware license. + + "THE BEER-WARE LICENSE" (Revision 42): + wrote this file. As long as you retain this notice you + can do whatever you want with this stuff. If we meet some day, and you think + this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp + +ext/digest/sha2/sha2.[ch]: +ext/digest/sha2/sha2hl.c: + + These files are under the new-style BSD license. + + Copyright 2000 Aaron D. Gifford. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + ext/nkf/nkf1.7/nkf.c: This file is under the following license. So to speak, it is @@ -242,7 +295,7 @@ ext/socket/addrinfo.h: ext/socket/getaddrinfo.c: ext/socket/getnameinfo.c: - These files are under the BSD license. + These files are under the new-style BSD license. Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. All rights reserved. diff --git a/ext/Setup b/ext/Setup index 039747115f..cc412e8667 100644 --- a/ext/Setup +++ b/ext/Setup @@ -3,10 +3,14 @@ #GD #curses #dbm +#digest +#digest/md5 +#digest/rmd160 +#digest/sha1 +#digest/sha2 #etc #fcntl #kconv -#md5 #pty #sdbm #socket diff --git a/ext/Setup.dj b/ext/Setup.dj index 6c955cba1e..3c01afa747 100644 --- a/ext/Setup.dj +++ b/ext/Setup.dj @@ -3,12 +3,16 @@ option nodynamic #GD #curses dbm +digest +digest/md5 +digest/rmd160 +digest/sha1 +digest/sha2 gdbm #etc fcntl nkf marshal -md5 readline sdbm #socket diff --git a/ext/Setup.emx b/ext/Setup.emx index dbb4b7a61c..c85f724d9f 100644 --- a/ext/Setup.emx +++ b/ext/Setup.emx @@ -3,10 +3,14 @@ option nodynamic #Win32API curses #dbm +digest +digest/md5 +digest/rmd160 +digest/sha1 +digest/sha2 etc fcntl #gdbm -md5 nkf #pty #readline diff --git a/ext/Setup.nt b/ext/Setup.nt index cd7969bb73..39b9030987 100644 --- a/ext/Setup.nt +++ b/ext/Setup.nt @@ -4,12 +4,16 @@ Win32API #curses #dbm +digest +digest/md5 +digest/rmd160 +digest/sha1 +digest/sha2 #etc fcntl #gdbm #gtk marshal -md5 nkf #pty #readline diff --git a/ext/Setup.x68 b/ext/Setup.x68 index 25adea2035..25e9544d76 100644 --- a/ext/Setup.x68 +++ b/ext/Setup.x68 @@ -3,10 +3,14 @@ option nodynamic #GD #curses dbm +digest +digest/md5 +digest/rmd160 +digest/sha1 +digest/sha2 #etc fcntl kconv marshal -md5 #socket #tkutil diff --git a/ext/md5/.cvsignore b/ext/md5/.cvsignore deleted file mode 100644 index f3c7a7c5da..0000000000 --- a/ext/md5/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/ext/md5/MANIFEST b/ext/md5/MANIFEST deleted file mode 100644 index 51b21eb5a2..0000000000 --- a/ext/md5/MANIFEST +++ /dev/null @@ -1,8 +0,0 @@ -MANIFEST -depend -extconf.rb -md5.txt -md5.txt.ja -md5.h -md5c.c -md5init.c diff --git a/ext/md5/depend b/ext/md5/depend deleted file mode 100644 index 14427861f8..0000000000 --- a/ext/md5/depend +++ /dev/null @@ -1,2 +0,0 @@ -md5c.o: md5c.c md5.h $(topdir)/config.h -md5init.o: md5init.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h md5.h diff --git a/ext/md5/extconf.rb b/ext/md5/extconf.rb deleted file mode 100644 index a57a976a39..0000000000 --- a/ext/md5/extconf.rb +++ /dev/null @@ -1,3 +0,0 @@ -require 'mkmf' -$CFLAGS += " -DHAVE_CONFIG_H" -create_makefile('md5') diff --git a/ext/md5/md5.h b/ext/md5/md5.h deleted file mode 100644 index 81a6d7ff36..0000000000 --- a/ext/md5/md5.h +++ /dev/null @@ -1,86 +0,0 @@ -/* MD5.H - header file for MD5C.C - */ - -/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All -rights reserved. - -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 global.h ========== */ -/* GLOBAL.H - RSAREF types and constants - */ - -/* PROTOTYPES should be set to one if and only if the compiler supports - function argument prototyping. -The following makes PROTOTYPES default to 0 if it has not already - been defined with C compiler flags. - */ -#ifdef HAVE_PROTOTYPES -#define PROTOTYPES 1 -#endif -#ifndef PROTOTYPES -#define PROTOTYPES 0 -#endif - -/* POINTER defines a generic pointer type */ -typedef unsigned char *POINTER; - -/* UINT2 defines a two byte word */ -typedef unsigned short int UINT2; - -#ifdef HAVE_LIMITS_H -#include -#else -/* Wild guess */ -#define LONG_MAX 2147483647L -#endif - -/* UINT4 defines a four byte word */ -#if defined(INT_MAX) && INT_MAX == 2147483647 -typedef unsigned int UINT4; -#else -#if defined(LONG_MAX) && LONG_MAX == 2147483647L -typedef unsigned long int UINT4; -#endif -/* Too bad if neither is */ -#endif - -/* PROTO_LIST is defined depending on how PROTOTYPES is defined above. -If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it - returns an empty list. - */ -#if PROTOTYPES -#define PROTO_LIST(list) list -#else -#define PROTO_LIST(list) () -#endif -/* ========== End global.h; continue md5.h ========== */ - -/* 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; - -void MD5Init PROTO_LIST ((MD5_CTX *)); -void MD5Update PROTO_LIST - ((MD5_CTX *, unsigned char *, unsigned int)); -void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *)); diff --git a/ext/md5/md5.txt b/ext/md5/md5.txt deleted file mode 100644 index 3fb55be1ea..0000000000 --- a/ext/md5/md5.txt +++ /dev/null @@ -1,50 +0,0 @@ -.\" md5.txt - -*- Indented-Text -*- created at: Fri Aug 2 12:01:27 JST 1996 - -** MD5(Class) - -A class to implement MD5 Message-Digest Algorithm by RSA Data -Security, Inc., described in RFC1321. - -Superclass: Object - -Class Methods: - - new([str]) - md5([str]) - - Creates a new MD5 object. If a string argument is given, it - is added to the object. (see update.) - -Methods: - - clone - - Copies the MD5 object. - - digest - - Returns the MD5 hash of the added strings as a string of 16 - bytes. - - hexdigest - - Returns the MD5 hash of the added strings as a string of 32 - hexadecimal digits. This method is equal to: - - def hexdigest - ret = '' - digest.each_byte {|i| ret << sprintf('%02x', i) } - ret - end - - update(str) - - Update the MD5 object with the string str. Repeated calls are - equivalent to a single call with the concatenation of all the - arguments, i.e. m.update(a); m.update(b) is equivalent to - m.update(a+b). - -------------------------------------------------------- -Local variables: -fill-column: 70 -end: diff --git a/ext/md5/md5.txt.ja b/ext/md5/md5.txt.ja deleted file mode 100644 index 44c64d57c5..0000000000 --- a/ext/md5/md5.txt.ja +++ /dev/null @@ -1,50 +0,0 @@ -.\" md5.txt.ja - -*- Indented-Text -*- created at: Fri Aug 2 12:01:27 JST 1996 - -** MD5(クラス) - -RFC1321に記述されているRSA Data Security, Inc. の MD5 Message-Digest -Algorithmを実装するクラス。 - -Superclass: Object - -Class Methods: - - new([str]) - md5([str]) - - 新しいMD5オブジェクトを生成する．文字列引数が与えられるとそれ - を追加する(see update)。 - -Methods: - - clone - - MD5オブジェクトの複製を作る。 - - digest - - 今までに追加した文字列に対するハッシュ値を16バイト長の文字列で - 返す。 - - hexdigest - - 今までに追加した文字列に対するハッシュ値を、ASCIIコードを使って - 16進数の列を示す'fe5c2235f48d2bcc911afabea23cd5aa'のような32文字 - の文字列にエンコードして返す。Rubyで書くと以下と同じ。 - - def hexdigest - ret = '' - digest.each_byte {|i| ret << sprintf('%02x', i) } - ret - end - - update(str) - - MD5オブジェクトに文字列を追加する。複数回updateを呼ぶことは文 - 字列を連結してupdateを呼ぶことと等しい。すなわち m.update(a); - m.update(b) は m.update(a+b) と等価である。 - -------------------------------------------------------- -Local variables: -fill-column: 70 -end: diff --git a/ext/md5/md5c.c b/ext/md5/md5c.c deleted file mode 100644 index d7c7e4fb27..0000000000 --- a/ext/md5/md5c.c +++ /dev/null @@ -1,337 +0,0 @@ -/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm - */ - -/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All -rights reserved. - -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. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#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 PROTO_LIST ((UINT4 [4], unsigned char [64])); -static void Encode PROTO_LIST - ((unsigned char *, UINT4 *, unsigned int)); -static void Decode PROTO_LIST - ((UINT4 *, unsigned char *, unsigned int)); -static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int)); -static void MD5_memset PROTO_LIST ((POINTER, int, unsigned int)); - -static unsigned char PADDING[64] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/* 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 initialization. Begins an MD5 operation, writing a new context. - */ -void MD5Init (context) -MD5_CTX *context; /* context */ -{ - context->count[0] = context->count[1] = 0; - /* Load magic initialization constants. -*/ - context->state[0] = 0x67452301; - context->state[1] = 0xefcdab89; - context->state[2] = 0x98badcfe; - context->state[3] = 0x10325476; -} - -/* MD5 block update operation. Continues an MD5 message-digest - operation, processing another message block, and updating the - context. - */ -void MD5Update (context, input, inputLen) -MD5_CTX *context; /* context */ -unsigned char *input; /* input block */ -unsigned int inputLen; /* length of input block */ -{ - unsigned int i, index, partLen; - - /* Compute number of bytes mod 64 */ - index = (unsigned int)((context->count[0] >> 3) & 0x3F); - - /* Update number of bits */ - if ((context->count[0] += ((UINT4)inputLen << 3)) - < ((UINT4)inputLen << 3)) - context->count[1]++; - context->count[1] += ((UINT4)inputLen >> 29); - - partLen = 64 - index; - - /* Transform as many times as possible. -*/ - if (inputLen >= partLen) { - MD5_memcpy - ((POINTER)&context->buffer[index], (POINTER)input, partLen); - MD5Transform (context->state, context->buffer); - - for (i = partLen; i + 63 < inputLen; i += 64) - MD5Transform (context->state, &input[i]); - - index = 0; - } - else - i = 0; - - /* Buffer remaining input */ - MD5_memcpy - ((POINTER)&context->buffer[index], (POINTER)&input[i], - inputLen-i); -} - -/* MD5 finalization. Ends an MD5 message-digest operation, writing the - the message digest and zeroizing the context. - */ -void MD5Final (digest, context) -unsigned char digest[16]; /* message digest */ -MD5_CTX *context; /* context */ -{ - unsigned char bits[8]; - unsigned int index, padLen; - - /* Save number of bits */ - Encode (bits, context->count, 8); - - /* Pad out to 56 mod 64. -*/ - index = (unsigned int)((context->count[0] >> 3) & 0x3f); - padLen = (index < 56) ? (56 - index) : (120 - index); - MD5Update (context, PADDING, padLen); - - /* Append length (before padding) */ - MD5Update (context, bits, 8); - - /* Store state in digest */ - Encode (digest, context->state, 16); - - /* Zeroize sensitive information. -*/ - MD5_memset ((POINTER)context, 0, sizeof (*context)); -} - -/* MD5 basic transformation. Transforms state based on block. - */ -static void MD5Transform (state, block) -UINT4 state[4]; -unsigned char block[64]; -{ - UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; - - Decode (x, block, 64); - - /* Round 1 */ - FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */ - FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */ - FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */ - FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */ - FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */ - FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */ - FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */ - FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */ - FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */ - FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */ - FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */ - FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */ - FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */ - FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */ - FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */ - FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */ - - /* Round 2 */ - GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */ - GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */ - GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */ - GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */ - GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */ - GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ - GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */ - GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */ - GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */ - GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */ - GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */ - GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */ - GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */ - GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */ - GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */ - GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */ - - /* Round 3 */ - HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */ - HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */ - HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */ - HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */ - HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */ - HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */ - HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */ - HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */ - HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */ - HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */ - HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */ - HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ - HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */ - HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */ - HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */ - HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */ - - /* Round 4 */ - II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */ - II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */ - II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */ - II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */ - II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */ - II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */ - II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */ - II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */ - II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */ - II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */ - II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */ - II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */ - II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */ - II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */ - II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */ - II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */ - - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - - /* Zeroize sensitive information. -*/ - MD5_memset ((POINTER)x, 0, sizeof (x)); -} - -/* Encodes input (UINT4) into output (unsigned char). Assumes len is - a multiple of 4. - */ -static void Encode (output, input, len) -unsigned char *output; -UINT4 *input; -unsigned int len; -{ - unsigned int i, j; - - for (i = 0, j = 0; j < len; i++, j += 4) { - output[j] = (unsigned char)(input[i] & 0xff); - output[j+1] = (unsigned char)((input[i] >> 8) & 0xff); - output[j+2] = (unsigned char)((input[i] >> 16) & 0xff); - output[j+3] = (unsigned char)((input[i] >> 24) & 0xff); - } -} - -/* Decodes input (unsigned char) into output (UINT4). Assumes len is - a multiple of 4. - */ -static void Decode (output, input, len) -UINT4 *output; -unsigned char *input; -unsigned int len; -{ - unsigned int i, j; - - for (i = 0, j = 0; j < len; i++, j += 4) - output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) | - (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24); -} - -/* Note: Replace "for loop" with standard memcpy if possible. - */ - -static void MD5_memcpy (output, input, len) -POINTER output; -POINTER input; -unsigned int len; -{ - unsigned int i; - - for (i = 0; i < len; i++) - output[i] = input[i]; -} - -/* Note: Replace "for loop" with standard memset if possible. - */ -static void MD5_memset (output, value, len) -POINTER output; -int value; -unsigned int len; -{ - unsigned int i; - - for (i = 0; i < len; i++) - ((char *)output)[i] = (char)value; -} diff --git a/ext/md5/md5init.c b/ext/md5/md5init.c deleted file mode 100644 index a57d5f8f30..0000000000 --- a/ext/md5/md5init.c +++ /dev/null @@ -1,114 +0,0 @@ -/************************************************ - - md5init.c - - - $Author$ - created at: Fri Aug 2 09:24:12 JST 1996 - - Copyright (C) 1995-1998 Yukihiro Matsumoto - -************************************************/ -/* 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.) */ - -#include "ruby.h" -#include "md5.h" - -static VALUE cMD5; - -static VALUE -md5_update(obj, str) - VALUE obj; - struct RString *str; -{ - MD5_CTX *md5; - - Check_Type(str, T_STRING); - Data_Get_Struct(obj, MD5_CTX, md5); - MD5Update(md5, str->ptr, str->len); - - return obj; -} - -static VALUE -md5_digest(obj) - VALUE obj; -{ - MD5_CTX *md5, ctx; - unsigned char digest[16]; - - Data_Get_Struct(obj, MD5_CTX, md5); - ctx = *md5; - MD5Final(digest, &ctx); - - return rb_str_new(digest, 16); -} - -static VALUE -md5_hexdigest(obj) - VALUE obj; -{ - MD5_CTX *md5, ctx; - unsigned char digest[16]; - char buf[33]; - int i; - - Data_Get_Struct(obj, MD5_CTX, md5); - ctx = *md5; - MD5Final(digest, &ctx); - - for (i=0; i<16; i++) { - sprintf(buf+i*2, "%02x", digest[i]); - } - return rb_str_new(buf, 32); -} - -static VALUE -md5_clone(obj) - VALUE obj; -{ - MD5_CTX *md5, *md5_new; - - Data_Get_Struct(obj, MD5_CTX, md5); - obj = Data_Make_Struct(CLASS_OF(obj), MD5_CTX, 0, free, md5_new); - *md5_new = *md5; - - return obj; -} - -static VALUE -md5_new(argc, argv, class) - int argc; - VALUE* argv; - VALUE class; -{ - VALUE arg, obj; - MD5_CTX *md5; - - rb_scan_args(argc, argv, "01", &arg); - if (!NIL_P(arg)) Check_Type(arg, T_STRING); - - obj = Data_Make_Struct(class, MD5_CTX, 0, free, md5); - MD5Init(md5); - if (!NIL_P(arg)) { - md5_update(obj, arg); - } - - return obj; -} - -void -Init_md5() -{ - cMD5 = rb_define_class("MD5", rb_cObject); - - rb_define_singleton_method(cMD5, "new", md5_new, -1); - rb_define_singleton_method(cMD5, "md5", md5_new, -1); - - rb_define_method(cMD5, "update", md5_update, 1); - rb_define_method(cMD5, "digest", md5_digest, 0); - rb_define_method(cMD5, "hexdigest", md5_hexdigest, 0); - rb_define_method(cMD5, "clone", md5_clone, 0); -}