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>tags/n3.0
@@ -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) | if (key_bits != 128 && key_bits != 192 && key_bits != 256) | ||||
return -1; | |||||
return AVERROR(EINVAL); | |||||
a->rounds = rounds; | a->rounds = rounds; | ||||
@@ -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 Kl[2], Kr[2], Ka[2], Kb[2]; | ||||
uint64_t D1, D2; | uint64_t D1, D2; | ||||
if (key_bits != 128 && key_bits != 192 && key_bits != 256) | if (key_bits != 128 && key_bits != 192 && key_bits != 256) | ||||
return -1; | |||||
return AVERROR(EINVAL); | |||||
memset(Kb, 0, sizeof(Kb)); | memset(Kb, 0, sizeof(Kb)); | ||||
memset(Kr, 0, sizeof(Kr)); | memset(Kr, 0, sizeof(Kr)); | ||||
cs->key_bits = key_bits; | cs->key_bits = key_bits; | ||||
@@ -459,7 +459,7 @@ av_cold int av_cast5_init(AVCAST5* cs, const uint8_t *key, int key_bits) | |||||
int i; | int i; | ||||
uint32_t p[4], q[4]; | uint32_t p[4], q[4]; | ||||
if (key_bits % 8 || key_bits < 40 || key_bits > 128) | if (key_bits % 8 || key_bits < 40 || key_bits > 128) | ||||
return -1; | |||||
return AVERROR(EINVAL); | |||||
memset(newKey, 0, sizeof(newKey)); | memset(newKey, 0, sizeof(newKey)); | ||||
memcpy(newKey, key, key_bits >> 3); | memcpy(newKey, key, key_bits >> 3); | ||||
@@ -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) { | int av_des_init(AVDES *d, const uint8_t *key, int key_bits, av_unused int decrypt) { | ||||
if (key_bits != 64 && key_bits != 192) | if (key_bits != 64 && key_bits != 192) | ||||
return -1; | |||||
return AVERROR(EINVAL); | |||||
d->triple_des = key_bits > 64; | d->triple_des = key_bits > 64; | ||||
gen_roundkeys(d->round_keys[0], AV_RB64(key)); | gen_roundkeys(d->round_keys[0], AV_RB64(key)); | ||||
if (d->triple_des) { | if (d->triple_des) { | ||||
@@ -36,7 +36,7 @@ int av_rc4_init(AVRC4 *r, const uint8_t *key, int key_bits, int decrypt) { | |||||
uint8_t *state = r->state; | uint8_t *state = r->state; | ||||
int keylen = key_bits >> 3; | int keylen = key_bits >> 3; | ||||
if (key_bits & 7) | if (key_bits & 7) | ||||
return -1; | |||||
return AVERROR(EINVAL); | |||||
for (i = 0; i < 256; i++) | for (i = 0; i < 256; i++) | ||||
state[i] = i; | state[i] = i; | ||||
y = 0; | y = 0; | ||||
@@ -504,7 +504,7 @@ av_cold int av_ripemd_init(AVRIPEMD *ctx, int bits) | |||||
ctx->transform = ripemd320_transform; | ctx->transform = ripemd320_transform; | ||||
break; | break; | ||||
default: | default: | ||||
return -1; | |||||
return AVERROR(EINVAL); | |||||
} | } | ||||
ctx->count = 0; | ctx->count = 0; | ||||
return 0; | return 0; | ||||
@@ -305,7 +305,7 @@ av_cold int av_sha_init(AVSHA *ctx, int bits) | |||||
ctx->transform = sha256_transform; | ctx->transform = sha256_transform; | ||||
break; | break; | ||||
default: | default: | ||||
return -1; | |||||
return AVERROR(EINVAL); | |||||
} | } | ||||
ctx->count = 0; | ctx->count = 0; | ||||
return 0; | return 0; | ||||
@@ -233,7 +233,7 @@ av_cold int av_sha512_init(AVSHA512 *ctx, int bits) | |||||
ctx->state[7] = UINT64_C(0x5BE0CD19137E2179); | ctx->state[7] = UINT64_C(0x5BE0CD19137E2179); | ||||
break; | break; | ||||
default: | default: | ||||
return -1; | |||||
return AVERROR(EINVAL); | |||||
} | } | ||||
ctx->count = 0; | ctx->count = 0; | ||||
return 0; | return 0; | ||||
@@ -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; | uint32_t Key[8], Me[4], Mo[4], A, B; | ||||
const uint32_t rho = 0x01010101; | const uint32_t rho = 0x01010101; | ||||
if (key_bits < 0) | if (key_bits < 0) | ||||
return -1; | |||||
return AVERROR(EINVAL); | |||||
if (key_bits <= 128) { | if (key_bits <= 128) { | ||||
cs->ksize = 2; | cs->ksize = 2; | ||||
} else if (key_bits <= 192) { | } else if (key_bits <= 192) { | ||||