Move "block" variable in rtjpeg decoder to context to ensure sufficient alignment

[ffmpeg] / libavutil / sha1.c

diff --git a/libavutil/sha1.c b/libavutil/sha1.c
index 6c10791f40c9fd9ec412d30b3292ebfceaed5423..c5120de26bd699696d4264aa87875ba15455ff19 100644 (file)
--- a/libavutil/sha1.c
+++ b/libavutil/sha1.c
@@ -1,8 +1,26 @@
-// SHA-1 code Copyright 2007 Michael Nidermayer <michaelni@gmx.at>
-// license LGPL
-// based on public domain SHA-1 code by Steve Reid <steve@edmweb.com>
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ * based on public domain SHA-1 code by Steve Reid <steve@edmweb.com>
+ *
+ * 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 "bswap.h"
 #include "sha1.h"
 
 typedef struct AVSHA1 {
@@ -11,10 +29,12 @@ typedef struct AVSHA1 {
     uint32_t state[5];
 } AVSHA1;
 
+const int av_sha1_size = sizeof(AVSHA1);
+
 #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
 
 /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define blk0(i) (block[i] = be2me_32(((uint32_t*)buffer)[i]))
+#define blk0(i) (block[i] = be2me_32(((const uint32_t*)buffer)[i]))
 #define blk(i) (block[i] = rol(block[i-3]^block[i-8]^block[i-14]^block[i-16],1))
 
 #define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)    +blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
@@ -25,7 +45,7 @@ typedef struct AVSHA1 {
 
 /* Hash a single 512-bit block. This is the core of the algorithm. */
 
-static void transform(uint32_t state[5], uint8_t buffer[64]){
+static void transform(uint32_t state[5], const uint8_t buffer[64]){
     uint32_t block[80];
     unsigned int i, a, b, c, d, e;
 
@@ -34,7 +54,7 @@ static void transform(uint32_t state[5], uint8_t buffer[64]){
     c = state[2];
     d = state[3];
     e = state[4];
-#ifdef CONFIG_SMALL
+#if CONFIG_SMALL
     for(i=0; i<80; i++){
         int t;
         if(i<16) t= be2me_32(((uint32_t*)buffer)[i]);
@@ -85,12 +105,12 @@ void av_sha1_init(AVSHA1* ctx){
     ctx->count    = 0;
 }
 
-void av_sha1_update(AVSHA1* ctx, uint8_t* data, unsigned int len){
+void av_sha1_update(AVSHA1* ctx, const uint8_t* data, unsigned int len){
     unsigned int i, j;
 
     j = ctx->count & 63;
     ctx->count += len;
-#ifdef CONFIG_SMALL
+#if CONFIG_SMALL
     for( i = 0; i < len; i++ ){
         ctx->buffer[ j++ ] = data[i];
         if( 64 == j ){
@@ -120,18 +140,16 @@ void av_sha1_final(AVSHA1* ctx, uint8_t digest[20]){
     while ((ctx->count & 63) != 56) {
         av_sha1_update(ctx, "", 1);
     }
-    av_sha1_update(ctx, &finalcount, 8);  /* Should cause a transform() */
+    av_sha1_update(ctx, (uint8_t *)&finalcount, 8); /* Should cause a transform() */
     for(i=0; i<5; i++)
         ((uint32_t*)digest)[i]= be2me_32(ctx->state[i]);
 }
 
-// use the following to test
-// gcc -DTEST -DHAVE_AV_CONFIG_H -I.. sha1.c -O2 -W -Wall -o sha1 && time ./sha1
 #ifdef TEST
 #include <stdio.h>
 #undef printf
 
-int main(){
+int main(void){
     int i, k;
     AVSHA1 ctx;
     unsigned char digest[20];
@@ -150,7 +168,7 @@ int main(){
             printf("%02X", digest[i]);
         putchar('\n');
     }
-    //Test Vectors (from FIPS PUB 180-1)
+    //test vectors (from FIPS PUB 180-1)
     printf("A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D\n"
            "84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1\n"
            "34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F\n");