merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/include/hardware/gralloc.h b/include/hardware/gralloc.h
index a6d9c1f..52ef6a3 100644
--- a/include/hardware/gralloc.h
+++ b/include/hardware/gralloc.h
@@ -19,6 +19,7 @@
#define ANDROID_GRALLOC_INTERFACE_H
#include <system/window.h>
+#include <system/graphics.h>
#include <hardware/hardware.h>
#include <stdint.h>
@@ -32,7 +33,23 @@
__BEGIN_DECLS
-#define GRALLOC_API_VERSION 1
+/**
+ * Module versioning information for the Gralloc hardware module, based on
+ * gralloc_module_t.common.module_api_version.
+ *
+ * Version History:
+ *
+ * GRALLOC_MODULE_API_VERSION_0_1:
+ * Initial Gralloc hardware module API.
+ *
+ * GRALLOC_MODULE_API_VERSION_0_2:
+ * Add support for flexible YCbCr format with (*lock_ycbcr)() method.
+ */
+
+#define GRALLOC_MODULE_API_VERSION_0_1 HARDWARE_MODULE_API_VERSION(0, 1)
+#define GRALLOC_MODULE_API_VERSION_0_2 HARDWARE_MODULE_API_VERSION(0, 2)
+
+#define GRALLOC_DEVICE_API_VERSION_0_1 HARDWARE_DEVICE_API_VERSION(0, 1)
/**
* The id of this module
@@ -165,6 +182,10 @@
* If usage specifies GRALLOC_USAGE_SW_*, vaddr is filled with the address
* of the buffer in virtual memory.
*
+ * Note calling (*lock)() on HAL_PIXEL_FORMAT_YCbCr_*_888 buffers will fail
+ * and return -EINVAL. These buffers must be locked with (*lock_ycbcr)()
+ * instead.
+ *
* THREADING CONSIDERATIONS:
*
* It is legal for several different threads to lock a buffer from
@@ -201,8 +222,24 @@
int (*perform)(struct gralloc_module_t const* module,
int operation, ... );
+ /*
+ * The (*lock_ycbcr)() method is like the (*lock)() method, with the
+ * difference that it fills a struct ycbcr with a description of the buffer
+ * layout, and zeroes out the reserved fields.
+ *
+ * This will only work on buffers with HAL_PIXEL_FORMAT_YCbCr_*_888, and
+ * will return -EINVAL on any other buffer formats.
+ *
+ * Added in GRALLOC_MODULE_API_VERSION_0_2.
+ */
+
+ int (*lock_ycbcr)(struct gralloc_module_t const* module,
+ buffer_handle_t handle, int usage,
+ int l, int t, int w, int h,
+ struct android_ycbcr *ycbcr);
+
/* reserved for future use */
- void* reserved_proc[7];
+ void* reserved_proc[6];
} gralloc_module_t;
/*****************************************************************************/
diff --git a/tests/keymaster/keymaster_test.cpp b/tests/keymaster/keymaster_test.cpp
index 37e98d7..57e7dc8 100644
--- a/tests/keymaster/keymaster_test.cpp
+++ b/tests/keymaster/keymaster_test.cpp
@@ -14,11 +14,15 @@
* limitations under the License.
*/
-#define LOG_TAG "keymaster_test"
-#include <utils/Log.h>
-#include <utils/UniquePtr.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
-#include <hardware/keymaster.h>
+#include <fstream>
+#include <iostream>
#include <gtest/gtest.h>
@@ -26,13 +30,20 @@
#include <openssl/evp.h>
#include <openssl/x509.h>
-#include <fstream>
-#include <iostream>
+#define LOG_TAG "keymaster_test"
+#include <utils/Log.h>
+#include <utils/UniquePtr.h>
+
+#include <hardware/keymaster.h>
namespace android {
class UniqueBlob : public UniquePtr<uint8_t[]> {
public:
+ UniqueBlob(size_t length) :
+ mLength(length) {
+ }
+
UniqueBlob(uint8_t* bytes, size_t length) :
UniquePtr<uint8_t[]>(bytes), mLength(length) {
}
@@ -97,6 +108,56 @@
keymaster_device_t** mDevice;
};
+class UniqueReadOnlyBlob {
+public:
+ UniqueReadOnlyBlob(uint8_t* data, size_t dataSize) :
+ mDataSize(dataSize) {
+ int pageSize = sysconf(_SC_PAGE_SIZE);
+ if (pageSize == -1) {
+ return;
+ }
+
+ int fd = open("/dev/zero", O_RDONLY);
+ if (fd == -1) {
+ return;
+ }
+
+ mBufferSize = (dataSize + pageSize - 1) & ~(pageSize - 1);
+ uint8_t* buffer = (uint8_t*) mmap(NULL, mBufferSize, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE, fd, 0);
+ close(fd);
+
+ if (buffer == NULL) {
+ return;
+ }
+
+ memcpy(buffer, data, dataSize);
+ if (mprotect(buffer, mBufferSize, PROT_READ) == -1) {
+ munmap(buffer, mBufferSize);
+ return;
+ }
+
+ mBuffer = buffer;
+ }
+
+ ~UniqueReadOnlyBlob() {
+ munmap(mBuffer, mBufferSize);
+ }
+
+ uint8_t* get() const {
+ return mBuffer;
+ }
+
+ size_t length() const {
+ return mDataSize;
+ }
+
+private:
+ uint8_t* mBuffer;
+ size_t mBufferSize;
+ size_t mDataSize;
+};
+
struct BIGNUM_Delete {
void operator()(BIGNUM* p) const {
BN_free(p);
@@ -331,7 +392,7 @@
INSTANTIATE_TEST_CASE_P(RSA,
KeymasterGenerateTest,
- ::testing::Values(512, 1024, 2048));
+ ::testing::Values(512U, 1024U, 2048U));
TEST_F(KeymasterTest, GenerateKeyPair_RSA_NullParams_Failure) {
keymaster_keypair_t key_type = TYPE_RSA;
@@ -415,8 +476,11 @@
uint8_t* key_blob;
size_t key_blob_length;
+ UniqueReadOnlyBlob testKey(TEST_KEY_1, sizeof(TEST_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_KEY_1, sizeof(TEST_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key_blob, &key_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key(&sDevice, key_blob, key_blob_length);
@@ -447,8 +511,11 @@
uint8_t* key_blob;
size_t key_blob_length;
+ UniqueReadOnlyBlob testKey(TEST_KEY_1, sizeof(TEST_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_KEY_1, sizeof(TEST_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key_blob, &key_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key(&sDevice, key_blob, key_blob_length);
@@ -463,8 +530,11 @@
uint8_t* key_blob;
size_t key_blob_length;
+ UniqueReadOnlyBlob testKey(TEST_KEY_1, sizeof(TEST_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_KEY_1, sizeof(TEST_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key_blob, &key_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key(&sDevice, key_blob, key_blob_length);
@@ -474,13 +544,16 @@
uint8_t* key_blob;
size_t key_blob_length;
+ UniqueReadOnlyBlob testKey(TEST_KEY_1, sizeof(TEST_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
/*
* This is only run if the module indicates it implements key deletion
* by implementing delete_keypair.
*/
if (sDevice->delete_keypair != NULL) {
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_KEY_1, sizeof(TEST_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key_blob, &key_blob_length))
<< "Should successfully import an RSA key";
UniqueBlob blob(key_blob, key_blob_length);
@@ -587,8 +660,11 @@
uint8_t* key_blob;
size_t key_blob_length;
+ UniqueReadOnlyBlob testKey(TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key_blob, &key_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key(&sDevice, key_blob, key_blob_length);
@@ -601,9 +677,12 @@
uint8_t* sig;
size_t sig_length;
+ UniqueReadOnlyBlob testData(TEST_SIGN_DATA_1, sizeof(TEST_SIGN_DATA_1));
+ ASSERT_TRUE(testData.get() != NULL);
+
ASSERT_EQ(0,
sDevice->sign_data(sDevice, ¶ms, key_blob, key_blob_length,
- TEST_SIGN_DATA_1, sizeof(TEST_SIGN_DATA_1),
+ testData.get(), testData.length(),
&sig, &sig_length))
<< "Should sign data successfully";
UniqueBlob sig_blob(sig, sig_length);
@@ -621,8 +700,11 @@
uint8_t* key_blob;
size_t key_blob_length;
+ UniqueReadOnlyBlob testKey(TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key_blob, &key_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key(&sDevice, key_blob, key_blob_length);
@@ -635,9 +717,12 @@
uint8_t* sig;
size_t sig_length;
+ UniqueReadOnlyBlob testData(TEST_KEY_1, sizeof(TEST_KEY_1));
+ ASSERT_TRUE(testData.get() != NULL);
+
ASSERT_EQ(-1,
sDevice->sign_data(sDevice, ¶ms, key_blob, key_blob_length,
- TEST_KEY_1, sizeof(TEST_KEY_1),
+ testData.get(), testData.length(),
&sig, &sig_length))
<< "Should not be able to do raw signature on incorrect size data";
}
@@ -651,9 +736,12 @@
uint8_t* sig;
size_t sig_length;
+ UniqueReadOnlyBlob testData(TEST_KEY_1, sizeof(TEST_KEY_1));
+ ASSERT_TRUE(testData.get() != NULL);
+
ASSERT_EQ(-1,
sDevice->sign_data(sDevice, ¶ms, NULL, 0,
- TEST_KEY_1, sizeof(TEST_KEY_1),
+ testData.get(), testData.length(),
&sig, &sig_length))
<< "Should not be able to do raw signature on incorrect size data";
}
@@ -662,8 +750,11 @@
uint8_t* key_blob;
size_t key_blob_length;
+ UniqueReadOnlyBlob testKey(TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key_blob, &key_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key(&sDevice, key_blob, key_blob_length);
@@ -687,8 +778,11 @@
uint8_t* key_blob;
size_t key_blob_length;
+ UniqueReadOnlyBlob testKey(TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key_blob, &key_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key(&sDevice, key_blob, key_blob_length);
@@ -701,9 +795,12 @@
uint8_t* sig;
size_t sig_length;
+ UniqueReadOnlyBlob testData(TEST_KEY_1, sizeof(TEST_KEY_1));
+ ASSERT_TRUE(testData.get() != NULL);
+
ASSERT_EQ(-1,
sDevice->sign_data(sDevice, ¶ms, key_blob, key_blob_length,
- TEST_KEY_1, sizeof(TEST_KEY_1),
+ testData.get(), testData.length(),
NULL, NULL))
<< "Should error when output is null";
}
@@ -712,8 +809,11 @@
uint8_t* key_blob;
size_t key_blob_length;
+ UniqueReadOnlyBlob testKey(TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key_blob, &key_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key(&sDevice, key_blob, key_blob_length);
@@ -723,10 +823,16 @@
padding_type: PADDING_NONE,
};
+ UniqueReadOnlyBlob testData(TEST_SIGN_DATA_1, sizeof(TEST_SIGN_DATA_1));
+ ASSERT_TRUE(testData.get() != NULL);
+
+ UniqueReadOnlyBlob testSig(TEST_SIGN_SIGNATURE_1, sizeof(TEST_SIGN_SIGNATURE_1));
+ ASSERT_TRUE(testSig.get() != NULL);
+
ASSERT_EQ(0,
sDevice->verify_data(sDevice, ¶ms, key_blob, key_blob_length,
- TEST_SIGN_DATA_1, sizeof(TEST_SIGN_DATA_1),
- TEST_SIGN_SIGNATURE_1, sizeof(TEST_SIGN_SIGNATURE_1)))
+ testData.get(), testData.length(),
+ testSig.get(), testSig.length()))
<< "Should verify data successfully";
}
@@ -734,8 +840,11 @@
uint8_t* key_blob;
size_t key_blob_length;
+ UniqueReadOnlyBlob testKey(TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key_blob, &key_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key(&sDevice, key_blob, key_blob_length);
@@ -758,10 +867,16 @@
padding_type: PADDING_NONE,
};
+ UniqueReadOnlyBlob testData(TEST_SIGN_DATA_1, sizeof(TEST_SIGN_DATA_1));
+ ASSERT_TRUE(testData.get() != NULL);
+
+ UniqueReadOnlyBlob testSig(TEST_SIGN_SIGNATURE_BOGUS_1, sizeof(TEST_SIGN_SIGNATURE_BOGUS_1));
+ ASSERT_TRUE(testSig.get() != NULL);
+
ASSERT_EQ(-1,
sDevice->verify_data(sDevice, ¶ms, NULL, 0,
- TEST_SIGN_DATA_1, sizeof(TEST_SIGN_DATA_1),
- TEST_SIGN_SIGNATURE_BOGUS_1, sizeof(TEST_SIGN_SIGNATURE_BOGUS_1)))
+ testData.get(), testData.length(),
+ testSig.get(), testSig.length()))
<< "Should fail when key is null";
}
@@ -780,10 +895,13 @@
padding_type: PADDING_NONE,
};
+ UniqueReadOnlyBlob testSig(TEST_SIGN_SIGNATURE_1, sizeof(TEST_SIGN_SIGNATURE_1));
+ ASSERT_TRUE(testSig.get() != NULL);
+
ASSERT_EQ(-1,
sDevice->verify_data(sDevice, ¶ms, key_blob, key_blob_length,
NULL, 0,
- TEST_SIGN_SIGNATURE_1, sizeof(TEST_SIGN_SIGNATURE_1)))
+ testSig.get(), testSig.length()))
<< "Should fail on null input";
}
@@ -791,8 +909,11 @@
uint8_t* key_blob;
size_t key_blob_length;
+ UniqueReadOnlyBlob testKey(TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key_blob, &key_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key(&sDevice, key_blob, key_blob_length);
@@ -802,9 +923,12 @@
padding_type: PADDING_NONE,
};
+ UniqueReadOnlyBlob testData(TEST_SIGN_DATA_1, sizeof(TEST_SIGN_DATA_1));
+ ASSERT_TRUE(testData.get() != NULL);
+
ASSERT_EQ(-1,
sDevice->verify_data(sDevice, ¶ms, key.get(), key.length(),
- TEST_SIGN_DATA_1, sizeof(TEST_SIGN_DATA_1),
+ testData.get(), testData.length(),
NULL, 0))
<< "Should fail on null signature";
}
@@ -818,14 +942,20 @@
return;
}
+ UniqueReadOnlyBlob testKey(TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1));
+ ASSERT_TRUE(testKey.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1),
+ sDevice->import_keypair(sDevice, testKey.get(), testKey.length(),
&key1_blob, &key1_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key1(&sDevice, key1_blob, key1_blob_length);
+ UniqueReadOnlyBlob testKey2(TEST_SIGN_KEY_1, sizeof(TEST_SIGN_KEY_1));
+ ASSERT_TRUE(testKey2.get() != NULL);
+
ASSERT_EQ(0,
- sDevice->import_keypair(sDevice, TEST_KEY_1, sizeof(TEST_KEY_1),
+ sDevice->import_keypair(sDevice, testKey2.get(), testKey2.length(),
&key2_blob, &key2_blob_length))
<< "Should successfully import an RSA key";
UniqueKey key2(&sDevice, key2_blob, key2_blob_length);