diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-04-19 21:16:35 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 21:50:10 +0200 |
commit | 488d2b6349e3c07fec73c28a165f8d292b413362 (patch) | |
tree | 18f7e9fe4c7b2d6598efcdb244f978735284277c /libavutil | |
parent | 31d76ec2883c04d29d1f173ea99e605a6936613a (diff) | |
download | ffmpeg-streaming-488d2b6349e3c07fec73c28a165f8d292b413362.zip ffmpeg-streaming-488d2b6349e3c07fec73c28a165f8d292b413362.tar.gz |
lavu: remove disabled sha1 cruft.
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/Makefile | 1 | ||||
-rw-r--r-- | libavutil/sha.c | 24 | ||||
-rw-r--r-- | libavutil/sha1.h | 57 |
3 files changed, 0 insertions, 82 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index baee496..8c3cc60 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -35,7 +35,6 @@ HEADERS = adler32.h \ rational.h \ samplefmt.h \ sha.h \ - sha1.h \ BUILT_HEADERS = avconfig.h diff --git a/libavutil/sha.c b/libavutil/sha.c index 6d9c84e..ae6069d 100644 --- a/libavutil/sha.c +++ b/libavutil/sha.c @@ -25,7 +25,6 @@ #include "avutil.h" #include "bswap.h" #include "sha.h" -#include "sha1.h" #include "intreadwrite.h" /** hash context */ @@ -324,29 +323,6 @@ void av_sha_final(AVSHA* ctx, uint8_t *digest) 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) -{ - 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 diff --git a/libavutil/sha1.h b/libavutil/sha1.h deleted file mode 100644 index b60d770..0000000 --- a/libavutil/sha1.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at> - * - * This file is part of Libav. - * - * Libav 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. - * - * Libav 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 Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_SHA1_H -#define AVUTIL_SHA1_H - -#include <stdint.h> - -extern const int av_sha1_size; - -struct AVSHA1; - -/** - * Initialize 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); - -/** - * Update hash value. - * - * @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); - -/** - * Finish hashing and output digest value. - * - * @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]); - -#endif /* AVUTIL_SHA1_H */ |