ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavutil/sha.c

 /*
  * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
  * Copyright (C) 2009 Konstantin Shishkov
  * based on public domain SHA-1 code by Steve Reid <steve@edmweb.com>
  * and on BSD-licensed SHA-2 code by Aaron D. Gifford
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "common.h"
 #include "avutil.h"
 #include "bswap.h"
 #include "sha.h"
+#include "sha1.h"
+#include "intreadwrite.h"
 
 /** hash context */
 typedef struct AVSHA {
     uint8_t  digest_len;  ///< digest length in 32-bit words
     uint64_t count;       ///< number of bytes in buffer
     uint8_t  buffer[64];  ///< 512-bit buffer of input values used in hash updating
     uint32_t state[8];    ///< current hash value
     /** function used to update hash for 512-bit input block */
     void     (*transform)(uint32_t *state, const uint8_t buffer[64]);
 } AVSHA;
@@ skipping 274 matching lines @@
 void av_sha_final(AVSHA* ctx, uint8_t *digest)
 {
     int i;
     uint64_t finalcount = be2me_64(ctx->count << 3);
 
     av_sha_update(ctx, "\200", 1);
     while ((ctx->count & 63) != 56)
         av_sha_update(ctx, "", 1);
     av_sha_update(ctx, (uint8_t *)&finalcount, 8); /* Should cause a transform() */
     for (i = 0; i < ctx->digest_len; i++)
-        ((uint32_t*)digest)[i] = be2me_32(ctx->state[i]);
+        AV_WB32(digest + i*4, ctx->state[i]);
 }
 
 #if LIBAVUTIL_VERSION_MAJOR < 51
 struct AVSHA1 {
     AVSHA sha;
 };
 
 const int av_sha1_size = sizeof(struct AVSHA1);
 
 void av_sha1_init(struct AVSHA1* context)
@@ skipping 57 matching lines @@
             printf("ba7816bf 8f01cfea 414140de 5dae2223 b00361a3 96177a9c b410ff61 f20015ad\n"
                    "248d6a61 d20638b8 e5c02693 0c3e6039 a33ce459 64ff2167 f6ecedd4 19db06c1\n"
                    "cdc76e5c 9914fb92 81a1c7e2 84d73e67 f1809a48 a497200e 046d39cc c7112cd0\n");
             break;
         }
     }
 
     return 0;
 }
 #endif