Changeset 1ba7e8f for lib/md5.c


Ignore:
Timestamp:
2008-02-15T17:38:57Z (16 years ago)
Author:
ulim <a.sporto+bee@…>
Branches:
master
Children:
506e61b
Parents:
0fbd3a6d (diff), eeb85a8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged with upstream r328

Wilmer van der Gaast 2008-02-11 Got rid of some noise at startup: complaining when the default configuration

Wilmer van der Gaast 2008-02-10 Added support for password-protected Jabber chatrooms.
Wilmer van der Gaast 2008-02-10 Making AI_ADDRCONFIG optional, it doesn't exist on at least NetBSD and
Wilmer van der Gaast 2008-02-09 Restored "add -tmp". A bit hackish, but it will do for now.
Wilmer van der Gaast 2008-02-07 Fixed getnameinfo() calls, this fixes Solaris stability issues. Thanks to
Wilmer van der Gaast 2008-02-04 Added bogus G_GNUC_MALLOC to restore GLib 2.4 compatibility (hopefully).
Wilmer van der Gaast 2008-02-03 Messages from the user are also included in backlogs when joining a Jabber
Wilmer van der Gaast 2008-02-03 Disabling "Unknown command" warnings since they're very noisy and pretty
Wilmer van der Gaast 2008-02-03 Implemented XEP-0115. This adds some info to the <presence/> tags so
Wilmer van der Gaast 2008-02-03 Saner garbage collection of cached packets in the Jabber module. Now
Wilmer van der Gaast 2008-02-02 Added help_free() and cleaned up some very stale help-related stuff I
Wilmer van der Gaast 2008-01-30 Fixed handling of OSCAR multi-part messages... They're not arrays, they're
Wilmer van der Gaast 2008-01-24 Keeping track of valid Jabber connections so _connected() events will be
Wilmer van der Gaast 2008-01-24 Fixed two valgrind warnings (partially uninitialized "struct tm" vars.)
Wilmer van der Gaast 2008-01-20 The Jabber module now uses imcb_chat_log() instead of imcb_log() where
Wilmer van der Gaast 2008-01-20 Added imcb_chat_log() for chatroom system messages, so they can be
Wilmer van der Gaast 2008-01-20 GET_BUDDY_FIRST wasn't actually implemented, even though it was in use
Wilmer van der Gaast 2008-01-19 Using test -f instead of test -e. This breaks if the include files are
Wilmer van der Gaast 2008-01-19 Added byte swapping code to the new MD5 checksumming code to make it work
Wilmer van der Gaast 2008-01-18 Moving imcb_chat_new() to a saner location (no code changes) and fixing
Wilmer van der Gaast 2008-01-17 Apparently ext_yahoo_got_im can be called with msg=NULL, so it should be
Wilmer van der Gaast 2008-01-17 Fixing some Solaris compiler warnings (u_int->uint, adding some typecasts
Wilmer van der Gaast 2008-01-13 Fixed handing of failed groupchat joins.
Wilmer van der Gaast 2008-01-13 Fixed "Conditional jump or move depends on uninitialised value(s)" at
Wilmer van der Gaast 2008-01-13 Fixed quickstart2. (Bug #349.)
Wilmer van der Gaast 2008-01-13 Different handling of charset mismatches before login time. Ignoring a
Wilmer van der Gaast 2008-01-12 When a switchboard connection dies (at the TCP level) and there are still
Wilmer van der Gaast 2008-01-12 Killed info_string_append() and now showing the IP address of ICQ users
Wilmer van der Gaast 2008-01-11 Fixing bug #344, now away states should always be correct, even when people
Wilmer van der Gaast 2008-01-11 Adding own handle to protocol name in blist output for people with multiple
Wilmer van der Gaast 2008-01-10 Now setting odata->icq properly again, this got lost some time ago, which
Wilmer van der Gaast 2008-01-06 More consistency in error/warning errors. Until now "WARNING:" was usually
Wilmer van der Gaast 2008-01-06 Changed warning message about unsent MSN messages. It should show the actual
Wilmer van der Gaast 2008-01-05 Added "mail_notifications" setting. Who needs those notifications anyway?
Wilmer van der Gaast 2008-01-05 Build fix from vmiklos.
Wilmer van der Gaast 2008-01-05 Added handling of MSN switchboard NAK messages. Untested, but hey, it
Wilmer van der Gaast 2008-01-05 Removed closure->result. I was planning to add some more stuff, but will
Miklos Vajna 2007-12-31 encode: md5.c is no longer in protocols/, it's in lib/
Wilmer van der Gaast 2007-12-28 Fixed return value check in proxy_connect(), since on some systems
Wilmer van der Gaast 2007-12-28 Added missing return in jabber_login().
Wilmer van der Gaast 2007-12-16 Implemented XEP-0199 (patch from misc@…).
Wilmer van der Gaast 2007-12-12 Checking conn->xcred before trying to clean it up since GnuTLS doesn't
Wilmer van der Gaast 2007-12-12 Killed the <server> parameter to "account add" and changed the default
Wilmer van der Gaast 2007-12-12 Fixed sockerr_again() usage in Jabber module to (hopefully) fix a 100% CPU
Wilmer van der Gaast 2007-12-10 Don't allow nicks that start with a number.
Wilmer van der Gaast 2007-12-10 Fixed "set xxx" syntax (it showed all settings instead of just xxx).
Wilmer van der Gaast 2007-12-09 If I keep forgetting to credit people in commit msgs I should probably add
Wilmer van der Gaast 2007-12-09 Added /invite support for Jabber chatrooms (and fixed the argument order

File:
1 edited

Legend:

Unmodified
Added
Removed

  • lib/md5.c

    r0fbd3a6d r1ba7e8f  
    2626#include "md5.h"
    2727
    28 static void md5_transform(u_int32_t buf[4], u_int32_t const in[16]);
     28static void md5_transform(uint32_t buf[4], uint32_t const in[16]);
    2929
    3030/*
    … …  
    3434 * 20021120
    3535 */
     36
     37/* Turns out MD5 was designed for little-endian machines. If we're running
     38   on a big-endian machines, we have to swap some bytes. Since detecting
     39   endianness at compile time reliably seems pretty hard, let's do it at
     40   run-time. It's not like we're going to checksum megabytes of data... */
     41static uint32_t cvt32(uint32_t val)
     42{
     43        static int little_endian = -1;
     44       
     45        if (little_endian == -1)
     46        {
     47                little_endian = 1;
     48                little_endian = *((char*) &little_endian);
     49        }
     50       
     51        if (little_endian)
     52                return val;
     53        else
     54                return (val >> 24) |
     55                       ((val >> 8) & 0xff00) |
     56                       ((val << 8) & 0xff0000) |
     57                       (val << 24);
     58}
    3659
    3760void md5_init(struct MD5Context *ctx)
    … …  
    5376                unsigned int len)
    5477{
    55         u_int32_t t;
     78        uint32_t t;
    5679
    5780        /* Update bitcount */
    5881
    5982        t = ctx->bits[0];
    60         if ((ctx->bits[0] = t + ((u_int32_t) len << 3)) < t)
     83        if ((ctx->bits[0] = t + ((uint32_t) len << 3)) < t)
    6184                ctx->bits[1]++; /* Carry from low to high */
    6285        ctx->bits[1] += len >> 29;
    … …  
    7598                }
    7699                memcpy(p, buf, t);
    77                 md5_transform(ctx->buf, (u_int32_t *) ctx->in);
     100                md5_transform(ctx->buf, (uint32_t *) ctx->in);
    78101                buf += t;
    79102                len -= t;
    … …  
    83106        while (len >= 64) {
    84107                memcpy(ctx->in, buf, 64);
    85                 md5_transform(ctx->buf, (u_int32_t *) ctx->in);
     108                md5_transform(ctx->buf, (uint32_t *) ctx->in);
    86109                buf += 64;
    87110                len -= 64;
    … …  
    117140                /* Two lots of padding:  Pad the first block to 64 bytes */
    118141                memset(p, 0, count);
    119                 md5_transform(ctx->buf, (u_int32_t *) ctx->in);
     142                md5_transform(ctx->buf, (uint32_t *) ctx->in);
    120143
    121144                /* Now fill the next block with 56 bytes */
    … …  
    127150
    128151        /* Append length in bits and transform */
    129         ((u_int32_t *) ctx->in)[14] = ctx->bits[0];
    130         ((u_int32_t *) ctx->in)[15] = ctx->bits[1];
    131 
    132         md5_transform(ctx->buf, (u_int32_t *) ctx->in);
     152        ((uint32_t *) ctx->in)[14] = cvt32(ctx->bits[0]);
     153        ((uint32_t *) ctx->in)[15] = cvt32(ctx->bits[1]);
     154
     155        md5_transform(ctx->buf, (uint32_t *) ctx->in);
     156        ctx->buf[0] = cvt32(ctx->buf[0]);
     157        ctx->buf[1] = cvt32(ctx->buf[1]);
     158        ctx->buf[2] = cvt32(ctx->buf[2]);
     159        ctx->buf[3] = cvt32(ctx->buf[3]);
    133160        memcpy(digest, ctx->buf, 16);
    134161        memset(ctx, 0, sizeof(ctx));    /* In case it's sensitive */
    … …  
    152179 * the data and converts bytes into longwords for this routine.
    153180 */
    154 static void md5_transform(u_int32_t buf[4], u_int32_t const in[16])
    155 {
    156         register u_int32_t a, b, c, d;
     181static void md5_transform(uint32_t buf[4], uint32_t const in[16])
     182{
     183        register uint32_t a, b, c, d;
    157184
    158185        a = buf[0];
    … …  
    161188        d = buf[3];
    162189
    163         MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
    164         MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
    165         MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
    166         MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
    167         MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
    168         MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
    169         MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
    170         MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
    171         MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
    172         MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
    173         MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
    174         MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
    175         MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
    176         MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
    177         MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
    178         MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
    179 
    180         MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
    181         MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
    182         MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
    183         MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
    184         MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
    185         MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
    186         MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
    187         MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
    188         MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
    189         MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
    190         MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
    191         MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
    192         MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
    193         MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
    194         MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
    195         MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
    196 
    197         MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
    198         MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
    199         MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
    200         MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
    201         MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
    202         MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
    203         MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
    204         MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
    205         MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
    206         MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
    207         MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
    208         MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
    209         MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
    210         MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
    211         MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
    212         MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
    213 
    214         MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
    215         MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
    216         MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
    217         MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
    218         MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
    219         MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
    220         MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
    221         MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
    222         MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
    223         MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
    224         MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
    225         MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
    226         MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
    227         MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
    228         MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
    229         MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
     190        MD5STEP(F1, a, b, c, d, cvt32(in[0]) + 0xd76aa478, 7);
     191        MD5STEP(F1, d, a, b, c, cvt32(in[1]) + 0xe8c7b756, 12);
     192        MD5STEP(F1, c, d, a, b, cvt32(in[2]) + 0x242070db, 17);
     193        MD5STEP(F1, b, c, d, a, cvt32(in[3]) + 0xc1bdceee, 22);
     194        MD5STEP(F1, a, b, c, d, cvt32(in[4]) + 0xf57c0faf, 7);
     195        MD5STEP(F1, d, a, b, c, cvt32(in[5]) + 0x4787c62a, 12);
     196        MD5STEP(F1, c, d, a, b, cvt32(in[6]) + 0xa8304613, 17);
     197        MD5STEP(F1, b, c, d, a, cvt32(in[7]) + 0xfd469501, 22);
     198        MD5STEP(F1, a, b, c, d, cvt32(in[8]) + 0x698098d8, 7);
     199        MD5STEP(F1, d, a, b, c, cvt32(in[9]) + 0x8b44f7af, 12);
     200        MD5STEP(F1, c, d, a, b, cvt32(in[10]) + 0xffff5bb1, 17);
     201        MD5STEP(F1, b, c, d, a, cvt32(in[11]) + 0x895cd7be, 22);
     202        MD5STEP(F1, a, b, c, d, cvt32(in[12]) + 0x6b901122, 7);
     203        MD5STEP(F1, d, a, b, c, cvt32(in[13]) + 0xfd987193, 12);
     204        MD5STEP(F1, c, d, a, b, cvt32(in[14]) + 0xa679438e, 17);
     205        MD5STEP(F1, b, c, d, a, cvt32(in[15]) + 0x49b40821, 22);
     206
     207        MD5STEP(F2, a, b, c, d, cvt32(in[1]) + 0xf61e2562, 5);
     208        MD5STEP(F2, d, a, b, c, cvt32(in[6]) + 0xc040b340, 9);
     209        MD5STEP(F2, c, d, a, b, cvt32(in[11]) + 0x265e5a51, 14);
     210        MD5STEP(F2, b, c, d, a, cvt32(in[0]) + 0xe9b6c7aa, 20);
     211        MD5STEP(F2, a, b, c, d, cvt32(in[5]) + 0xd62f105d, 5);
     212        MD5STEP(F2, d, a, b, c, cvt32(in[10]) + 0x02441453, 9);
     213        MD5STEP(F2, c, d, a, b, cvt32(in[15]) + 0xd8a1e681, 14);
     214        MD5STEP(F2, b, c, d, a, cvt32(in[4]) + 0xe7d3fbc8, 20);
     215        MD5STEP(F2, a, b, c, d, cvt32(in[9]) + 0x21e1cde6, 5);
     216        MD5STEP(F2, d, a, b, c, cvt32(in[14]) + 0xc33707d6, 9);
     217        MD5STEP(F2, c, d, a, b, cvt32(in[3]) + 0xf4d50d87, 14);
     218        MD5STEP(F2, b, c, d, a, cvt32(in[8]) + 0x455a14ed, 20);
     219        MD5STEP(F2, a, b, c, d, cvt32(in[13]) + 0xa9e3e905, 5);
     220        MD5STEP(F2, d, a, b, c, cvt32(in[2]) + 0xfcefa3f8, 9);
     221        MD5STEP(F2, c, d, a, b, cvt32(in[7]) + 0x676f02d9, 14);
     222        MD5STEP(F2, b, c, d, a, cvt32(in[12]) + 0x8d2a4c8a, 20);
     223
     224        MD5STEP(F3, a, b, c, d, cvt32(in[5]) + 0xfffa3942, 4);
     225        MD5STEP(F3, d, a, b, c, cvt32(in[8]) + 0x8771f681, 11);
     226        MD5STEP(F3, c, d, a, b, cvt32(in[11]) + 0x6d9d6122, 16);
     227        MD5STEP(F3, b, c, d, a, cvt32(in[14]) + 0xfde5380c, 23);
     228        MD5STEP(F3, a, b, c, d, cvt32(in[1]) + 0xa4beea44, 4);
     229        MD5STEP(F3, d, a, b, c, cvt32(in[4]) + 0x4bdecfa9, 11);
     230        MD5STEP(F3, c, d, a, b, cvt32(in[7]) + 0xf6bb4b60, 16);
     231        MD5STEP(F3, b, c, d, a, cvt32(in[10]) + 0xbebfbc70, 23);
     232        MD5STEP(F3, a, b, c, d, cvt32(in[13]) + 0x289b7ec6, 4);
     233        MD5STEP(F3, d, a, b, c, cvt32(in[0]) + 0xeaa127fa, 11);
     234        MD5STEP(F3, c, d, a, b, cvt32(in[3]) + 0xd4ef3085, 16);
     235        MD5STEP(F3, b, c, d, a, cvt32(in[6]) + 0x04881d05, 23);
     236        MD5STEP(F3, a, b, c, d, cvt32(in[9]) + 0xd9d4d039, 4);
     237        MD5STEP(F3, d, a, b, c, cvt32(in[12]) + 0xe6db99e5, 11);
     238        MD5STEP(F3, c, d, a, b, cvt32(in[15]) + 0x1fa27cf8, 16);
     239        MD5STEP(F3, b, c, d, a, cvt32(in[2]) + 0xc4ac5665, 23);
     240
     241        MD5STEP(F4, a, b, c, d, cvt32(in[0]) + 0xf4292244, 6);
     242        MD5STEP(F4, d, a, b, c, cvt32(in[7]) + 0x432aff97, 10);
     243        MD5STEP(F4, c, d, a, b, cvt32(in[14]) + 0xab9423a7, 15);
     244        MD5STEP(F4, b, c, d, a, cvt32(in[5]) + 0xfc93a039, 21);
     245        MD5STEP(F4, a, b, c, d, cvt32(in[12]) + 0x655b59c3, 6);
     246        MD5STEP(F4, d, a, b, c, cvt32(in[3]) + 0x8f0ccc92, 10);
     247        MD5STEP(F4, c, d, a, b, cvt32(in[10]) + 0xffeff47d, 15);
     248        MD5STEP(F4, b, c, d, a, cvt32(in[1]) + 0x85845dd1, 21);
     249        MD5STEP(F4, a, b, c, d, cvt32(in[8]) + 0x6fa87e4f, 6);
     250        MD5STEP(F4, d, a, b, c, cvt32(in[15]) + 0xfe2ce6e0, 10);
     251        MD5STEP(F4, c, d, a, b, cvt32(in[6]) + 0xa3014314, 15);
     252        MD5STEP(F4, b, c, d, a, cvt32(in[13]) + 0x4e0811a1, 21);
     253        MD5STEP(F4, a, b, c, d, cvt32(in[4]) + 0xf7537e82, 6);
     254        MD5STEP(F4, d, a, b, c, cvt32(in[11]) + 0xbd3af235, 10);
     255        MD5STEP(F4, c, d, a, b, cvt32(in[2]) + 0x2ad7d2bb, 15);
     256        MD5STEP(F4, b, c, d, a, cvt32(in[9]) + 0xeb86d391, 21);
    230257
    231258        buf[0] += a;
Note: See TracChangeset for help on using the changeset viewer.