error: remove AVERROR_NUMEXPECTED

[ffmpeg] / libavutil / des.h

diff --git a/libavutil/des.h b/libavutil/des.h
index 56145d127433c27b8c7190d48618a1df7378bc2d..5a6d4a12fbb3d99b84673e41d64069d6c0373530 100644 (file)
--- a/libavutil/des.h
+++ b/libavutil/des.h
@@ -2,20 +2,20 @@
  * 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
  */
 
@@ -23,18 +23,30 @@
 #define AVUTIL_DES_H
 
 #include <stdint.h>
-#include "common.h"
+
+struct AVDES {
+    uint64_t round_keys[3][16];
+    int triple_des;
+};
+
+/**
+ * \brief Initializes an AVDES context.
+ *
+ * \param key_bits must be 64 or 192
+ * \param decrypt 0 for encryption, 1 for decryption
+ */
+int av_des_init(struct AVDES *d, const uint8_t *key, int key_bits, int decrypt);
 
 /**
- * \brief Encrypt/decrypt a 64-bit block of data with DES.
- * \param in data to process
- * \param key key to use for encryption/decryption
- * \param decrypt if 0 encrypt, else decrypt
- * \return processed data
+ * \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
  */
-uint64_t ff_des_encdec(uint64_t in, uint64_t key, int decrypt) av_const;
+void av_des_crypt(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
 
 #endif /* AVUTIL_DES_H */