X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fdes.c;h=3ccbf89dbbf6795bb8cf480c2980edf45944609e;hb=216cc1f6fe33b256ce708fade5e6638b2bb54d2b;hp=e7e9178078494cdc87302fff7ed6cf524fc1e77a;hpb=d307c44bafc67ffa5c05c49148d994e64266d3b9;p=ffmpeg

diff --git a/libavutil/des.c b/libavutil/des.c
index e7e91780784..3ccbf89dbbf 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -25,13 +25,6 @@
 #include "mem.h"
 #include "des.h"
 
-#if !FF_API_CRYPTO_CONTEXT
-struct AVDES {
-    uint64_t round_keys[3][16];
-    int triple_des;
-};
-#endif
-
 #define T(a, b, c, d, e, f, g, h) 64-a,64-b,64-c,64-d,64-e,64-f,64-g,64-h
 static const uint8_t IP_shuffle[] = {
     T(58, 50, 42, 34, 26, 18, 10, 2),
@@ -299,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) {