virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

crypto: consistently use size_t as type for length parameters

Browse Source 
size_t is the correct type to use for sizes.
This commit is contained in:
Diego Biurrun 2016-12-15 12:46:03 +01:00
parent f1af37b510
commit e435beb1ea
6 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@ -13,6 +13,10 @@ libavutil: 2015-08-28
API changes, most recent first: API changes, most recent first:
2016-xx-xx - xxxxxxx
Change av_sha_update() and av_md5_sum()/av_md5_update() length
parameter type to size_t at next major bump.
2016-xx-xx - xxxxxxx - lavc 57.29.0 - avcodec.h 2016-xx-xx - xxxxxxx - lavc 57.29.0 - avcodec.h
Add AV_PKT_DATA_SPHERICAL packet side data to export AVSphericalMapping Add AV_PKT_DATA_SPHERICAL packet side data to export AVSphericalMapping
information from containers. information from containers.

8
libavutil/md5.c
View File

@ -146,7 +146,11 @@ void av_md5_init(AVMD5 *ctx)
ctx->ABCD[3] = 0x67452301; ctx->ABCD[3] = 0x67452301;
} }
#if FF_API_CRYPTO_SIZE_T
void av_md5_update(AVMD5 *ctx, const uint8_t *src, const int len) void av_md5_update(AVMD5 *ctx, const uint8_t *src, const int len)
#else
void av_md5_update(AVMD5 *ctx, const uint8_t *src, size_t len)
#endif
{ {
int i, j; int i, j;
@ -177,7 +181,11 @@ void av_md5_final(AVMD5 *ctx, uint8_t *dst)
AV_WL32(dst + 4 * i, ctx->ABCD[3 - i]); AV_WL32(dst + 4 * i, ctx->ABCD[3 - i]);
} }
#if FF_API_CRYPTO_SIZE_T
void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len) void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len)
#else
void av_md5_sum(uint8_t *dst, const uint8_t *src, size_t len)
#endif
{ {
AVMD5 ctx; AVMD5 ctx;

8
libavutil/md5.h
View File

@ -21,6 +21,7 @@
#ifndef AVUTIL_MD5_H #ifndef AVUTIL_MD5_H
#define AVUTIL_MD5_H #define AVUTIL_MD5_H
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include "attributes.h" #include "attributes.h"
@ -36,9 +37,14 @@ struct AVMD5;
struct AVMD5 *av_md5_alloc(void); struct AVMD5 *av_md5_alloc(void);
void av_md5_init(struct AVMD5 *ctx); void av_md5_init(struct AVMD5 *ctx);
void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
void av_md5_final(struct AVMD5 *ctx, uint8_t *dst); void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
#if FF_API_CRYPTO_SIZE_T
void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len); void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
#else
void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, size_t len);
void av_md5_sum(uint8_t *dst, const uint8_t *src, size_t len);
#endif
/** /**
* @} * @}

6
libavutil/sha.c
View File

@ -290,7 +290,11 @@ av_cold int av_sha_init(AVSHA *ctx, int bits)
return 0; return 0;
} }
void av_sha_update(AVSHA* ctx, const uint8_t* data, unsigned int len) #if FF_API_CRYPTO_SIZE_T
void av_sha_update(struct AVSHA *ctx, const uint8_t *data, unsigned int len)
#else
void av_sha_update(struct AVSHA *ctx, const uint8_t *data, size_t len)
#endif
{ {
unsigned int i, j; unsigned int i, j;

9
libavutil/sha.h
View File

@ -21,6 +21,7 @@
#ifndef AVUTIL_SHA_H #ifndef AVUTIL_SHA_H
#define AVUTIL_SHA_H #define AVUTIL_SHA_H
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include "attributes.h" #include "attributes.h"
@ -51,11 +52,15 @@ int av_sha_init(struct AVSHA* context, int bits);
/** /**
* Update hash value. * Update hash value.
* *
* @param context hash function context * @param ctx hash function context
* @param data input data to update hash with * @param data input data to update hash with
* @param len input data length * @param len input data length
*/ */
void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len); #if FF_API_CRYPTO_SIZE_T
void av_sha_update(struct AVSHA *ctx, const uint8_t *data, unsigned int len);
#else
void av_sha_update(struct AVSHA *ctx, const uint8_t *data, size_t len);
#endif
/** /**
* Finish hashing and output digest value. * Finish hashing and output digest value.

3
libavutil/version.h
View File

@ -105,6 +105,9 @@
#ifndef FF_API_PKT_PTS #ifndef FF_API_PKT_PTS
#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 56) #define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_CRYPTO_SIZE_T
#define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
/** /**