summaryrefslogtreecommitdiffstats
path: root/core/tests/coretests/res
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-10-13 15:00:07 -0700
committerKenny Root <kroot@google.com>2010-10-13 18:25:33 -0700
commit3b1abba6bbc895d63da3e82e9b158c01bd12eddd (patch)
tree1296e8c25a2927c94783eda83100c061fc9fe379 /core/tests/coretests/res
parentdfc07279fc6205c38f5f39cb5ba4f0aef6b593a4 (diff)
downloadframeworks_base-3b1abba6bbc895d63da3e82e9b158c01bd12eddd.zip
frameworks_base-3b1abba6bbc895d63da3e82e9b158c01bd12eddd.tar.gz
frameworks_base-3b1abba6bbc895d63da3e82e9b158c01bd12eddd.tar.bz2
OBB: use PBKDF2 for key generation.
Switch to using PBKDF2 for the key generation for OBBs. Any previously generated OBBs will stop being read correctly. A small pbkdf2gen program is available to allow generation of appropriate keys with the salts. Bug: 3059950 Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
Diffstat (limited to 'core/tests/coretests/res')
-rw-r--r--core/tests/coretests/res/raw/test1.obbbin37432 -> 37440 bytes
-rw-r--r--core/tests/coretests/res/raw/test1_wrongpackage.obbbin37423 -> 37431 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/core/tests/coretests/res/raw/test1.obb b/core/tests/coretests/res/raw/test1.obb
index 170e36f..8466588 100644
--- a/core/tests/coretests/res/raw/test1.obb
+++ b/core/tests/coretests/res/raw/test1.obb
Binary files differ
diff --git a/core/tests/coretests/res/raw/test1_wrongpackage.obb b/core/tests/coretests/res/raw/test1_wrongpackage.obb
index 2e02eaa..d0aafe1 100644
--- a/core/tests/coretests/res/raw/test1_wrongpackage.obb
+++ b/core/tests/coretests/res/raw/test1_wrongpackage.obb
Binary files differ