summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2010-04-02 15:59:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-02 15:59:22 -0700
commit7fc8e39ebbfaa233956965afb3be93ee543093b5 (patch)
treed2a950f445d32defe953ffc1ab6a835bdc027116
parent26d885d2f84c5aa9e367eb23efd5f6c2dd1bd806 (diff)
parent3d82ade7a9b764695bad89d2476a73441118411b (diff)
downloadandroid_dalvik-7fc8e39ebbfaa233956965afb3be93ee543093b5.tar.gz
android_dalvik-7fc8e39ebbfaa233956965afb3be93ee543093b5.tar.bz2
android_dalvik-7fc8e39ebbfaa233956965afb3be93ee543093b5.zip
am 3d82ade7: Merge "Have certimport.sh list certificates in BKS keystore after importing for verification/debugging"
Merge commit '3d82ade7a9b764695bad89d2476a73441118411b' into dalvik-dev * commit '3d82ade7a9b764695bad89d2476a73441118411b': Have certimport.sh list certificates in BKS keystore after importing for verification/debugging
-rwxr-xr-xlibcore/security/src/main/files/certimport.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/libcore/security/src/main/files/certimport.sh b/libcore/security/src/main/files/certimport.sh
index 1f489e67f..f65aff971 100755
--- a/libcore/security/src/main/files/certimport.sh
+++ b/libcore/security/src/main/files/certimport.sh
@@ -100,3 +100,12 @@ for cert in `ls -1 cacerts`
-storepass $STOREPASS
let "COUNTER=$COUNTER + 1"
done
+
+keytool \
+ -list \
+ -v \
+ -keystore $CERTSTORE \
+ -storetype BKS \
+ -provider $PROVIDER_CLASS \
+ -providerpath $PROVIDER_PATH \
+ -storepass $STOREPASS