Fix cast of byte buffer to uint32 that was disregarding alignment

[ffmpeg] / libavutil / des.h

diff --git a/libavutil/des.h b/libavutil/des.h
index 70f89937c16e3736f0108d16d6a3d7341d0b39c5..e80bdd3e699f8c260e897acdd0b834fdb54d258f 100644 (file)
--- a/libavutil/des.h
+++ b/libavutil/des.h
@@ -19,21 +19,34 @@
  * 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>
 
+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 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
+ * \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);
+void av_des_crypt(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
 
-#endif /* FFMPEG_DES_H */
+#endif /* AVUTIL_DES_H */