commit f4e554e438753bff8b56de7049ac6bcc9dbc83ca
author Adam Langley <agl@google.com> Wed Sep 30 13:46:34 2015 -0700
committer Adam Langley <agl@google.com> Wed Sep 30 20:50:18 2015 +0000
tree 0382b4862f2fee9582b4510b35bbaf2ede4da240
parent 72d9cba7cb78ddc9c8ec3f27a9367c407f7d0915

Bitwise-or, not logical-or, when hashing.

This didn't actually break anything, but it does make session lookup
quite slow.

Change-Id: I13615e8ccf6a46683a21774eb7c073318ae8c28c
Reviewed-on: https://boringssl-review.googlesource.com/6054
Reviewed-by: Matt Braithwaite <mab@google.com>
Reviewed-by: Adam Langley <agl@google.com>

ssl/ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 5190a53..25d65c1 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -183,9 +183,9 @@
 
 static uint32_t ssl_session_hash(const SSL_SESSION *a) {
   uint32_t hash =
-      ((uint32_t)a->session_id[0]) ||
-      ((uint32_t)a->session_id[1] << 8) ||
-      ((uint32_t)a->session_id[2] << 16) ||
+      ((uint32_t)a->session_id[0]) |
+      ((uint32_t)a->session_id[1] << 8) |
+      ((uint32_t)a->session_id[2] << 16) |
       ((uint32_t)a->session_id[3] << 24);
 
   return hash;