Fixed conflicts

OpenCL/inc_types.cl

@@ -1042,6 +1042,27 @@ typedef struct
 
 } keepass_t;
 
+typedef struct
+{
+  u32 version;
+  u32 context;
+
+  u32 SID[32];
+  u32 SID_len;
+  u32 SID_offset;
+
+  /* here only for possible
+     forward compatibiliy
+  */
+  //char cipher_algo[16];
+  //char hash_algo[16];
+
+  u32 iv[4];
+  u32 contents_len;
+  u32 contents[128];
+
+} dpapimk_t;
+
 typedef struct
 {
   u32 digest[4];
@@ -1381,6 +1402,24 @@ typedef struct
 
 } keepass_tmp_t;
 
+typedef struct
+{
+  /* dedicated to hmac-sha1 */
+  u32 ipad[5];
+  u32 opad[5];
+  u32 dgst[10];
+  u32 out[10];
+
+  u32 userKey[5];
+
+  /* dedicated to hmac-sha512 */
+  u64 ipad64[8];
+  u64 opad64[8];
+  u64 dgst64[16];
+  u64 out64[16];
+
+} dpapimk_tmp_t;
+
 typedef struct
 {
   u32 Kc[16];