commit 5d10102ebab4ff24013e4e9f3e7244a631c7fd8b
author Chad Brubaker <cbrubaker@google.com> Wed Jun 03 10:39:00 2015 -0700
committer Shawn Willden <swillden@google.com> Fri Jun 12 17:05:07 2015 -0600
tree 6078e1538ec8525aaf93b2c4abbab00fd673880b
parent 6022631aa63f0b2921d7fca0662ed3db40e0176e

Fix unused variable issues

Also adds -Wunused to bring gcc's -Werror inline with clang's to prevent
similar build errors later.

Bug:21583577
Change-Id: Ia051adbb3ea92a8ace914ad958a73348d70cca17

Android.mk

diff --git a/Android.mk b/Android.mk
index 2ff96b7..4db0d3b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,7 +28,7 @@
 		serializable.cpp
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/include
-LOCAL_CFLAGS = -Wall -Werror
+LOCAL_CFLAGS = -Wall -Werror -Wunused
 LOCAL_MODULE_TAGS := optional
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@@ -73,7 +73,8 @@
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/include
 LOCAL_SHARED_LIBRARIES := libcrypto libkeymaster_messages
-LOCAL_CFLAGS = -Wall -Werror
+LOCAL_CFLAGS = -Wall -Werror -Wunused
+LOCAL_CLANG_CFLAGS += -Wno-error=unused-const-variable -Wno-error=unused-private-field
 # Ignore benigh warnings for now.
 LOCAL_CLANG_CFLAGS += -Wno-error=unused-private-field
 LOCAL_MODULE_TAGS := optional
@@ -99,8 +100,8 @@
 LOCAL_C_INCLUDES := \
 	system/security/keystore \
 	$(LOCAL_PATH)/include
-LOCAL_CFLAGS = -Wall -Werror
-LOCAL_CLANG_CFLAGS += -Wno-error=unused-const-variable
+LOCAL_CFLAGS = -Wall -Werror -Wunused
+LOCAL_CLANG_CFLAGS += -Wno-error=unused-const-variable -Wno-error=unused-private-field
 LOCAL_SHARED_LIBRARIES := libkeymaster_messages libkeymaster1 liblog libcrypto
 LOCAL_MODULE_TAGS := optional
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@@ -122,7 +123,8 @@
 	keymaster_enforcement_test.cpp
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/include
-LOCAL_CFLAGS = -Wall -Werror
+LOCAL_CFLAGS = -Wall -Werror -Wunused
+LOCAL_CLANG_CFLAGS += -Wno-error=unused-const-variable -Wno-error=unused-private-field
 LOCAL_MODULE_TAGS := tests
 LOCAL_SHARED_LIBRARIES := \
 	libsoftkeymasterdevice \

hkdf.cpp

diff --git a/hkdf.cpp b/hkdf.cpp
index 5c69446..331f8e5 100644
--- a/hkdf.cpp
+++ b/hkdf.cpp
@@ -47,6 +47,8 @@
         result = prk_hmac.Init(zeros, sizeof(zeros));
     }
     assert(result);
+    // avoid the unused variable warning if asserts are disabled.
+    (void) result;
 
     // |prk| is a pseudorandom key (of kSHA256HashLength octets).
     uint8_t prk[kSHA256HashLength];

rsa_operation.cpp

diff --git a/rsa_operation.cpp b/rsa_operation.cpp
index ede5b81..edbaa9e 100644
--- a/rsa_operation.cpp
+++ b/rsa_operation.cpp
@@ -28,8 +28,6 @@
 
 namespace keymaster {
 
-static const int MIN_PSS_SALT_LEN = 8 /* salt len */ + 2 /* overhead */;
-
 /* static */
 EVP_PKEY* RsaOperationFactory::GetRsaKey(const Key& key, keymaster_error_t* error) {
     const RsaKey* rsa_key = static_cast<const RsaKey*>(&key);