aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/des.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2015-07-28 16:57:49 -0300
committerAnton Khirnov <anton@khirnov.net>2015-07-31 09:04:12 +0200
commitd9e8b47e3144262d6bc4681740411d4bdafad6ac (patch)
tree6d04eccc0224997286578e76e05559b9536950f9 /libavutil/des.c
parent5d8bea3bb2357bb304f8f771a4107039037c5549 (diff)
downloadffmpeg-d9e8b47e3144262d6bc4681740411d4bdafad6ac.tar.gz
des: add av_des_alloc()
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavutil/des.c')
-rw-r--r--libavutil/des.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/libavutil/des.c b/libavutil/des.c
index ab0fc2f8bc..86d4712944 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -22,9 +22,15 @@
#include "avutil.h"
#include "common.h"
#include "intreadwrite.h"
+#include "mem.h"
#include "des.h"
-typedef struct AVDES AVDES;
+#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[] = {
@@ -286,6 +292,11 @@ static uint64_t des_encdec(uint64_t in, uint64_t K[16], int decrypt) {
return in;
}
+AVDES *av_des_alloc(void)
+{
+ return av_mallocz(sizeof(struct AVDES));
+}
+
int av_des_init(AVDES *d, const uint8_t *key, int key_bits, int decrypt) {
if (key_bits != 64 && key_bits != 192)
return -1;