1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

avutil: use EINVAL instead of -1 for the return code of crypto related init functions

These functions return an error typically when the key size is an
incorrect number. AVERROR(EINVAL) is more specific than -1.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
This commit is contained in:
Ganesh Ajjanagadde 2015-10-15 19:36:22 -04:00
parent 94f7c97e05
commit 07d4fe3a87
9 changed files with 9 additions and 9 deletions

View File

@ -223,7 +223,7 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt)
}
if (key_bits != 128 && key_bits != 192 && key_bits != 256)
return -1;
return AVERROR(EINVAL);
a->rounds = rounds;

View File

@ -354,7 +354,7 @@ av_cold int av_camellia_init(AVCAMELLIA *cs, const uint8_t *key, int key_bits)
uint64_t Kl[2], Kr[2], Ka[2], Kb[2];
uint64_t D1, D2;
if (key_bits != 128 && key_bits != 192 && key_bits != 256)
return -1;
return AVERROR(EINVAL);
memset(Kb, 0, sizeof(Kb));
memset(Kr, 0, sizeof(Kr));
cs->key_bits = key_bits;

View File

@ -459,7 +459,7 @@ av_cold int av_cast5_init(AVCAST5* cs, const uint8_t *key, int key_bits)
int i;
uint32_t p[4], q[4];
if (key_bits % 8 || key_bits < 40 || key_bits > 128)
return -1;
return AVERROR(EINVAL);
memset(newKey, 0, sizeof(newKey));
memcpy(newKey, key, key_bits >> 3);

View File

@ -292,7 +292,7 @@ AVDES *av_des_alloc(void)
int av_des_init(AVDES *d, const uint8_t *key, int key_bits, av_unused int decrypt) {
if (key_bits != 64 && key_bits != 192)
return -1;
return AVERROR(EINVAL);
d->triple_des = key_bits > 64;
gen_roundkeys(d->round_keys[0], AV_RB64(key));
if (d->triple_des) {

View File

@ -36,7 +36,7 @@ int av_rc4_init(AVRC4 *r, const uint8_t *key, int key_bits, int decrypt) {
uint8_t *state = r->state;
int keylen = key_bits >> 3;
if (key_bits & 7)
return -1;
return AVERROR(EINVAL);
for (i = 0; i < 256; i++)
state[i] = i;
y = 0;

View File

@ -504,7 +504,7 @@ av_cold int av_ripemd_init(AVRIPEMD *ctx, int bits)
ctx->transform = ripemd320_transform;
break;
default:
return -1;
return AVERROR(EINVAL);
}
ctx->count = 0;
return 0;

View File

@ -305,7 +305,7 @@ av_cold int av_sha_init(AVSHA *ctx, int bits)
ctx->transform = sha256_transform;
break;
default:
return -1;
return AVERROR(EINVAL);
}
ctx->count = 0;
return 0;

View File

@ -233,7 +233,7 @@ av_cold int av_sha512_init(AVSHA512 *ctx, int bits)
ctx->state[7] = UINT64_C(0x5BE0CD19137E2179);
break;
default:
return -1;
return AVERROR(EINVAL);
}
ctx->count = 0;
return 0;

View File

@ -273,7 +273,7 @@ av_cold int av_twofish_init(AVTWOFISH *cs, const uint8_t *key, int key_bits)
uint32_t Key[8], Me[4], Mo[4], A, B;
const uint32_t rho = 0x01010101;
if (key_bits < 0)
return -1;
return AVERROR(EINVAL);
if (key_bits <= 128) {
cs->ksize = 2;
} else if (key_bits <= 192) {