-From 315c5aa421c4cab3f0e8b0cf0bae89b57ead9bef Mon Sep 17 00:00:00 2001
+From 625c4231a001d4c710a25a800a45d086ae183801 Mon Sep 17 00:00:00 2001
 From: David Drysdale <drysdale@google.com>
 Date: Fri, 12 Sep 2014 10:32:19 +0100
 Subject: [PATCH] Updates for standalone Linux Chaps build

 	  $(DESTDIR)/etc/dbus-1/system.d/org.chromium.Chaps.conf
 	$(INSTALL_DATA) -D $(SRC)/org.chromium.Chaps.service \
diff --git a/chaps/chaps.cc b/chaps/chaps.cc
index 077323deb5db..60abdf9ea858 100644
--- a/chaps/chaps.cc
+++ b/chaps/chaps.cc
@@ -76,7 +76,7 @@ static CK_RV HandlePKCS11Output(CK_RV result,

     return false;
   }
diff --git a/chaps/object_store_test.cc b/chaps/object_store_test.cc
index 30aafdf..f5d1298 100644
--- a/chaps/object_store_test.cc
+++ b/chaps/object_store_test.cc
@@ -120,6 +120,7 @@ TEST_F(TestObjectStoreEncryption, CBCMode) {
