Merge lp:~mir-team/mir/160-bit-finally into lp:mir

[Brandon Schaefer]

mir-cookie: Use a constant time memcmp to verify cookie contents

Additionally use the full SHA1 size of 160 bits for the cookie MAC.

mir-cookie: Use a constant time memcmp to verify cookie contents

Additionally use the full SHA1 size of 160 bits for the cookie MAC.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3270
https://mir-jenkins.ubuntu.com/job/mir-ci/146/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/147/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/146/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3270
http://jenkins.qa.ubuntu.com/job/mir-ci/6118/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5673/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4580/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5629
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/442
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/442/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/442
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/442/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5626
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5626/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8061
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26994

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6118/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3270
http://jenkins.qa.ubuntu.com/job/mir-ci/6120/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5675/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4582
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5631
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/444/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/444
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/444/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5628
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5628/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8063
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26998

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6120/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

E: Unable to locate package libsodium-dev
apt download failed. Exit value: 100

That ought to be there. Restarting

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3270
http://jenkins.qa.ubuntu.com/job/mir-ci/6121/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5676/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/445
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/445/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/445
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/445/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5629
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5629/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8064
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27006

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6121/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

Is it too difficult to write an equivalent function to sodium_memcmp()? Or, perhaps, are we looking to use more functions from this library in the near future? I'd rather have an internal memcmp (if its not to difficult to write) than add an additional dependency.

review: Needs Information

[Brandon Schaefer (brandontschaefer)]

Decided to just grab the function we will be using from sodium (since its an MIT/ISC)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3271
https://mir-jenkins.ubuntu.com/job/mir-ci/154/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/154/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/154/rebuild

review: Approve (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3272
https://mir-jenkins.ubuntu.com/job/mir-ci/155/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/155/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/155/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

LGTM.

review: Approve

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3272
https://mir-jenkins.ubuntu.com/job/mir-ci/156/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/156/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/156/rebuild

review: Approve (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3273
https://mir-jenkins.ubuntu.com/job/mir-ci/157/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/157/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/157/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3271
http://jenkins.qa.ubuntu.com/job/mir-ci/6125/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5680/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4587
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5636
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/449
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/449
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5633
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5633/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8068
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27023

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6125/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

alright, thanks for removing the dependency for the one function. lgtm too.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3273
http://jenkins.qa.ubuntu.com/job/mir-ci/6126/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5682
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4589
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/450
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/450/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/450
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/450/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5635
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5635/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8070
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27027
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/330
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/186
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27030

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6126/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/copyright'
--- debian/copyright	2015-02-22 07:46:25 +0000
+++ debian/copyright	2016-01-25 18:06:54 +0000
@@ -153,3 +153,19 @@
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ Files: src/cookie/const_memcmp.h src/cookie/const_memcmp.cpp
+ Copyright: Copyright (c) 2013-2016
+  Frank Denis <j at pureftpd dot org>
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

=== modified file 'src/cookie/CMakeLists.txt'
--- src/cookie/CMakeLists.txt	2016-01-25 18:06:53 +0000
+++ src/cookie/CMakeLists.txt	2016-01-25 18:06:54 +0000
@@ -24,6 +24,7 @@
 
   ${symbol_map}
   authority.cpp
+  const_memcmp.cpp
   hmac_cookie.cpp
 )
 

=== modified file 'src/cookie/authority.cpp'
--- src/cookie/authority.cpp	2016-01-25 18:06:53 +0000
+++ src/cookie/authority.cpp	2016-01-25 18:06:54 +0000
@@ -20,6 +20,7 @@
 #include "mir/cookie/authority.h"
 #include "mir/cookie/blob.h"
 #include "hmac_cookie.h"
+#include "const_memcmp.h"
 #include "format.h"
 
 #include <algorithm>
@@ -28,6 +29,7 @@
 #include <system_error>
 
 #include <nettle/hmac.h>
+
 #include <linux/random.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -41,7 +43,8 @@
 {
 std::string const random_device_path{"/dev/random"};
 std::string const urandom_device_path{"/dev/urandom"};
-int const wait_seconds{30};
+uint32_t const wait_seconds{30};
+uint32_t const mac_byte_size{20};
 
 size_t cookie_size_from_format(mir::cookie::Format const& format)
 {
@@ -141,9 +144,9 @@
     {
         /*
         SHA_1 Format:
-        1 byte  = FORMAT
-        8 btyes = TIMESTAMP
-        8 BYTES = MAC
+        1  byte  = FORMAT
+        8  bytes = TIMESTAMP
+        20 bytes = MAC
         */
 
         if (raw_cookie.size() != cookie_size_from_format(mir::cookie::Format::hmac_sha_1_8))
@@ -162,11 +165,10 @@
         auto ptr = raw_cookie.data();
         ptr++;
 
-        memcpy(&timestamp, ptr, 8);
+        memcpy(&timestamp, ptr, sizeof(uint64_t));
         ptr += sizeof(timestamp);
 
-        // FIXME Soon to be 20 bytes
-        std::vector<uint8_t> mac(8);
+        std::vector<uint8_t> mac(mac_byte_size);
         memcpy(mac.data(), ptr, mac.size());
 
         std::unique_ptr<mir::cookie::Cookie> cookie =
@@ -183,10 +185,9 @@
 private:
     std::vector<uint8_t> calculate_cookie(uint64_t const& timestamp)
     {
-        // FIXME Soon to change to 160bits, for now uint64_t
-        std::vector<uint8_t> mac(sizeof(uint64_t));
+        std::vector<uint8_t> mac(mac_byte_size);
         hmac_sha1_update(&ctx, sizeof(timestamp), reinterpret_cast<uint8_t const*>(&timestamp));
-        hmac_sha1_digest(&ctx, sizeof(uint64_t), reinterpret_cast<uint8_t*>(mac.data()));
+        hmac_sha1_digest(&ctx, mac.size(), mac.data());
 
         return mac;
     }
@@ -198,8 +199,8 @@
         auto const this_stream  = cookie->serialize();
         auto const other_stream = calculated_cookie->serialize();
 
-        // FIXME Need to do a constant memcmp here!
-        return std::equal(std::begin(this_stream), std::end(this_stream), std::begin(other_stream));
+        return this_stream.size() == other_stream.size() &&
+               mir::cookie::const_memcmp(this_stream.data(), other_stream.data(), this_stream.size()) == 0;
     }
 
     struct hmac_sha1_ctx ctx;

=== added file 'src/cookie/const_memcmp.cpp'
--- src/cookie/const_memcmp.cpp	1970-01-01 00:00:00 +0000
+++ src/cookie/const_memcmp.cpp	2016-01-25 18:06:54 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2013-2016
+ * Frank Denis <j at pureftpd dot org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "const_memcmp.h"
+
+int mir::cookie::const_memcmp(void const* const b1_, void const* const b2_, size_t len)
+{
+    volatile unsigned char const* b1 = (volatile unsigned char const*) b1_;
+    volatile unsigned char const* b2 = (volatile unsigned char const*) b2_;
+
+    size_t        i;
+    unsigned char d = (unsigned char) 0U;
+
+    for (i = 0U; i < len; i++)
+    {
+        d |= b1[i] ^ b2[i];
+    }
+    return (1 & ((d - 1) >> 8)) - 1;
+}

=== added file 'src/cookie/const_memcmp.h'
--- src/cookie/const_memcmp.h	1970-01-01 00:00:00 +0000
+++ src/cookie/const_memcmp.h	2016-01-25 18:06:54 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2013-2016
+ * Frank Denis <j at pureftpd dot org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "stddef.h"
+
+namespace mir
+{
+namespace cookie
+{
+int const_memcmp(void const* const b1_, void const* const b2_, size_t len);
+}
+}

=== modified file 'src/include/cookie/mir/cookie/blob.h'
--- src/include/cookie/mir/cookie/blob.h	2016-01-25 18:06:53 +0000
+++ src/include/cookie/mir/cookie/blob.h	2016-01-25 18:06:54 +0000
@@ -25,7 +25,7 @@
 {
 namespace cookie
 {
-size_t const default_blob_size = 17;
+size_t const default_blob_size = 29;
 using Blob = std::array<uint8_t, default_blob_size>;
 }
 }

=== modified file 'src/server/input/default_event_builder.cpp'
--- src/server/input/default_event_builder.cpp	2016-01-25 18:06:53 +0000
+++ src/server/input/default_event_builder.cpp	2016-01-25 18:06:54 +0000
@@ -69,7 +69,6 @@
     const float x_axis_value = 0;
     const float y_axis_value = 0;
     std::vector<uint8_t> vec_cookie{};
-    // FIXME Moving to 160bits soon
     if (action == mir_pointer_action_button_up || action == mir_pointer_action_button_down)
     {
         auto const cookie = cookie_authority->make_cookie(timestamp.count());