summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed missing white-space.Jan Nordqvist2015-06-231-1/+1
| | | | Change-Id: Ie2a5eb7367b79d6c38a2af7bddd82fbc5bee3a26
* Merge "Add dialog when installing HS 2.0 credentials while wifi is off." ↵Sanket Padawe2015-06-232-4/+15
|\ | | | | | | into mnc-dev
| * Add dialog when installing HS 2.0 credentials while wifi is off.Sanket Padawe2015-06-222-4/+15
| | | | | | | | | | Bug: 22010833 Change-Id: Ic59fbf7ec197bc4431508c7d1d495c047c0e20cc
* | Catching runtime exception in WifiInstaller.Jan Nordqvist2015-06-221-3/+10
|/ | | | | Bug: 21958895 Change-Id: Ia483c9307e653e88d7d6050ef70963093f1b5f2b
* am 756c09a..655de81 from mirror-m-wireless-internal-releaseVinit Deshpande2015-06-021-2/+0
|\ | | | | | | | | | | 655de81 EXTRA_MIME_TYPES is String[], not Object[]. Change-Id: I906d281e7f2a87be127aa281eb79098adbc66996
| * EXTRA_MIME_TYPES is String[], not Object[].Jeff Sharkey2015-05-121-1/+2
| | | | | | | | | | | | | | | | Bug: 20299782 Change-Id: I532225717c913ecc340edfdfe8fc974c778d495b Cherry pick from master. b/20126912
| * Removed some logging.Jan Nordqvist2015-04-242-5/+0
| | | | | | | | Change-Id: I946091ae1a1aecc34fc890564b9d98fe6d1872f1
* | Hotspot 2.0 credential UI codeSanket Padawe2015-05-132-186/+139
| | | | | | | | | | Bug: 20182930 Change-Id: Iaac91833555f399acf8746ba11dd3007022205bd
* | Merge commit '7c543b7' into merge2Etan Cohen2015-04-241-1/+18
|\|
| * Changed logging tag.Jan Nordqvist2015-04-171-1/+1
| | | | | | | | Change-Id: Ibdfeed92805bde4cd7ac0a7ffdd239cb467cbbfd
| * Launching PIN entry dialog if keystore access is required and the keystore ↵Jan Nordqvist2015-04-151-1/+18
| | | | | | | | | | | | is locked. Change-Id: I723f741176fb776e8791bd4f838140d109139493
* | EXTRA_MIME_TYPES is String[], not Object[].Jeff Sharkey2015-04-181-1/+2
|/ | | | | Bug: 20299782 Change-Id: I532225717c913ecc340edfdfe8fc974c778d495b
* Basic WiFi config installer app.Jan Nordqvist2015-04-072-35/+290
| | | | Change-Id: I12e26955f4057db7a1772eacfec6ce9fa58f4437
* Fix buildSungsoo Lim2014-09-111-2/+0
| | | | Change-Id: Idf9385e3f4f844fabd795fc634740f929497a19b
* am b3f3f024: am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for ↵Kenny Root2014-09-111-0/+2
|\ | | | | | | | | | | | | merge of 48d20b70 to klp-dev * commit 'b3f3f024fc092114421e70b5b0f40c49d586fd48': Check component class instead of action
| * resolved conflicts for merge of 48d20b70 to klp-devKenny Root2014-09-101-1/+5
| |\ | | | | | | | | | Change-Id: Ie07b8ef90a2447f26cdef5b30169793416bfbc0c
| | * Check component class instead of actionKenny Root2014-06-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the called intent was filtered for permission by ActivityManagerService by checking the ComponentName instead of the action. (cherry picked from commit 38a956408f45c9a7cbb48b79c67257b9207fda30) Bug: 14441285 Change-Id: I3a848ef2375ddfa7c9b35389524419993a6b3693
* | | Merge "Block certificate installation if user restriction enabled."Julia Reynolds2014-06-171-0/+8
|\ \ \
| * | | Block certificate installation if user restriction enabled.Julia Reynolds2014-06-121-0/+8
| |/ / | | | | | | | | | | | | Bug: 14081992 Change-Id: Ic7f04cc3555144512ca100b31d77ddec15e28546
* / / Check component class instead of actionKenny Root2014-05-301-1/+5
|/ / | | | | | | | | | | | | | | | | Ensure the called intent was filtered for permission by ActivityManagerService by checking the ComponentName instead of the action. Bug: 14441285 Change-Id: I3a848ef2375ddfa7c9b35389524419993a6b3693
* / Pick certificates using OPEN_DOC intent.Jeff Sharkey2013-10-253-490/+75
|/ | | | | | | | | | Instead of blindly scanning just primary internal storage, use the new DocumentsUI intents to let the user select certificates from any storage backend. This includes both primary and secondary external storage devices. Bug: 11354402 Change-Id: Ia0b4bf1b30c83eb1a64b070cd2f99ad5e6498786
* Add spinner to select Wi-FiKenny Root2013-04-162-0/+41
| | | | | | | | | | | | For the regular installation path, we now need to show a spinner so we don't regress from previous behavior where we can install certs for wifi from the main installation screen. You can also get to this from the Wi-Fi AP list, so only show it when the intended use is ambiguous. Bug: 8600545 Change-Id: I8e9c905ff84142ed7c1f50bf77eb3fb5574f8df1
* keystore: remove old APIsKenny Root2013-04-121-1/+1
| | | | | | | | Remove the call sites that don't have the flags specified. This is to ensure that callers know what flags they're setting. Bug: 8122243 Change-Id: I4b7a8b9327cde5cbfe30c28870f8c31376a5b690
* Allow multiuser use of keystoreKenny Root2013-04-081-7/+0
| | | | | | | | | | | Since keystore has been refactored to let muliple users use it simultaneously, we can remove all the restrictions put into place to prevent it. (cherry picked from commit 89f8f9ab58947ba67f95c5784dc4288bf78a2fdf) Bug: 7249554 Change-Id: I05e8804e35d762ad473d1649fdba34e4182a2c68
* Add ability to install credentials as other UIDKenny Root2013-03-284-7/+36
| | | | | | | | | | We need the ability to install from the system UID to wifi UID to explicitly bind WiFi credentials to the WiFi profile. This adds the ability for Wifi Settings to invoke installation of a PKCS12 file for the wifi UID. Bug: 8183258 Change-Id: I26970e563d68311b60dcdc78cd529322c5807368
* KeyStore: stop using state()Kenny Root2013-02-141-1/+1
| | | | Change-Id: I22daeb0f9873854af789a74ac3c7da2a32e34475
* Do not allow non-primary user to install certsKenny Root2012-09-161-0/+7
| | | | Change-Id: If0896215a4fe1fc0d982a74bd6fee8551e4671fd
* Tracking upgrade to bouncycastle 1.47Brian Carlstrom2012-09-051-3/+5
| | | | Change-Id: Ic6744ae517ab1d3b49de45edd05979dd164bfade
* Allow empty passwords when installing from a PKCS#12 fileBrian Carlstrom2012-04-151-9/+3
| | | | | Bug: http://code.google.com/p/android/issues/detail?id=28189 Change-Id: I6ce96eba0e7e583e49a17179d3f3c66df5f13a29
* Broader support for KeyChain.EXTRA_NAMEBrian Carlstrom2012-03-303-13/+25
| | | | | | | | | | | | Previously EXTRA_NAME only supplied the default name when used with KeyChain.EXTRA_CERTIFICATE. It now also provides the default name with KeyChain.EXTRA_PKCS12, overriding the value found within the PKCS#12 file. In addition, will be used as the default alias name when credentials are installed from external storage as opposed to via an extra. Bug: 6129421 Change-Id: I63c06a866fc62bfa56636011b766d3dcae7764bd
* Convert to new KeyStore formatKenny Root2012-03-191-8/+14
| | | | | | | | The keystore no longer stores private keys in the clear, so it shouldn't have its private key material in PEM. It will just be an opaque handle for a private key. Change-Id: I939169338d0f7dc39743c9904166454f2cad49cc
* Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to ↵Shuhrat Dehkanov2012-02-082-2/+21
| | | | | | | | | | | | | | | | correctly recreate it on onCreateDialog If an empty password or name is supplied for certificate password or certificate name dialogs, respectively, showDialog is called without removing them. As a result onCreateDialog is not called leaving the dialog without visible UI to the user. Steps to reproduce: 1. Put password protected certificate to the SD card. 2. Navigate to Settings > Security and initiate certificate installation. 3. Provide an empty password and press OK. 3.1. Provide an empty name for NAME_CREDENTIAL_DIALOG related issue. Change-Id: I83ffd680313eb9c69214113d3091a70910a80ae2 Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
* Make cert name selected by default.Ben Komalo2011-09-131-15/+13
| | | | | | | This makes it easy to replace if it's a big giberrish string. Bug: 5280250 Change-Id: Iaedee686a3c56133f4e417a40f9175a194181c6c
* Handle VIEW intents for cert installerBen Komalo2011-08-161-0/+48
| | | | | Bug: 4556536 Change-Id: I1d3b8e4b80415e2df9dfe334f0d9e195ab0e19ff
* Rotation fixes for CertInstallerBrian Carlstrom2011-07-221-73/+59
| | | | | | | | | When rotating, the dialog would be dismissed, which the handler took as a user negative action and called toastErrorAndFinish. Fixed by having click handlers on the buttons themselves. Bug: 5051850 Change-Id: I5f1aeb6c918b2b7b6bebf096ee25ff8247b5877d
* Restore installation of CAs from PKCS#12 filesBrian Carlstrom2011-07-221-2/+2
| | | | | | Bug: 5037971 Change-Id: I35770bc5f536ee4ceb51c5fac655e7e5b9b8d89d
* Remove PKEY_MAP entry when emptyBrian Carlstrom2011-07-101-0/+6
| | | | Change-Id: I7a532209d906f0e2194fccaf5eafd8602f3cb57a
* Canceling cert installation should not delete the fileBrian Carlstrom2011-07-063-5/+11
| | | | | | | Also fix to exit CertFileList when list becomes empty Bug: 4600283 Change-Id: Ib0a27f8d2f9ee4be8da02625e9f919bcfa6e791b
* Tracking move to KeyChain credential installation APIBrian Carlstrom2011-06-294-18/+29
| | | | | Bug: 3497064 Change-Id: I4d49354f4687f95d8239ea98d79bd61d06c4ce82
* Replace KeyChainActivity placeholder UI with more polished dialog (3 of 5)Brian Carlstrom2011-06-251-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/base Extended KeyChain.chooserPrivateKeyAlias to allow caller to supply preferred choice to be selected in chooser. This allows Email settings to highlight the current choice when allowing user to change settings. keystore/java/android/security/KeyChain.java api/current.txt Implemented KeyChain functionality to pass host and port information to KeyChainActivity for display. keystore/java/android/security/KeyChain.java KeyChain now sends a PendingIntent as part of the Intent it sends to the KeyChainActivity which can be used to identify the caller in reliable way. keystore/java/android/security/KeyChain.java Moved .pfx/.p12/.cer/.crt constants to Credentials for reuse. Added Credentials.install variant with no value for use from KeyChainActivity keystore/java/android/security/Credentials.java packages/apps/CertInstaller Source of extension constants now in Credentials src/com/android/certinstaller/CertFile.java packages/apps/Browser Have browser supply host and port information to KeyChain.choosePrivateKeyAlias Tracking KeyChain.choosePrivateKeyAlias API change src/com/android/browser/Tab.java packages/apps/Email Tracking KeyChain.choosePrivateKeyAlias API change src/com/android/email/view/CertificateSelector.java packages/apps/KeyChain KeyChain now depends on bouncycastle X509Name for formatting X500Principals, since the 4 X500Principal formatting options could not format emailAddress attributes in a human readable way and its the most important attribute to display for client certificates in most cases. Android.mk Changing the UI to a dialog, make the activity style transparent. AndroidManifest.xml res/values/styles.xml Layout for chooser dialog res/layout/cert_chooser.xml Layout for list items in chooser res/layout/cert_item.xml New resources for dialog including comments for translators. res/values/strings.xml New dialog based KeyChainActivity. Now also shows requesting app and requesting server. Now can preselect a specified alias. New link directly to CertInstaller. src/com/android/keychain/KeyChainActivity.java Fix KeyChainTestActivity to work with TestKeyStore changes that were causing network activity on the UI to look up the name of localhost. Also track KeyChain.choosePrivateKeyAlias API change. tests/src/com/android/keychain/tests/KeyChainTestActivity.java Change-Id: I789faaf65cb36ddc16ce8cd1e8a803b0bde745e3
* Move CredentialHelper.convertToPem to frameworks/base for reuse by KeyChainBrian Carlstrom2011-06-071-31/+18
| | | | Change-Id: I96d5a23201c070a7d0ce8856d189e54e3b05e3bd
* Remove local reuse in CredentialHelper.isCaBrian Carlstrom2011-06-021-6/+8
| | | | | | | | While reviewing to isCa to understand how the NullPointerException handling changed since Honeycomb, rewrite isCa to be clearer about reusing local variables to be clearer about what is what and when. Change-Id: Icf0c3d08666e2be18da4f12f93e92ab998d18fd7
* Integrating keystore with keyguard (Part 2 of 4)Brian Carlstrom2011-06-012-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: frameworks/base keystore rewrite keyguard integration with keystore on keyguard entry or keyguard change KeyStore API simplification packages/apps/Settings Removed com.android.credentials.SET_PASSWORD intent support Added keyguard requirement for keystore use packages/apps/CertInstaller Tracking KeyStore API changes Fix for NPE in CertInstaller when certificate lacks basic constraints packages/apps/KeyChain Tracking KeyStore API changes Details: frameworks/base Move keystore from C to C++ while rewriting password implementation. Removed global variables. Added many comments. cmds/keystore/Android.mk cmds/keystore/keystore.h cmds/keystore/keystore.c => cmds/keystore/keystore.cpp cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp Changed saveLockPattern and saveLockPassword to notify the keystore on changes so that the keystore master key can be reencrypted when the keyguard changes. core/java/com/android/internal/widget/LockPatternUtils.java Changed unlock screens to pass values for keystore unlock or initialization policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java KeyStore API changes - renamed test() to state(), which now return a State enum - made APIs with byte[] key arguments private - added new KeyStore.isEmpty used to determine if a keyguard is required keystore/java/android/security/KeyStore.java In addition to tracking KeyStore API changes, added new testIsEmpty and improved some existing tests to validate expect values. keystore/tests/src/android/security/KeyStoreTest.java packages/apps/Settings Removing com.android.credentials.SET_PASSWORD intent with the removal of the ability to set an explicit keystore password now that the keyguard value is used. Changed to ensure keyguard is enabled for keystore install or unlock. Cleaned up interwoven dialog handing into discrete dialog helper classes. AndroidManifest.xml src/com/android/settings/CredentialStorage.java Remove layout for entering new password res/layout/credentials_dialog.xml Remove enable credentials checkbox res/xml/security_settings_misc.xml src/com/android/settings/SecuritySettings.java Added ability to specify minimum quality key to ChooseLockGeneric Activity. Used by CredentialStorage, but could also be used by CryptKeeperSettings. Changed ChooseLockGeneric to understand minimum quality for keystore in addition to DPM and device encryption. src/com/android/settings/ChooseLockGeneric.java Changed to use getActivePasswordQuality from getKeyguardStoredPasswordQuality based on experience in CredentialStorage. Removed bogus class javadoc. src/com/android/settings/CryptKeeperSettings.java Tracking KeyStore API changes src/com/android/settings/vpn/VpnSettings.java src/com/android/settings/wifi/WifiSettings.java Removing now unused string resources res/values-af/strings.xml res/values-am/strings.xml res/values-ar/strings.xml res/values-bg/strings.xml res/values-ca/strings.xml res/values-cs/strings.xml res/values-da/strings.xml res/values-de/strings.xml res/values-el/strings.xml res/values-en-rGB/strings.xml res/values-es-rUS/strings.xml res/values-es/strings.xml res/values-fa/strings.xml res/values-fi/strings.xml res/values-fr/strings.xml res/values-hr/strings.xml res/values-hu/strings.xml res/values-in/strings.xml res/values-it/strings.xml res/values-iw/strings.xml res/values-ja/strings.xml res/values-ko/strings.xml res/values-lt/strings.xml res/values-lv/strings.xml res/values-ms/strings.xml res/values-nb/strings.xml res/values-nl/strings.xml res/values-pl/strings.xml res/values-pt-rPT/strings.xml res/values-pt/strings.xml res/values-rm/strings.xml res/values-ro/strings.xml res/values-ru/strings.xml res/values-sk/strings.xml res/values-sl/strings.xml res/values-sr/strings.xml res/values-sv/strings.xml res/values-sw/strings.xml res/values-th/strings.xml res/values-tl/strings.xml res/values-tr/strings.xml res/values-uk/strings.xml res/values-vi/strings.xml res/values-zh-rCN/strings.xml res/values-zh-rTW/strings.xml res/values-zu/strings.xml res/values/strings.xml packages/apps/CertInstaller Tracking KeyStore API changes src/com/android/certinstaller/CertInstaller.java Fix for NPE in CertInstaller when certificate lacks basic constraints src/com/android/certinstaller/CredentialHelper.java packages/apps/KeyChain Tracking KeyStore API changes src/com/android/keychain/KeyChainActivity.java src/com/android/keychain/KeyChainService.java support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java tests/src/com/android/keychain/tests/KeyChainServiceTest.java Change-Id: I280f54b9305c3b5549ae2dfc8eb890493806cc78
* Merge "Add support for .cer and .pfx for certificates and PKCS#12 files"Brian Carlstrom2011-05-181-5/+14
|\
| * Add support for .cer and .pfx for certificates and PKCS#12 filesBrian Carlstrom2011-05-171-5/+14
| | | | | | | | Change-Id: Ie37afbb61aa4cdc52275d661232d188db125446d
* | Move to KeyChain.bindBrian Carlstrom2011-05-171-23/+8
|/ | | | Change-Id: I7040a855705b72fcf5d7477db279affa6009bc72
* CertInstaller should use RESULT_OK to communicate success to callersBrian Carlstrom2011-05-174-13/+27
| | | | Change-Id: I6f25ffab113573169badd7cb116381f3412fbf31
* Make CertInstaller installed CA certs trusted by applications via default ↵Brian Carlstrom2011-05-162-66/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TrustManager (3 of 6) frameworks/base Adding IKeyChainService APIs for CertInstaller and Settings use keystore/java/android/security/IKeyChainService.aidl libcore Improve exceptions to include more information luni/src/main/java/javax/security/auth/x500/X500Principal.java Move guts of RootKeyStoreSpi to TrustedCertificateStore, leaving only KeyStoreSpi methods. Added support for adding user CAs in a separate directory for system. Added support for removing system CAs by placing a copy in a sytem directory luni/src/main/java/org/apache/harmony/xnet/provider/jsse/RootKeyStoreSpi.java luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStore.java Formerly static methods on RootKeyStoreSpi are now instance methods on TrustedCertificateStore luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java Added test for NativeCrypto.X509_NAME_hash_old and X509_NAME_hash to make sure the implementing algorithms doe not change since TrustedCertificateStore depend on X509_NAME_hash_old (OpenSSL changed the algorithm from MD5 to SHA1 when moving from 0.9.8 to 1.0.0) luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java Extensive test of new TrustedCertificateStore behavior luni/src/test/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStoreTest.java TestKeyStore improvements - Refactored TestKeyStore to provide simpler createCA method (and internal createCertificate) - Cleaned up to remove use of BouncyCastle specific X509Principal in the TestKeyStore API when the public X500Principal would do. - Cleaned up TestKeyStore support methods to not throw Exception to remove need for static blocks for catch clauses in tests. support/src/test/java/libcore/java/security/TestKeyStore.java luni/src/test/java/libcore/java/security/KeyStoreTest.java luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java Added private PKIXParameters contructor for use by IndexedPKIXParameters to avoid wart of having to lookup and pass a TrustAnchor to satisfy the super-class sanity check. luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java luni/src/main/java/java/security/cert/PKIXParameters.java packages/apps/CertInstaller Change CertInstaller to call IKeyChainService.installCertificate for CA certs to pass them to the KeyChainServiceTest which will make them available to all apps through the TrustedCertificateStore. Change PKCS12 extraction to use AsyncTask. src/com/android/certinstaller/CertInstaller.java Added installCaCertsToKeyChain and hasCaCerts accessor for use by CertInstaller. Use hasUserCertificate() internally. Cleanup coding style. src/com/android/certinstaller/CredentialHelper.java packages/apps/KeyChain Added MANAGE_ACCOUNTS so that IKeyChainService.reset implementation can remove KeyChain accounts. AndroidManifest.xml Implement new IKeyChainService methods: - Added IKeyChainService.installCaCertificate to install certs provided by CertInstaller using the TrustedCertificateStore. - Added IKeyChainService.reset to allow Settings to remove the KeyChain accounts so that any app granted access to keystore credentials are revoked when the keystore is reset. src/com/android/keychain/KeyChainService.java packages/apps/Settings Changed com.android.credentials.RESET credential reset action to also call IKeyChainService.reset to remove any installed user CAs and remove KeyChain accounts to have AccountManager revoke credential granted to private keys removed during the RESET. src/com/android/settings/CredentialStorage.java Added toast text value for failure case res/values/strings.xml system/core Have init create world readable /data/misc/keychain to allow apps to access user added CA certificates installed by the CertInstaller. rootdir/init.rc Change-Id: Idc4e6dd927cf829268a684061e14412623f89d80
* Tracking jarjar of org.bouncycastle to com.android.org.bouncycastleBrian Carlstrom2011-01-241-5/+5
| | | | | Bug: 3086427 Change-Id: Ic1a08a990af04263dab98853174fe5cfaeb5c219
* Update the intent path.Chia-chi Yeh2011-01-201-2/+2
| | | | Change-Id: I1a1d8c2acce19d6db98d3a0950743aab3d4af46e
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 16:21:10 +0000