diff options
author | Brian Carlstrom <bdc@google.com> | 2011-06-02 16:27:32 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2011-06-02 20:53:29 -0700 |
commit | c8150af204ffd38ac46635ff8793261045490ea2 (patch) | |
tree | 2363550aacd591957d9fccc4bcbb38ae46ea99ce /src/com | |
parent | 2aa55a29f1384da5fc574646c936760b67c205c9 (diff) | |
download | android_packages_apps_CertInstaller-c8150af204ffd38ac46635ff8793261045490ea2.tar.gz android_packages_apps_CertInstaller-c8150af204ffd38ac46635ff8793261045490ea2.tar.bz2 android_packages_apps_CertInstaller-c8150af204ffd38ac46635ff8793261045490ea2.zip |
Remove local reuse in CredentialHelper.isCa
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
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/certinstaller/CredentialHelper.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/certinstaller/CredentialHelper.java b/src/com/android/certinstaller/CredentialHelper.java index b03a210..7c7abfb 100644 --- a/src/com/android/certinstaller/CredentialHelper.java +++ b/src/com/android/certinstaller/CredentialHelper.java @@ -161,14 +161,16 @@ class CredentialHelper { private boolean isCa(X509Certificate cert) { try { // TODO: add a test about this - byte[] basicConstraints = cert.getExtensionValue("2.5.29.19"); - if (basicConstraints == null) { + byte[] asn1EncodedBytes = cert.getExtensionValue("2.5.29.19"); + if (asn1EncodedBytes == null) { return false; } - Object obj = new ASN1InputStream(basicConstraints).readObject(); - basicConstraints = ((DEROctetString) obj).getOctets(); - obj = new ASN1InputStream(basicConstraints).readObject(); - return new BasicConstraints((ASN1Sequence) obj).isCA(); + DEROctetString derOctetString = (DEROctetString) + new ASN1InputStream(asn1EncodedBytes).readObject(); + byte[] octets = derOctetString.getOctets(); + ASN1Sequence sequence = (ASN1Sequence) + new ASN1InputStream(octets).readObject(); + return new BasicConstraints(sequence).isCA(); } catch (IOException e) { return false; } |