From 2a1fe6962d127064e90115f8513b9ed7fc89e5c6 Mon Sep 17 00:00:00 2001
From: Jens Steube <jens.steube@gmail.com>
Date: Sun, 4 Jun 2017 21:21:18 +0200
Subject: [PATCH] Move blake2_t and chacha20_t to interface.h
---
include/interface.h | 42 +++++++++++++++++++++++++++++++-----------
include/types.h | 20 --------------------
2 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/include/interface.h b/include/interface.h
index 91fd38807..4f0d4cf68 100644
--- a/include/interface.h
+++ b/include/interface.h
@@ -129,21 +129,25 @@ typedef struct itunes_backup
} itunes_backup_t;
-typedef struct luks_tmp
+typedef struct blake2
{
- u32 ipad32[8];
- u64 ipad64[8];
+ u64 h[8];
+ u64 t[2];
+ u64 f[2];
+ u32 buflen;
+ u32 outlen;
+ u8 last_node;
- u32 opad32[8];
- u64 opad64[8];
+} blake2_t;
- u32 dgst32[32];
- u64 dgst64[16];
+typedef struct chacha20
+{
+ u32 iv[2];
+ u32 plain[2];
+ u32 position[2];
+ u32 offset;
- u32 out32[32];
- u64 out64[16];
-
-} luks_tmp_t;
+} chacha20_t;
typedef struct rar5
{
@@ -455,6 +459,22 @@ typedef struct ethereum_scrypt
} ethereum_scrypt_t;
+typedef struct luks_tmp
+{
+ u32 ipad32[8];
+ u64 ipad64[8];
+
+ u32 opad32[8];
+ u64 opad64[8];
+
+ u32 dgst32[32];
+ u64 dgst64[16];
+
+ u32 out32[32];
+ u64 out64[16];
+
+} luks_tmp_t;
+
typedef struct pdf14_tmp
{
u32 digest[4];
diff --git a/include/types.h b/include/types.h
index da3257f87..3670aa256 100644
--- a/include/types.h
+++ b/include/types.h
@@ -666,26 +666,6 @@ typedef enum user_options_map
* structs
*/
-typedef struct
-{
- u64 h[8];
- u64 t[2];
- u64 f[2];
- u32 buflen;
- u32 outlen;
- u8 last_node;
-
-} blake2_t;
-
-typedef struct
-{
- u32 iv[2];
- u32 plain[2];
- u32 position[2];
- u32 offset;
-
-} chacha20_t;
-
typedef struct
{
u32 salt_buf[16];