X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fdes.h;h=1470d355ad4c88ccf09c6450a76f738b60a81cf4;hb=e9f884416c76558098fc1f63825b293956e8483c;hp=40d8aa18ef6497db989b31c30a712e28b79f05be;hpb=3540b950ec55343a4cfc02f73783bb90df34252b;p=ffmpeg

diff --git a/libavutil/des.h b/libavutil/des.h
index 40d8aa18ef6..1470d355ad4 100644
--- a/libavutil/des.h
+++ b/libavutil/des.h
@@ -2,39 +2,81 @@
  * DES encryption/decryption
  * Copyright (c) 2007 Reimar Doeffinger
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_DES_H
-#define FFMPEG_DES_H
+#ifndef AVUTIL_DES_H
+#define AVUTIL_DES_H
 
 #include <stdint.h>
-#include "common.h"
+#include "version.h"
 
 /**
- * \brief en- or decrypt an 64-bit block of data with DES
- * \param in data to process.
- * \param key key to use for en-/decryption.
- * \param decrypt if 0 encrypt, else decrypt.
- * \return processed data
+ * @defgroup lavu_des DES
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#if FF_API_CRYPTO_CONTEXT
+typedef struct AVDES {
+    uint64_t round_keys[3][16];
+    int triple_des;
+} AVDES;
+#else
+typedef struct AVDES AVDES;
+#endif
+
+/**
+ * Allocate an AVDES context.
+ */
+AVDES *av_des_alloc(void);
+
+/**
+ * @brief Initializes an AVDES context.
+ *
+ * @param key_bits must be 64 or 192
+ * @param decrypt 0 for encryption/CBC-MAC, 1 for decryption
+ * @return zero on success, negative value otherwise
+ */
+int av_des_init(struct AVDES *d, const uint8_t *key, int key_bits, int decrypt);
+
+/**
+ * @brief Encrypts / decrypts using the DES algorithm.
  *
- * If your input data is in 8-bit blocks treat it as big-endian
- * (use e.g. AV_RB64 and AV_WB64).
+ * @param count number of 8 byte blocks
+ * @param dst destination array, can be equal to src, must be 8-byte aligned
+ * @param src source array, can be equal to dst, must be 8-byte aligned, may be NULL
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used,
+ *           must be 8-byte aligned
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_des_crypt(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
+
+/**
+ * @brief Calculates CBC-MAC using the DES algorithm.
+ *
+ * @param count number of 8 byte blocks
+ * @param dst destination array, can be equal to src, must be 8-byte aligned
+ * @param src source array, can be equal to dst, must be 8-byte aligned, may be NULL
+ */
+void av_des_mac(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count);
+
+/**
+ * @}
  */
-uint64_t ff_des_encdec(uint64_t in, uint64_t key, int decrypt) av_const;
 
-#endif /* FFMPEG_DES_H */
+#endif /* AVUTIL_DES_H */