Prepare SHA code to handle SHA-2 as well. For now rename files and functions

and leave av_sha1_* functions for compatibility until next major bump.

Originally committed as revision 19394 to svn://svn.ffmpeg.org/ffmpeg/trunk

4 files changed, 103 insertions, 19 deletions

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 53105a8d5d..ec82439b98 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -37,11 +37,11 @@ OBJS = adler32.o                                                        \
        random_seed.o                                                    \
        rational.o                                                       \
        rc4.o                                                            \
-       sha1.o                                                           \
+       sha.o                                                            \
        tree.o                                                           \
        utils.o                                                          \
 
-TESTPROGS = adler32 aes base64 crc des lls md5 pca sha1 softfloat tree
+TESTPROGS = adler32 aes base64 crc des lls md5 pca sha softfloat tree
 TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
 
 DIRS = arm bfin sh4 x86
diff --git a/libavutil/sha1.c b/libavutil/sha.c
index ef7241fde9..29e4197899 100644
--- a/libavutil/sha1.c
+++ b/libavutil/sha.c
@@ -20,20 +20,21 @@
  */
 
 #include "common.h"
+#include "avutil.h"
 #include "bswap.h"
-#include "sha1.h"
+#include "sha.h"
 
 /** hash context */
-typedef struct AVSHA1 {
+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]);
-} AVSHA1;
+} AVSHA;
 
-const int av_sha1_size = sizeof(AVSHA1);
+const int av_sha_size = sizeof(AVSHA);
 
 #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
 
@@ -127,7 +128,7 @@ static void sha1_transform(uint32_t state[5], const uint8_t buffer[64])
     state[4] += e;
 }
 
-void av_sha1_init(AVSHA1* ctx)
+int av_sha_init(AVSHA* ctx, int bits)
 {
     ctx->state[0] = 0x67452301;
     ctx->state[1] = 0xEFCDAB89;
@@ -136,9 +137,10 @@ void av_sha1_init(AVSHA1* ctx)
     ctx->state[4] = 0xC3D2E1F0;
     ctx->transform = sha1_transform;
     ctx->count    = 0;
+    return 0;
 }
 
-void av_sha1_update(AVSHA1* ctx, const uint8_t* data, unsigned int len)
+void av_sha_update(AVSHA* ctx, const uint8_t* data, unsigned int len)
 {
     unsigned int i, j;
 
@@ -165,19 +167,42 @@ void av_sha1_update(AVSHA1* ctx, const uint8_t* data, unsigned int len)
 #endif
 }
 
-void av_sha1_final(AVSHA1* ctx, uint8_t digest[20])
+void av_sha_final(AVSHA* ctx, uint8_t *digest)
 {
     int i;
     uint64_t finalcount = be2me_64(ctx->count << 3);
 
-    av_sha1_update(ctx, "\200", 1);
+    av_sha_update(ctx, "\200", 1);
     while ((ctx->count & 63) != 56)
-        av_sha1_update(ctx, "", 1);
-    av_sha1_update(ctx, (uint8_t *)&finalcount, 8); /* Should cause a transform() */
+        av_sha_update(ctx, "", 1);
+    av_sha_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]);
 }
 
+#if LIBAVUTIL_VERSION_MAJOR < 51
+struct AVSHA1 {
+    AVSHA sha;
+};
+
+const int av_sha1_size = sizeof(struct AVSHA1);
+
+void av_sha1_init(struct AVSHA1* context)
+{
+    av_sha_init(&context->sha, 160);
+}
+
+void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int len)
+{
+    av_sha_update(&context->sha, data, len);
+}
+
+void av_sha1_final(struct AVSHA1* context, uint8_t digest[20])
+{
+    av_sha_final(&context->sha, digest);
+}
+#endif
+
 #ifdef TEST
 #include <stdio.h>
 #undef printf
@@ -185,19 +210,19 @@ void av_sha1_final(AVSHA1* ctx, uint8_t digest[20])
 int main(void)
 {
     int i, k;
-    AVSHA1 ctx;
+    AVSHA ctx;
     unsigned char digest[20];
 
     for (k = 0; k < 3; k++) {
-        av_sha1_init(&ctx);
+        av_sha_init(&ctx, 160);
         if (k == 0)
-            av_sha1_update(&ctx, "abc", 3);
+            av_sha_update(&ctx, "abc", 3);
         else if (k == 1)
-            av_sha1_update(&ctx, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 56);
+            av_sha_update(&ctx, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 56);
         else
-            for (i = 0; i < 1000 * 1000; i++)
-                av_sha1_update(&ctx, "a", 1);
-        av_sha1_final(&ctx, digest);
+            for (i = 0; i < 1000*1000; i++)
+                av_sha_update(&ctx, "a", 1);
+        av_sha_final(&ctx, digest);
         for (i = 0; i < 20; i++)
             printf("%02X", digest[i]);
         putchar('\n');
diff --git a/libavutil/sha.h b/libavutil/sha.h
new file mode 100644
index 0000000000..1b08b42809
--- /dev/null
+++ b/libavutil/sha.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * 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
+ */
+
+#ifndef AVUTIL_SHA_H
+#define AVUTIL_SHA_H
+
+#include <stdint.h>
+
+extern const int av_sha_size;
+
+struct AVSHA;
+
+/**
+ * Initializes SHA-1 hashing.
+ *
+ * @param context pointer to the function context (of size av_sha_size)
+ * @param bits    number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
+ * @return        zero if initialization succeeded, -1 otherwise
+ */
+int av_sha_init(struct AVSHA* context, int bits);
+
+/**
+ * Updates hash value.
+ *
+ * @param context hash function context
+ * @param data    input data to update hash with
+ * @param len     input data length
+ */
+void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finishes hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest  buffer where output digest value is stored
+ */
+void av_sha_final(struct AVSHA* context, uint8_t *digest);
+
+#endif /* AVUTIL_SHA_H */
diff --git a/libavutil/sha1.h b/libavutil/sha1.h
index b9a43cdd39..cf7c4a656b 100644
--- a/libavutil/sha1.h
+++ b/libavutil/sha1.h
@@ -31,6 +31,7 @@ struct AVSHA1;
  * Initializes SHA-1 hashing.
  *
  * @param context pointer to the function context (of size av_sha_size)
+ * @deprecated use av_sha_init() instead
  */
 void av_sha1_init(struct AVSHA1* context);
 
@@ -40,6 +41,7 @@ void av_sha1_init(struct AVSHA1* context);
  * @param context hash function context
  * @param data    input data to update hash with
  * @param len     input data length
+ * @deprecated use av_sha_update() instead
  */
 void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int len);
 
@@ -48,6 +50,7 @@ void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int le
  *
  * @param context hash function context
  * @param digest  buffer where output digest value is stored
+ * @deprecated use av_sha_final() instead
  */
 void av_sha1_final(struct AVSHA1* context, uint8_t digest[20]);