am a0925c0b: Merge "PackageSignatureTest: detect devkeys." into jb-dev

* commit 'a0925c0be04ea7fde32a84feea4ca792869606a8':
  PackageSignatureTest: detect devkeys.

5 files changed, 12 insertions, 1 deletions

diff --git a/tests/res/raw/sig_devkeys.bin b/tests/res/raw/sig_devkeys.bin
new file mode 100644
index 00000000000..3c2ad83b622
--- /dev/null
+++ b/tests/res/raw/sig_devkeys.bin
diff --git a/tests/res/raw/sig_devkeys_media.bin b/tests/res/raw/sig_devkeys_media.bin
new file mode 100644
index 00000000000..670d0d90c94
--- /dev/null
+++ b/tests/res/raw/sig_devkeys_media.bin
diff --git a/tests/res/raw/sig_devkeys_platform.bin b/tests/res/raw/sig_devkeys_platform.bin
new file mode 100644
index 00000000000..066e2d00071
--- /dev/null
+++ b/tests/res/raw/sig_devkeys_platform.bin
diff --git a/tests/res/raw/sig_devkeys_shared.bin b/tests/res/raw/sig_devkeys_shared.bin
new file mode 100644
index 00000000000..70257979575
--- /dev/null
+++ b/tests/res/raw/sig_devkeys_shared.bin
diff --git a/tests/tests/security/src/android/security/cts/PackageSignatureTest.java b/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
index a21589a7a15..cbb95d4ce92 100644
--- a/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
+++ b/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
@@ -69,6 +69,10 @@ public class PackageSignatureTest extends AndroidTestCase {
         wellKnownSignatures.add(getSignature(R.raw.sig_platform));
         wellKnownSignatures.add(getSignature(R.raw.sig_shared));
         wellKnownSignatures.add(getSignature(R.raw.sig_testkey));
+        wellKnownSignatures.add(getSignature(R.raw.sig_devkeys));
+        wellKnownSignatures.add(getSignature(R.raw.sig_devkeys_media));
+        wellKnownSignatures.add(getSignature(R.raw.sig_devkeys_platform));
+        wellKnownSignatures.add(getSignature(R.raw.sig_devkeys_shared));
         return wellKnownSignatures;
     }
 
@@ -129,7 +133,14 @@ public class PackageSignatureTest extends AndroidTestCase {
 
     /**
      * Writes a package's signature to a file on the device's external storage.
-     * This method was used to generate the well known signatures used by this test.
+     * This method was used to generate the well known signatures used by
+     * this test.
+     *
+     * As an alternative, you can use openssl to create the
+     * DER encoded certificate file.
+     *
+     * openssl x509 -in $ANDROID_HOME/build/target/product/security/media.x509.pem \
+     *     -out sig_media.bin -outform DER
      */
     @SuppressWarnings("unused")
     private void writeSignature(String packageName, String fileName)