From d0330873bf6232019be185f987c58a693d0348f9 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Tue, 24 Mar 2020 20:01:14 -0700
Subject: [PATCH] OsuLogin: Generate AOSP keys and sign APK

Generate keys for the OsuLogin APK and
sign the APK using those keys.

Note that these keys are only used to sign locally-built APKs
during development. They are not release keys.

Bug: 149589553
Test: compiles
Change-Id: I6abee1618faba127dbe0c1618071985a166f6927
---
 packages/OsuLogin/Android.bp                  |   7 ++-
 .../certs/com.android.hotspot2.osulogin.pk8   | Bin 0 -> 2374 bytes
 .../com.android.hotspot2.osulogin.x509.pem    |  35 ++++++++++++
 packages/OsuLogin/certs/key.pem               |  52 ++++++++++++++++++
 4 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 packages/OsuLogin/certs/com.android.hotspot2.osulogin.pk8
 create mode 100644 packages/OsuLogin/certs/com.android.hotspot2.osulogin.x509.pem
 create mode 100644 packages/OsuLogin/certs/key.pem

diff --git a/packages/OsuLogin/Android.bp b/packages/OsuLogin/Android.bp
index cd9cd1e6395dd..d7e36b164811a 100644
--- a/packages/OsuLogin/Android.bp
+++ b/packages/OsuLogin/Android.bp
@@ -4,9 +4,14 @@ android_app {
     resource_dirs: ["res"],
     srcs: ["src/**/*.java"],
     sdk_version: "system_current",
-
+    certificate: ":com.android.hotspot2.osulogin.certificate",
     apex_available: [
         "com.android.wifi",
         "test_com.android.wifi",
     ],
 }
+
+android_app_certificate {
+    name: "com.android.hotspot2.osulogin.certificate",
+    certificate: "certs/com.android.hotspot2.osulogin"
+}
diff --git a/packages/OsuLogin/certs/com.android.hotspot2.osulogin.pk8 b/packages/OsuLogin/certs/com.android.hotspot2.osulogin.pk8
new file mode 100644
index 0000000000000000000000000000000000000000..87fd622cde2cd80fc6e4f7e2e019e5857336b91d
GIT binary patch
literal 2374
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

literal 0
HcmV?d00001

diff --git a/packages/OsuLogin/certs/com.android.hotspot2.osulogin.x509.pem b/packages/OsuLogin/certs/com.android.hotspot2.osulogin.x509.pem
new file mode 100644
index 0000000000000..1dfe701dc88e1
--- /dev/null
+++ b/packages/OsuLogin/certs/com.android.hotspot2.osulogin.x509.pem
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIGDzCCA/egAwIBAgIUHzkh0UCF/H+1mZZp0ROX4nXKOUowDQYJKoZIhvcNAQEL
+BQAwgZUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
+DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
+b2lkMREwDwYDVQQDDAhPc3VMb2dpbjEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBh
+bmRyb2lkLmNvbTAgFw0yMDAzMjUwMjQ5MTNaGA80NzU4MDIxOTAyNDkxM1owgZUx
+CzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3Vu
+dGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRyb2lkMREw
+DwYDVQQDDAhPc3VMb2dpbjEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lk
+LmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMJDnjAeIZ2KUvKc
+ONwxuzIhLvXr6LRm+Uz0ebjz++5IzQJLwr/COPBG9zbIm8izj2acp+l4WVEYT6I4
+Es5LEp556ySCuZx8IjOd0Zd6NCdaKmYouDTjYTrELWUlZjfA7Km2L5x2M6ArnDO5
+zJ1BIsQ06S3C7iR3ktAQ1cFdidg6Ha2gainS0A1JKN3kL9BL1pvHRLzWZX4gsNhB
+C/6Ue3W3Sx2JRQkaaLksDdoKq0QswEk5tGfKbVr9+hHv/pztaaqEXSeV6f305cAx
+Hzd6+QJ8f8AJz2Rhnv43y72UO8b02CSP3laUj8geidR8XXw+R7Kzu8NfFDL7uVIh
+ktPaBxfWPNYtedp3JrGeZhkzljsushY+bVHECEzROhY2CiUZBEn+wwZLWe2W7oee
+VCL1EZBYctK5CfrrV6x0wvbBUF/ViwV+2LQXQNp08xB8bJBqoBn4KZjK0tTN86Dq
+qRALyoVIVh5VDU9Wbi3vrJb0/9TEQtMjuo0DS3hdtnowdRyAyhwbQHO26dqnnzBI
+XtTAve4RkOwnb8QzZde56qvRgweDE9Im1jpx4E+MMGqVYs8Txurmd/t6bCjTvp1P
+4i88crk/zqCoHEQEbiaNdfkULJAWg9wqxPjqPCTVNtOXoJwuHsNymQVSztIUSySz
+ZQ8Trk0ApqQf8yH2mjM6HJJZoNpBAgMBAAGjUzBRMB0GA1UdDgQWBBRdpduh1P+I
+BMbg5S4n1kbj5hQsOzAfBgNVHSMEGDAWgBRdpduh1P+IBMbg5S4n1kbj5hQsOzAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQB+FzSuoA7LCvn8l86V
+sSI4lH1KLLH+wrXp20w/wYcBY+s4hYPpAJ8YbEMOT9uibK/HpEWYFqiVCqk4gKXr
+Qraxvmtqq0WNSwkjeopTYlZeBzTC/If3UoOCp7KCfMdydIcxvk6LNokMWWqSCNP8
+QiD872XuBvj/uQeBsbHZTqruqPnu+LZwpuHFVRp/Pyj9rT61PsvGitb7q/chW0G7
+7csHOc5q2223LKlNknPsfbcR6nVEg4KfN7kPKny8iJtl2pdbfBjFDp+73nzW8qZU
+5JWO5nWL7cJh4mt5sPGrzpt/Hf8/Dngg69sImRqjv/6/wCV0pEmmNjKJkXcMaZ0T
+2TSs+A7K6l15NYk8exkMymTU7jk+iDud3tnQ68YHf/A9pDu15OCw6U/pTgOgu9co
+rBLLhGV0Tb6XAnsWKe9tsLcumQXU5ZUn9m5VJl58wQHNhUqpT7L0fWtpiTMTStVA
+/yZbndPO4SbjR5rjcAk1xge8lyIIp0WBWmwoQ/1y4DXF/yPaX733wO7uWUljgKuy
+MM/zM4zklB8nFjXfPNf3j24Bzqmy7rqy4XB64enVmYQ2mVNqfwXvINoo2XOrAmj/
+bhSWXiCFltJFM7fmJGOMEEHBt9QfbmCgmM4aoWMgH7P+HxGW+Vc3tGixBbsxNRC+
+/VrPAINQV4x5q8zGYNQBqNFn/A==
+-----END CERTIFICATE-----
diff --git a/packages/OsuLogin/certs/key.pem b/packages/OsuLogin/certs/key.pem
new file mode 100644
index 0000000000000..f560a8d0fa624
--- /dev/null
+++ b/packages/OsuLogin/certs/key.pem
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+VPf88ITMTOBjOH6YC8jKd/n2lVWLjw==
+-----END PRIVATE KEY-----