1
=== modified file 'debian/copyright'
2
--- debian/copyright	2015-02-22 07:46:25 +0000
3
+++ debian/copyright	2016-01-25 18:06:54 +0000
4
@@ -153,3 +153,19 @@
5
153
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
153
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6
154
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
154
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
7
155
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
155
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8
156
9
157
 Files: src/cookie/const_memcmp.h src/cookie/const_memcmp.cpp
10
158
 Copyright: Copyright (c) 2013-2016
11
159
  Frank Denis <j at pureftpd dot org>
12
160
13
161
  Permission to use, copy, modify, and/or distribute this software for any
14
162
  purpose with or without fee is hereby granted, provided that the above
15
163
  copyright notice and this permission notice appear in all copies.
16
164
17
165
  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
18
166
  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
19
167
  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
20
168
  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
21
169
  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
22
170
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
23
171
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
24
156
172
25
=== modified file 'src/cookie/CMakeLists.txt'
26
--- src/cookie/CMakeLists.txt	2016-01-25 18:06:53 +0000
27
+++ src/cookie/CMakeLists.txt	2016-01-25 18:06:54 +0000
28
@@ -24,6 +24,7 @@
29
24
24
30
25
  ${symbol_map}
25
  ${symbol_map}
31
26
  authority.cpp
26
  authority.cpp
32
27
  const_memcmp.cpp
33
27
  hmac_cookie.cpp
28
  hmac_cookie.cpp
34
28
)
29
)
35
29
30
36
30
31
37
=== modified file 'src/cookie/authority.cpp'
38
--- src/cookie/authority.cpp	2016-01-25 18:06:53 +0000
39
+++ src/cookie/authority.cpp	2016-01-25 18:06:54 +0000
40
@@ -20,6 +20,7 @@
41
20
#include "mir/cookie/authority.h"
20
#include "mir/cookie/authority.h"
42
21
#include "mir/cookie/blob.h"
21
#include "mir/cookie/blob.h"
43
22
#include "hmac_cookie.h"
22
#include "hmac_cookie.h"
44
23
#include "const_memcmp.h"
45
23
#include "format.h"
24
#include "format.h"
46
24
25
47
25
#include <algorithm>
26
#include <algorithm>
48
@@ -28,6 +29,7 @@
49
28
#include <system_error>
29
#include <system_error>
50
29
30
51
30
#include <nettle/hmac.h>
31
#include <nettle/hmac.h>
52
32
53
31
#include <linux/random.h>
33
#include <linux/random.h>
54
32
#include <sys/types.h>
34
#include <sys/types.h>
55
33
#include <sys/stat.h>
35
#include <sys/stat.h>
56
@@ -41,7 +43,8 @@
57
41
{
43
{
58
42
std::string const random_device_path{"/dev/random"};
44
std::string const random_device_path{"/dev/random"};
59
43
std::string const urandom_device_path{"/dev/urandom"};
45
std::string const urandom_device_path{"/dev/urandom"};
61
44
int const wait_seconds{30};
46
uint32_t const wait_seconds{30};
62
47
uint32_t const mac_byte_size{20};
63
45
48
64
46
size_t cookie_size_from_format(mir::cookie::Format const& format)
49
size_t cookie_size_from_format(mir::cookie::Format const& format)
65
47
{
50
{
66
@@ -141,9 +144,9 @@
67
141
    {
144
    {
68
142
        /*
145
        /*
69
143
        SHA_1 Format:
146
        SHA_1 Format:
73
144
        1 byte  = FORMAT
147
        1  byte  = FORMAT
74
145
        8 btyes = TIMESTAMP
148
        8  bytes = TIMESTAMP
75
146
        8 BYTES = MAC
149
        20 bytes = MAC
76
147
        */
150
        */
77
148
151
78
149
        if (raw_cookie.size() != cookie_size_from_format(mir::cookie::Format::hmac_sha_1_8))
152
        if (raw_cookie.size() != cookie_size_from_format(mir::cookie::Format::hmac_sha_1_8))
79
@@ -162,11 +165,10 @@
80
162
        auto ptr = raw_cookie.data();
165
        auto ptr = raw_cookie.data();
81
163
        ptr++;
166
        ptr++;
82
164
167
84
165
        memcpy(&timestamp, ptr, 8);
168
        memcpy(&timestamp, ptr, sizeof(uint64_t));
85
166
        ptr += sizeof(timestamp);
169
        ptr += sizeof(timestamp);
86
167
170
89
168
        // FIXME Soon to be 20 bytes
171
        std::vector<uint8_t> mac(mac_byte_size);
88
169
        std::vector<uint8_t> mac(8);
90
170
        memcpy(mac.data(), ptr, mac.size());
172
        memcpy(mac.data(), ptr, mac.size());
91
171
173
92
172
        std::unique_ptr<mir::cookie::Cookie> cookie =
174
        std::unique_ptr<mir::cookie::Cookie> cookie =
93
@@ -183,10 +185,9 @@
94
183
private:
185
private:
95
184
    std::vector<uint8_t> calculate_cookie(uint64_t const& timestamp)
186
    std::vector<uint8_t> calculate_cookie(uint64_t const& timestamp)
96
185
    {
187
    {
99
186
        // FIXME Soon to change to 160bits, for now uint64_t
188
        std::vector<uint8_t> mac(mac_byte_size);
98
187
        std::vector<uint8_t> mac(sizeof(uint64_t));
100
188
        hmac_sha1_update(&ctx, sizeof(timestamp), reinterpret_cast<uint8_t const*>(&timestamp));
189
        hmac_sha1_update(&ctx, sizeof(timestamp), reinterpret_cast<uint8_t const*>(&timestamp));
102
189
        hmac_sha1_digest(&ctx, sizeof(uint64_t), reinterpret_cast<uint8_t*>(mac.data()));
190
        hmac_sha1_digest(&ctx, mac.size(), mac.data());
103
190
191
104
191
        return mac;
192
        return mac;
105
192
    }
193
    }
106
@@ -198,8 +199,8 @@
107
198
        auto const this_stream  = cookie->serialize();
199
        auto const this_stream  = cookie->serialize();
108
199
        auto const other_stream = calculated_cookie->serialize();
200
        auto const other_stream = calculated_cookie->serialize();
109
200
201
112
201
        // FIXME Need to do a constant memcmp here!
202
        return this_stream.size() == other_stream.size() &&
113
202
        return std::equal(std::begin(this_stream), std::end(this_stream), std::begin(other_stream));
203
               mir::cookie::const_memcmp(this_stream.data(), other_stream.data(), this_stream.size()) == 0;
114
203
    }
204
    }
115
204
205
116
205
    struct hmac_sha1_ctx ctx;
206
    struct hmac_sha1_ctx ctx;
117
206
207
118
=== added file 'src/cookie/const_memcmp.cpp'
119
--- src/cookie/const_memcmp.cpp	1970-01-01 00:00:00 +0000
120
+++ src/cookie/const_memcmp.cpp	2016-01-25 18:06:54 +0000
121
@@ -0,0 +1,33 @@
122
1
/*
123
2
 * Copyright (c) 2013-2016
124
3
 * Frank Denis <j at pureftpd dot org>
125
4
 *
126
5
 * Permission to use, copy, modify, and/or distribute this software for any
127
6
 * purpose with or without fee is hereby granted, provided that the above
128
7
 * copyright notice and this permission notice appear in all copies.
129
8
 *
130
9
 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
131
10
 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
132
11
 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
133
12
 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
134
13
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
135
14
 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
136
15
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
137
16
 */
138
17
139
18
#include "const_memcmp.h"
140
19
141
20
int mir::cookie::const_memcmp(void const* const b1_, void const* const b2_, size_t len)
142
21
{
143
22
    volatile unsigned char const* b1 = (volatile unsigned char const*) b1_;
144
23
    volatile unsigned char const* b2 = (volatile unsigned char const*) b2_;
145
24
146
25
    size_t        i;
147
26
    unsigned char d = (unsigned char) 0U;
148
27
149
28
    for (i = 0U; i < len; i++)
150
29
    {
151
30
        d |= b1[i] ^ b2[i];
152
31
    }
153
32
    return (1 & ((d - 1) >> 8)) - 1;
154
33
}
155
0
34
156
=== added file 'src/cookie/const_memcmp.h'
157
--- src/cookie/const_memcmp.h	1970-01-01 00:00:00 +0000
158
+++ src/cookie/const_memcmp.h	2016-01-25 18:06:54 +0000
159
@@ -0,0 +1,26 @@
160
1
/*
161
2
 * Copyright (c) 2013-2016
162
3
 * Frank Denis <j at pureftpd dot org>
163
4
 *
164
5
 * Permission to use, copy, modify, and/or distribute this software for any
165
6
 * purpose with or without fee is hereby granted, provided that the above
166
7
 * copyright notice and this permission notice appear in all copies.
167
8
 *
168
9
 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
169
10
 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
170
11
 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
171
12
 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
172
13
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
173
14
 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
174
15
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
175
16
 */
176
17
177
18
#include "stddef.h"
178
19
179
20
namespace mir
180
21
{
181
22
namespace cookie
182
23
{
183
24
int const_memcmp(void const* const b1_, void const* const b2_, size_t len);
184
25
}
185
26
}
186
0
27
187
=== modified file 'src/include/cookie/mir/cookie/blob.h'
188
--- src/include/cookie/mir/cookie/blob.h	2016-01-25 18:06:53 +0000
189
+++ src/include/cookie/mir/cookie/blob.h	2016-01-25 18:06:54 +0000
190
@@ -25,7 +25,7 @@
191
25
{
25
{
192
26
namespace cookie
26
namespace cookie
193
27
{
27
{
195
28
size_t const default_blob_size = 17;
28
size_t const default_blob_size = 29;
196
29
using Blob = std::array<uint8_t, default_blob_size>;
29
using Blob = std::array<uint8_t, default_blob_size>;
197
30
}
30
}
198
31
}
31
}
199
32
32
200
=== modified file 'src/server/input/default_event_builder.cpp'
201
--- src/server/input/default_event_builder.cpp	2016-01-25 18:06:53 +0000
202
+++ src/server/input/default_event_builder.cpp	2016-01-25 18:06:54 +0000
203
@@ -69,7 +69,6 @@
204
69
    const float x_axis_value = 0;
69
    const float x_axis_value = 0;
205
70
    const float y_axis_value = 0;
70
    const float y_axis_value = 0;
206
71
    std::vector<uint8_t> vec_cookie{};
71
    std::vector<uint8_t> vec_cookie{};
207
72
    // FIXME Moving to 160bits soon
208
73
    if (action == mir_pointer_action_button_up || action == mir_pointer_action_button_down)
72
    if (action == mir_pointer_action_button_up || action == mir_pointer_action_button_down)
209
74
    {
73
    {
210
75
        auto const cookie = cookie_authority->make_cookie(timestamp.count());
74
        auto const cookie = cookie_authority->make_cookie(timestamp.count());
Status:	Merged
Approved by:	Brandon Schaefer on 2016-01-26
Approved revision:	no longer in the source branch.
Merged at revision:	3270
Proposed branch:	lp:~mir-team/mir/160-bit-finally
Merge into:	lp:mir
Prerequisite:	lp:~mir-team/mir/public-cookie-api
Diff against target:	210 lines (+90/-14) 7 files modified debian/copyright (+16/-0) src/cookie/CMakeLists.txt (+1/-0) src/cookie/authority.cpp (+13/-12) src/cookie/const_memcmp.cpp (+33/-0) src/cookie/const_memcmp.h (+26/-0) src/include/cookie/mir/cookie/blob.h (+1/-1) src/server/input/default_event_builder.cpp (+0/-1)
To merge this branch:	bzr merge lp:~mir-team/mir/160-bit-finally
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2016-01-25
Kevin DuBois (community)		2016-01-24	Approve on 2016-01-25
Mir CI Bot	continuous-integration		Needs Fixing on 2016-01-25
Alberto Aguirre (community)			Approve on 2016-01-25
Review via email: mp+283751@code.launchpad.net
1	=== modified file 'debian/copyright'
2	--- debian/copyright 2015-02-22 07:46:25 +0000
3	+++ debian/copyright 2016-01-25 18:06:54 +0000
4	@@ -153,3 +153,19 @@
5	153	THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	153	THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6	154	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE	154	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
7	155	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	155	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8			156
9			157	Files: src/cookie/const_memcmp.h src/cookie/const_memcmp.cpp
10			158	Copyright: Copyright (c) 2013-2016
11			159	Frank Denis <j at pureftpd dot org>
12			160
13			161	Permission to use, copy, modify, and/or distribute this software for any
14			162	purpose with or without fee is hereby granted, provided that the above
15			163	copyright notice and this permission notice appear in all copies.
16			164
17			165	THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
18			166	WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
19			167	MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
20			168	ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
21			169	WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
22			170	ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
23			171	OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
24	156		172
25	=== modified file 'src/cookie/CMakeLists.txt'
26	--- src/cookie/CMakeLists.txt 2016-01-25 18:06:53 +0000
27	+++ src/cookie/CMakeLists.txt 2016-01-25 18:06:54 +0000
28	@@ -24,6 +24,7 @@
29	24		24
30	25	${symbol_map}	25	${symbol_map}
31	26	authority.cpp	26	authority.cpp
32			27	const_memcmp.cpp
33	27	hmac_cookie.cpp	28	hmac_cookie.cpp
34	28	)	29	)
35	29		30
36	30		31
37	=== modified file 'src/cookie/authority.cpp'
38	--- src/cookie/authority.cpp 2016-01-25 18:06:53 +0000
39	+++ src/cookie/authority.cpp 2016-01-25 18:06:54 +0000
40	@@ -20,6 +20,7 @@
41	20	#include "mir/cookie/authority.h"	20	#include "mir/cookie/authority.h"
42	21	#include "mir/cookie/blob.h"	21	#include "mir/cookie/blob.h"
43	22	#include "hmac_cookie.h"	22	#include "hmac_cookie.h"
44			23	#include "const_memcmp.h"
45	23	#include "format.h"	24	#include "format.h"
46	24		25
47	25	#include <algorithm>	26	#include <algorithm>
48	@@ -28,6 +29,7 @@
49	28	#include <system_error>	29	#include <system_error>
50	29		30
51	30	#include <nettle/hmac.h>	31	#include <nettle/hmac.h>
52			32
53	31	#include <linux/random.h>	33	#include <linux/random.h>
54	32	#include <sys/types.h>	34	#include <sys/types.h>
55	33	#include <sys/stat.h>	35	#include <sys/stat.h>
56	@@ -41,7 +43,8 @@
57	41	{	43	{
58	42	std::string const random_device_path{"/dev/random"};	44	std::string const random_device_path{"/dev/random"};
59	43	std::string const urandom_device_path{"/dev/urandom"};	45	std::string const urandom_device_path{"/dev/urandom"};
61	44	int const wait_seconds{30};	46	uint32_t const wait_seconds{30};
62			47	uint32_t const mac_byte_size{20};
63	45		48
64	46	size_t cookie_size_from_format(mir::cookie::Format const& format)	49	size_t cookie_size_from_format(mir::cookie::Format const& format)
65	47	{	50	{
66	@@ -141,9 +144,9 @@
67	141	{	144	{
68	142	/*	145	/*
69	143	SHA_1 Format:	146	SHA_1 Format:
73	144	1 byte = FORMAT	147	1 byte = FORMAT
74	145	8 btyes = TIMESTAMP	148	8 bytes = TIMESTAMP
75	146	8 BYTES = MAC	149	20 bytes = MAC
76	147	*/	150	*/
77	148		151
78	149	if (raw_cookie.size() != cookie_size_from_format(mir::cookie::Format::hmac_sha_1_8))	152	if (raw_cookie.size() != cookie_size_from_format(mir::cookie::Format::hmac_sha_1_8))
79	@@ -162,11 +165,10 @@
80	162	auto ptr = raw_cookie.data();	165	auto ptr = raw_cookie.data();
81	163	ptr++;	166	ptr++;
82	164		167
84	165	memcpy(&timestamp, ptr, 8);	168	memcpy(&timestamp, ptr, sizeof(uint64_t));
85	166	ptr += sizeof(timestamp);	169	ptr += sizeof(timestamp);
86	167		170
89	168	// FIXME Soon to be 20 bytes	171	std::vector<uint8_t> mac(mac_byte_size);
88	169	std::vector<uint8_t> mac(8);
90	170	memcpy(mac.data(), ptr, mac.size());	172	memcpy(mac.data(), ptr, mac.size());
91	171		173
92	172	std::unique_ptr<mir::cookie::Cookie> cookie =	174	std::unique_ptr<mir::cookie::Cookie> cookie =
93	@@ -183,10 +185,9 @@
94	183	private:	185	private:
95	184	std::vector<uint8_t> calculate_cookie(uint64_t const& timestamp)	186	std::vector<uint8_t> calculate_cookie(uint64_t const& timestamp)
96	185	{	187	{
99	186	// FIXME Soon to change to 160bits, for now uint64_t	188	std::vector<uint8_t> mac(mac_byte_size);
98	187	std::vector<uint8_t> mac(sizeof(uint64_t));
100	188	hmac_sha1_update(&ctx, sizeof(timestamp), reinterpret_cast<uint8_t const*>(&timestamp));	189	hmac_sha1_update(&ctx, sizeof(timestamp), reinterpret_cast<uint8_t const*>(&timestamp));
102	189	hmac_sha1_digest(&ctx, sizeof(uint64_t), reinterpret_cast<uint8_t*>(mac.data()));	190	hmac_sha1_digest(&ctx, mac.size(), mac.data());
103	190		191
104	191	return mac;	192	return mac;
105	192	}	193	}
106	@@ -198,8 +199,8 @@
107	198	auto const this_stream = cookie->serialize();	199	auto const this_stream = cookie->serialize();
108	199	auto const other_stream = calculated_cookie->serialize();	200	auto const other_stream = calculated_cookie->serialize();
109	200		201
112	201	// FIXME Need to do a constant memcmp here!	202	return this_stream.size() == other_stream.size() &&
113	202	return std::equal(std::begin(this_stream), std::end(this_stream), std::begin(other_stream));	203	mir::cookie::const_memcmp(this_stream.data(), other_stream.data(), this_stream.size()) == 0;
114	203	}	204	}
115	204		205
116	205	struct hmac_sha1_ctx ctx;	206	struct hmac_sha1_ctx ctx;
117	206		207
118	=== added file 'src/cookie/const_memcmp.cpp'
119	--- src/cookie/const_memcmp.cpp 1970-01-01 00:00:00 +0000
120	+++ src/cookie/const_memcmp.cpp 2016-01-25 18:06:54 +0000
121	@@ -0,0 +1,33 @@
122			1	/*
123			2	* Copyright (c) 2013-2016
124			3	* Frank Denis <j at pureftpd dot org>
125			4	*
126			5	* Permission to use, copy, modify, and/or distribute this software for any
127			6	* purpose with or without fee is hereby granted, provided that the above
128			7	* copyright notice and this permission notice appear in all copies.
129			8	*
130			9	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
131			10	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
132			11	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
133			12	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
134			13	* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
135			14	* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
136			15	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
137			16	*/
138			17
139			18	#include "const_memcmp.h"
140			19
141			20	int mir::cookie::const_memcmp(void const* const b1_, void const* const b2_, size_t len)
142			21	{
143			22	volatile unsigned char const* b1 = (volatile unsigned char const*) b1_;
144			23	volatile unsigned char const* b2 = (volatile unsigned char const*) b2_;
145			24
146			25	size_t i;
147			26	unsigned char d = (unsigned char) 0U;
148			27
149			28	for (i = 0U; i < len; i++)
150			29	{
151			30	d \|= b1[i] ^ b2[i];
152			31	}
153			32	return (1 & ((d - 1) >> 8)) - 1;
154			33	}
155	0		34
156	=== added file 'src/cookie/const_memcmp.h'
157	--- src/cookie/const_memcmp.h 1970-01-01 00:00:00 +0000
158	+++ src/cookie/const_memcmp.h 2016-01-25 18:06:54 +0000
159	@@ -0,0 +1,26 @@
160			1	/*
161			2	* Copyright (c) 2013-2016
162			3	* Frank Denis <j at pureftpd dot org>
163			4	*
164			5	* Permission to use, copy, modify, and/or distribute this software for any
165			6	* purpose with or without fee is hereby granted, provided that the above
166			7	* copyright notice and this permission notice appear in all copies.
167			8	*
168			9	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
169			10	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
170			11	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
171			12	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
172			13	* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
173			14	* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
174			15	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
175			16	*/
176			17
177			18	#include "stddef.h"
178			19
179			20	namespace mir
180			21	{
181			22	namespace cookie
182			23	{
183			24	int const_memcmp(void const* const b1_, void const* const b2_, size_t len);
184			25	}
185			26	}
186	0		27
187	=== modified file 'src/include/cookie/mir/cookie/blob.h'
188	--- src/include/cookie/mir/cookie/blob.h 2016-01-25 18:06:53 +0000
189	+++ src/include/cookie/mir/cookie/blob.h 2016-01-25 18:06:54 +0000
190	@@ -25,7 +25,7 @@
191	25	{	25	{
192	26	namespace cookie	26	namespace cookie
193	27	{	27	{
195	28	size_t const default_blob_size = 17;	28	size_t const default_blob_size = 29;
196	29	using Blob = std::array<uint8_t, default_blob_size>;	29	using Blob = std::array<uint8_t, default_blob_size>;
197	30	}	30	}
198	31	}	31	}
199	32		32
200	=== modified file 'src/server/input/default_event_builder.cpp'
201	--- src/server/input/default_event_builder.cpp 2016-01-25 18:06:53 +0000
202	+++ src/server/input/default_event_builder.cpp 2016-01-25 18:06:54 +0000
203	@@ -69,7 +69,6 @@
204	69	const float x_axis_value = 0;	69	const float x_axis_value = 0;
205	70	const float y_axis_value = 0;	70	const float y_axis_value = 0;
206	71	std::vector<uint8_t> vec_cookie{};	71	std::vector<uint8_t> vec_cookie{};
207	72	// FIXME Moving to 160bits soon
208	73	if (action == mir_pointer_action_button_up \|\| action == mir_pointer_action_button_down)	72	if (action == mir_pointer_action_button_up \|\| action == mir_pointer_action_button_down)
209	74	{	73	{
210	75	auto const cookie = cookie_authority->make_cookie(timestamp.count());	74	auto const cookie = cookie_authority->make_cookie(timestamp.count());