diff options
| author | Shawn Willden <swillden@google.com> | 2016-03-09 20:03:38 -0700 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2016-03-30 22:02:02 -0600 |
| commit | cddf3a443abf64f3d77c48886693179c0b8a35bb (patch) | |
| tree | a0562a76010ec7faefd2f2737bbcd6a985fe01fd /Makefile | |
| parent | 6a29a1b0e6623b70fd1b00dcc49a36357d1841a1 (diff) | |
| download | android_system_keymaster-cddf3a443abf64f3d77c48886693179c0b8a35bb.tar.gz android_system_keymaster-cddf3a443abf64f3d77c48886693179c0b8a35bb.tar.bz2 android_system_keymaster-cddf3a443abf64f3d77c48886693179c0b8a35bb.zip | |
Implement key version binding.
Change-Id: If0f3bc12380b8b65bf1e60d5d8d039eb972c8a15
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -49,11 +49,11 @@ CFLAGS += -fprofile-arcs -ftest-coverage endif LDFLAGS += $(ARCH_FLAGS) -CPPFLAGS = $(INCLUDES) -g -O0 -MD -MP +CPPFLAGS = $(INCLUDES) -g -O0 -MD -MP $(ARCH_FLAGS) -DKEYMASTER_UNIT_TEST_BUILD -DHOST_BUILD CXXFLAGS += -Wall -Werror -Wno-unused -Winit-self -Wpointer-arith -Wunused-parameter \ -Werror=sign-compare -Werror=return-type -fno-permissive \ -Wno-deprecated-declarations -fno-exceptions -DKEYMASTER_NAME_TAGS $(ARCH_FLAGS) -CFLAGS += $(ARCH_FLAGS) +CFLAGS += $(ARCH_FLAGS) -DKEYMASTER_UNIT_TEST_BUILD -DHOST_BUILD # Uncomment to enable debug logging. # CXXFLAGS += -DDEBUG @@ -94,13 +94,15 @@ CPPSRCS=\ integrity_assured_key_blob.cpp \ iso18033kdf.cpp \ kdf.cpp \ - kdf_test.cpp \ kdf1_test.cpp \ kdf2_test.cpp \ + kdf_test.cpp \ key.cpp \ key_blob_test.cpp \ keymaster0_engine.cpp \ keymaster1_engine.cpp \ + keymaster_configuration.cpp \ + keymaster_configuration_test.cpp \ keymaster_enforcement.cpp \ keymaster_enforcement_test.cpp \ keymaster_tags.cpp \ @@ -137,10 +139,11 @@ BINARIES = \ ecies_kem_test \ hkdf_test \ hmac_test \ - kdf_test \ kdf1_test \ kdf2_test \ + kdf_test \ key_blob_test \ + keymaster_configuration_test \ keymaster_enforcement_test \ nist_curve_key_exchange_test @@ -191,6 +194,13 @@ massif: $(BINARIES:=.massif) GTEST_OBJS = $(GTEST)/src/gtest-all.o gtest_main.o +keymaster_configuration_test: keymaster_configuration_test.o \ + authorization_set.o \ + serializable.o \ + logger.o \ + keymaster_configuration.o \ + $(GTEST_OBJS) + hmac_test: hmac_test.o \ android_keymaster_test_utils.o \ android_keymaster_utils.o \ |