harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r392202 [1/5] - in /incubator/harmony/enhanced/classlib/trunk/modules: crypto/src/main/java/javax/crypto/spec/ security/src/main/java/common/java/security/ security/src/main/java/common/java/security/cert/ security/src/main/java/common/java...
Date Fri, 07 Apr 2006 06:53:12 GMT
Author: mloenko
Date: Thu Apr  6 23:52:51 2006
New Revision: 392202

URL: http://svn.apache.org/viewcvs?rev=392202&view=rev
Log:
fix for HARMONY-76: some clean-up after HARMONY-55 fix is desired

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/PSource.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStore.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureRandom.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signature.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signer.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/UnresolvedPermission.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreSpi.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRLSelector.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CertSelector.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/DelegationPermission.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/KerberosTicket.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/ServicePermission.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/sasl/Sasl.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Oid.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Time.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Type.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/DerOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/InformationObjectSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/DefaultPolicyParser.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Engine.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Services.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/Cache.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/DRLCertFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertPathImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/JarUtils.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CRLDistributionPoints.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/Certificate.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CertificateList.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CertificatePolicies.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/DistributionPoint.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/DistributionPointName.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/EDIPartyName.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/Extension.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/Extensions.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/GeneralName.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/GeneralNames.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/GeneralSubtree.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/GeneralSubtrees.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/NameConstraints.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/ORAddress.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/OtherName.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/PolicyConstraints.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/PolicyInformation.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/ReasonFlags.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/TBSCertList.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/TBSCertificate.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/Time.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/Validity.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AccessControlExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParameterGenerator1Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParameterGeneratorSpiTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParametersTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/BasicPermissionCollectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/CodeSourceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/DigestExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/GeneralSecurityExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/IdentityTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/InvalidAlgorithmParameterExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/InvalidKeyExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/InvalidParameterExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSBuilderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSCallbackHandlerProtectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KSPasswordProtectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyManagementExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyPairGeneratorSpiTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/KeyStoreExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MessageDigestTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/MyKeyStore.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/NoSuchAlgorithmExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/PermissionsTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/PolicyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/ProtectionDomainTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/ProviderExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SecureRandomTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignatureTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/SignedObjectTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/UnrecoverableEntryExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/UnrecoverableKeyExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CRLExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathBuilder1Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathBuilder2Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathBuilderExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathBuilderSpiTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator1Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator2Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidator3Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidatorExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertPathValidatorSpiTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertStore1Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertStore2Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertStoreExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertStoreSpiTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateEncodingExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateExpiredExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateFactory2Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateFactorySpiTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateNotYetValidExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/CertificateParsingExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/MyCertStoreParameters.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/X509CRLSelectorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/X509CertSelectorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/X509CertificateTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/myCertPath.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CertPathTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CertPathValidatorExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/cert/serialization/CertificateTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/serialization/AccessControlExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/serialization/CodeSourceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/serialization/KeyPairTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/serialization/SignedObjectTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/spec/ECGenParameterSpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/spec/InvalidKeySpecExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/spec/InvalidParameterSpecExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/spec/RSAPrivateCrtKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/PolicyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/PrivateCredentialPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/SubjectTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/callback/serialization/SerNameCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/kerberos/DelegationPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/kerberos/ServicePermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/kerberos/serialization/ServicePermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/login/LoginContextTest_1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/auth/x500/X500PrivateCredentialTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/cert/CertificateEncodingExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/cert/CertificateExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/cert/CertificateExpiredExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/cert/CertificateNotYetValidExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/cert/CertificateParsingExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/cert/X509CertificateTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/sasl/AuthenticationExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/sasl/AuthorizeCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/sasl/RealmCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/sasl/RealmChoiceCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/sasl/SaslExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/sasl/SaslTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/sasl/SaslTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/sasl/SaslTest4.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/sasl/serialization/AuthenticationExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/security/sasl/serialization/SaslExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/SystemScopeTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/TestCertUtils.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/asn1/der/BooleanTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/asn1/der/ChoiceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/asn1/der/OidTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/cert/TestUtils.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/provider/cert/X509CRLImplTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryPerfTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/provider/cert/X509CertImplTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/provider/cert/X509CertPathImplTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/test/SecurityTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/x509/CertificateListTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/x509/CertificatePoliciesTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/x509/CertificateTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/x509/EDIPartyNameTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/x509/GeneralNameTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/x509/ORAddressTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/javax/net/ssl/DefaultSSLContext.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/HandshakeCompletedEventTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/HttpsURLConnectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/KeyManagerFactorySpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLContextSpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLEngineResultTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLEngineTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLHandshakeExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLKeyExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLProtocolExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/SSLServerSocketTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/PSource.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/PSource.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/PSource.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/spec/PSource.java Thu Apr  6 23:52:51 2006
@@ -60,6 +60,7 @@
         public static final PSpecified DEFAULT = new PSpecified();
 
         private PSpecified() {
+            super("PSpecified");
             p = new byte[0];
         }
 
@@ -67,6 +68,7 @@
          * @com.intel.drl.spec_ref
          */
         public PSpecified(byte[] p) {
+            super("PSpecified");
             if (p == null) {
                 throw new NullPointerException("encoding input is null!");
             }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStore.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStore.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStore.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStore.java Thu Apr  6 23:52:51 2006
@@ -540,7 +540,7 @@
             if (!keyStore.isInit) {
                 throw new IllegalArgumentException(NOTINITKEYSTORE);
             }
-            return (Builder) new BuilderImpl(keyStore, protectionParameter,
+            return new BuilderImpl(keyStore, protectionParameter,
                     null, null, null, null);
         }
 
@@ -577,7 +577,7 @@
                         + " does not refer to a normal file");
             }
             // create new instance
-            return (Builder) new BuilderImpl(null, protectionParameter, file,
+            return new BuilderImpl(null, protectionParameter, file,
                     type, provider, AccessController.getContext());
         }
 
@@ -593,7 +593,7 @@
             if (protectionParameter == null) {
                 throw new NullPointerException("protectionParameter is null");
             }
-            return (Builder) new BuilderImpl(null, protectionParameter, null,
+            return new BuilderImpl(null, protectionParameter, null,
                     type, provider, AccessController.getContext());
         }
 
@@ -674,10 +674,11 @@
                     isGetKeyStore = true;
                     return keyStore;
                 }
-                KeyStore ks;
-                char[] passwd = null;
-                FileInputStream fis = null;
+
                 try {
+                    final KeyStore ks;
+                    final char[] passwd;
+
                     // get KeyStore instance using type or type and provider
                     ks = (providerForKeyStore == null ? KeyStore
                             .getInstance(typeForKeyStore) : KeyStore
@@ -685,7 +686,6 @@
                     // protection parameter should be PasswordProtection
                     // or CallbackHandlerProtection
                     if (protParameter instanceof PasswordProtection) {
-                        PasswordProtection pwp = (PasswordProtection) protParameter;
                         passwd = ((PasswordProtection) protParameter)
                                 .getPassword();
                     } else if (protParameter instanceof CallbackHandlerProtection) {
@@ -696,32 +696,40 @@
                                 "ProtectionParameter object is not PasswordProtection "
                                         + "and  CallbackHandlerProtection");
                     }
+
                     // load KeyStore from file
-                    if (fileForLoad != null) {
-                        fis = new FileInputStream(fileForLoad);
-                        ks.load(fis, passwd);
-                    } else {
-                        ks.load(new TmpLSParameter(protParameter));
-                    }
+                    AccessController.doPrivileged(
+                            new PrivilegedExceptionAction() {
+                                public Object run() throws Exception {
+                                    if (fileForLoad != null) {
+                                        FileInputStream fis = null;
+                                        try {
+                                            fis = new FileInputStream(fileForLoad);
+                                            ks.load(fis, passwd);
+                                        } finally {
+                                            // close file input stream
+                                            if( fis != null ) {
+                                                fis.close();   
+                                            }
+                                        }
+                                    } else {
+                                        ks.load(new TmpLSParameter(
+                                                protParameter));
+                                    }
+                                    return null;
+                                }
+                            }, accControlContext);
+
+                    
                     isGetKeyStore = true;
                     keyStore = ks;
                     return keyStore;
                 } catch (KeyStoreException e) {
                     // Store exception
-                    lastException = e;
                     throw lastException = e;
                 } catch (Exception e) {
                     // Override exception
                     throw lastException = new KeyStoreException(e);
-                } finally {
-                    // close file input stream
-                    if (fis != null) {
-                        try {
-                            fis.close();
-                        } catch (IOException e) {
-                            throw lastException = new KeyStoreException(e);
-                        }
-                    }
                 }
             }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureRandom.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureRandom.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureRandom.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureRandom.java Thu Apr  6 23:52:51 2006
@@ -130,11 +130,6 @@
         return null;
     }
     
-    // Returns secureRandomSpi
-    private SecureRandomSpi getSpi() {
-        return secureRandomSpi;
-    }
-
     /**
      * @com.intel.drl.spec_ref
      * 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signature.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signature.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signature.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signature.java Thu Apr  6 23:52:51 2006
@@ -188,7 +188,7 @@
             boolean critical = false;
             if (ce != null && !ce.isEmpty()) {
                 for (Iterator i = ce.iterator(); i.hasNext();) {
-                    if ("2.5.29.15".equals((String) i.next())) { 
+                    if ("2.5.29.15".equals(i.next())) { 
                         //KeyUsage OID = 2.5.29.15
                         critical = true;
                         break;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signer.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signer.java Thu Apr  6 23:52:51 2006
@@ -21,8 +21,6 @@
 
 package java.security;
 
-import java.security.Principal;
-
 /**
  * @com.intel.drl.spec_ref
  * 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/UnresolvedPermission.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/UnresolvedPermission.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/UnresolvedPermission.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/UnresolvedPermission.java Thu Apr  6 23:52:51 2006
@@ -291,7 +291,7 @@
         ClassNotFoundException {
         checkType(getUnresolvedType());
         ObjectInputStream.GetField fields = in.readFields();
-        if (!getUnresolvedType().equals((String)fields.get("type", null))) {
+        if (!getUnresolvedType().equals(fields.get("type", null))) {
             throw new InvalidObjectException("target type field is corrupted");
         }
         targetName = (String)fields.get("name", null);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreSpi.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreSpi.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreSpi.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreSpi.java Thu Apr  6 23:52:51 2006
@@ -30,15 +30,13 @@
  */
 
 public abstract class CertStoreSpi {
-    // Store used parameters
-    private final CertStoreParameters certStoreParams;
-
     /**
      * @com.intel.drl.spec_ref
+     * 
+     * Parameter 'params' is unusable but required by the spec
      */
     public CertStoreSpi(CertStoreParameters params)
             throws InvalidAlgorithmParameterException {
-        this.certStoreParams = params;
     }
 
     /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRLSelector.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRLSelector.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRLSelector.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRLSelector.java Thu Apr  6 23:52:51 2006
@@ -225,19 +225,19 @@
                     + ((X500Principal) issuerNames.get(i)).getName()); 
             }
             result.append("\n  ]");
-        };
+        }
         if (minCRL != null) {
             result.append("\n  minCRL: " + minCRL);
-        };
+        }
         if (maxCRL != null) {
             result.append("\n  maxCRL: " + maxCRL);
-        };
+        }
         if (dateAndTime != -1) {
             result.append("\n  dateAndTime: " + (new Date(dateAndTime)));
         }
         if (certificateChecking != null) {
             result.append("\n  certificateChecking: " + certificateChecking);
-        };
+        }
         result.append("\n]");
         return result.toString();
     }
@@ -254,7 +254,7 @@
                 // the search speed depends on the class of issuerNames
                 !(issuerNames.contains(crlist.getIssuerX500Principal()))) {
             return false;
-        };
+        }
         if ((minCRL != null) || (maxCRL != null)) {
             try {
                 // As specified in rfc 3280 (http://www.ietf.org/rfc/rfc3280.txt)
@@ -274,7 +274,7 @@
                 //e.printStackTrace();
                 return false;
             }
-        };
+        }
         if (dateAndTime != -1) {
             Date thisUp = crlist.getThisUpdate();
             Date nextUp = crlist.getNextUpdate();
@@ -285,7 +285,7 @@
                                 || (dateAndTime > nextUp.getTime())) {
                 return false;
             }
-        };
+        }
         return true;
     }
     
@@ -296,7 +296,7 @@
         X509CRLSelector result = new X509CRLSelector();
         if (issuerNames != null) {
             result.setIssuers(issuerNames);
-        };
+        }
         result.minCRL = minCRL;
         result.maxCRL = maxCRL;
         result.dateAndTime = dateAndTime;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CertSelector.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CertSelector.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CertSelector.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CertSelector.java Thu Apr  6 23:52:51 2006
@@ -33,13 +33,10 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.NoSuchElementException;
 import java.util.Set;
-import java.util.StringTokenizer;
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.harmony.security.asn1.ASN1OctetString;
-import org.apache.harmony.security.asn1.ASN1Type;
 import org.apache.harmony.security.x509.AlgorithmIdentifier;
 import org.apache.harmony.security.x509.CertificatePolicies;
 import org.apache.harmony.security.x509.GeneralName;
@@ -705,39 +702,39 @@
         result.append("X509CertSelector: \n[");
         if (this.certificateEquals != null) {
             result.append("\n  certificateEquals: " + certificateEquals);
-        };
+        }
         if (this.serialNumber != null) {
             //FIXME: needs DRL's BigInteger.toString implementation
             //result.append("\n  serialNumber: " + serialNumber);
-        };
+        }
         if (this.issuer != null) {
             result.append("\n  issuer: " + issuer);
-        };
+        }
         if (this.subject != null) {
             result.append("\n  subject: " + subject);
-        };
+        }
         if (this.subjectKeyIdentifier != null) {
             result.append("\n  subjectKeyIdentifier: "
                     + getBytesAsString(subjectKeyIdentifier));
-        };
+        }
         if (this.authorityKeyIdentifier != null) {
             result.append("\n  authorityKeyIdentifier: "
                     + getBytesAsString(authorityKeyIdentifier));
-        };
+        }
         if (this.certificateValid != null) {
             result.append("\n  certificateValid: " + certificateValid);
-        };
+        }
         if (this.subjectPublicKeyAlgID != null) {
             result.append("\n  subjectPublicKeyAlgID: "
                     + subjectPublicKeyAlgID);
-        };
+        }
         if (this.privateKeyValid != null) {
             result.append("\n  privateKeyValid: " + privateKeyValid);
-        };
+        }
         if (this.subjectPublicKey != null) {
             result.append("\n  subjectPublicKey: "
                     + getBytesAsString(subjectPublicKey));
-        };
+        }
         if (this.keyUsage != null) {
             result.append("\n  keyUsage: \n  [");
             String[] kuNames = new String[] {
@@ -751,7 +748,7 @@
                 }
             }
             result.append("\n  ]");
-        };
+        }
         if (this.extendedKeyUsage != null) {
             result.append("\n  extendedKeyUsage: "
                     + extendedKeyUsage.toString());
@@ -771,20 +768,20 @@
                 }
             }
             result.append("\n  ]");
-        };
+        }
         if (this.nameConstraints != null) {
-        };
+        }
         if (this.policies != null) {
             result.append("\n  policies: " + policies.toString());
-        };
+        }
         if (this.pathToNames != null) {
             result.append("\n  pathToNames:  \n  [");
             int size = pathToNames.size();
-            for (int i=0; i<pathToNames.size(); i++) {
+            for (int i = 0; i < size; i++) {
                 result.append("\n    "
                     + ((GeneralName)pathToNames.get(i)).toString());
             }
-        };
+        }
         result.append("\n]");
         return result.toString();
     }
@@ -872,15 +869,14 @@
                 if ((notBefore == null) && (notAfter == null)) {
                     return false;
                 }
-                boolean result = true;
                 if ((notBefore != null)
                     && notBefore.compareTo(privateKeyValid) > 0) {
                     return false;
-                };
+                }
                 if ((notAfter != null)
                     && notAfter.compareTo(privateKeyValid) < 0) {
                     return false;
-                };
+                }
             } catch (IOException e) {
                 return false;
             }
@@ -1099,7 +1095,7 @@
                         new ArrayList(this.subjectAltNames[i]);
                 }
             }
-        };
+        }
         result.nameConstraints = this.nameConstraints;
         result.policies = (this.policies == null)
             ? null

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/DelegationPermission.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/DelegationPermission.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/DelegationPermission.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/DelegationPermission.java Thu Apr  6 23:52:51 2006
@@ -227,8 +227,8 @@
         Vector permissions;
         synchronized (this) {
             permissions = new Vector(offset);
-            for (int i = 0; i < offset; permissions.add(items[i++]))
-                ;
+            for (int i = 0; i < offset; permissions.add(items[i++])) {
+            }
         }
         ObjectOutputStream.PutField fields = out.putFields();
         fields.put("permissions", permissions);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/KerberosTicket.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/KerberosTicket.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/KerberosTicket.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/KerberosTicket.java Thu Apr  6 23:52:51 2006
@@ -224,7 +224,7 @@
      */
     public final SecretKey getSessionKey() {
         checkState();
-        return (SecretKey)sessionKey;
+        return sessionKey;
     }
 
     /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/ServicePermission.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/ServicePermission.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/ServicePermission.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/auth/kerberos/ServicePermission.java Thu Apr  6 23:52:51 2006
@@ -312,8 +312,8 @@
         Vector permissions;
         synchronized (this) {
             permissions = new Vector(offset);
-            for (int i = 0; i < offset; permissions.add(items[i++]))
-                ;
+            for (int i = 0; i < offset; permissions.add(items[i++])) {
+            }
         }
         ObjectOutputStream.PutField fields = out.putFields();
         fields.put("permissions", permissions);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/sasl/Sasl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/sasl/Sasl.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/sasl/Sasl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/sasl/Sasl.java Thu Apr  6 23:52:51 2006
@@ -160,7 +160,7 @@
             while (keys.hasMoreElements()) {
                 String s = (String) keys.nextElement();
                 if (s.startsWith(service)) {
-                    prop = (String) pp[i].getProperty(s);
+                    prop = pp[i].getProperty(s);
                     try {
                         if (props.add(prName.concat(prop))) {
                             fact.add(newInstance(prop, pp[i]));

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Oid.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Oid.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Oid.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Oid.java Thu Apr  6 23:52:51 2006
@@ -126,8 +126,9 @@
         if (elem == 0) {
             length = 1;
         } else {
-            for (; elem > 0; length++, elem = elem >> 7)
-                ;
+            for (; elem > 0; elem = elem >> 7) {
+                length++;
+            }
         }
 
         // the rest of subidentifiers
@@ -136,8 +137,9 @@
                 length++;
                 continue;
             }
-            for (elem = oid[i]; elem > 0; length++, elem = elem >> 7)
-                ;
+            for (elem = oid[i]; elem > 0; elem = elem >> 7) {
+                length++;
+            }
         }
         out.length = length;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Time.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Time.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Time.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Time.java Thu Apr  6 23:52:51 2006
@@ -85,7 +85,7 @@
         // the number of passed leap years without this year
         int leap_years_num =
             (times[0] > 1970) ? (times[0] - 1969)/4 : (times[0] - 1971)/4;
-        res += (long) (times[0] - 1970) * 31536000000l 
+        res += (times[0] - 1970) * 31536000000l 
                             + (long) leap_years_num * 86400000;
         // if this year is a leap year and this is time after the february
         if ((times[0] % 4 == 0) && (times[1] > 2)) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Type.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Type.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Type.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Type.java Thu Apr  6 23:52:51 2006
@@ -259,8 +259,9 @@
         if (out.length > 127) {
 
             len++;
-            for (int cur = out.length >> 8; cur > 0; len++, cur = cur >> 8)
-                ;
+            for (int cur = out.length >> 8; cur > 0; len++) {
+                cur = cur >> 8;
+            }
         }
         len += out.length;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerInputStream.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerInputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerInputStream.java Thu Apr  6 23:52:51 2006
@@ -214,7 +214,7 @@
         }
         //    tag length long_form content
         return 1 + 1 + numOctets + length;
-    };
+    }
 
     /**
      * Decodes ASN.1 bitstring type

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerOutputStream.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerOutputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerOutputStream.java Thu Apr  6 23:52:51 2006
@@ -60,8 +60,9 @@
         if (length > 127) { //long form
             int eLen = length >> 8;
             byte numOctets = 1;
-            for (; eLen > 0; eLen = eLen >> 8, numOctets++)
-                ;
+            for (; eLen > 0; eLen = eLen >> 8) {
+                numOctets++;
+            }
 
             encoded[offset] = (byte) (numOctets | 0x80);
             offset++;
@@ -78,7 +79,7 @@
     }
 
     public void encodeANY() {
-        System.arraycopy(((byte[]) content), 0, encoded, offset, length);
+        System.arraycopy(content, 0, encoded, offset, length);
         offset += length;
     }
 
@@ -108,22 +109,22 @@
     }
 
     public void encodeGeneralizedTime() {
-        System.arraycopy(((byte[]) content), 0, encoded, offset, length);
+        System.arraycopy(content, 0, encoded, offset, length);
         offset += length;
     }
 
     public void encodeUTCTime() {
-        System.arraycopy(((byte[]) content), 0, encoded, offset, length);
+        System.arraycopy(content, 0, encoded, offset, length);
         offset += length;
     }
 
     public void encodeInteger() {
-        System.arraycopy(((byte[]) content), 0, encoded, offset, length);
+        System.arraycopy(content, 0, encoded, offset, length);
         offset += length;
     }
 
     public void encodeOctetString() {
-        System.arraycopy(((byte[]) content), 0, encoded, offset, length);
+        System.arraycopy(content, 0, encoded, offset, length);
         offset += length;
     }
 
@@ -184,7 +185,7 @@
     }
 
     public void encodeString() {
-        System.arraycopy(((byte[]) content), 0, encoded, offset, length);
+        System.arraycopy(content, 0, encoded, offset, length);
         offset += length;
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/DerOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/DerOutputStream.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/DerOutputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/DerOutputStream.java Thu Apr  6 23:52:51 2006
@@ -189,7 +189,7 @@
         push(compLens, values);
 
         int seqLen = 0;
-        for (int i = 0, cur = 0; i < type.length; i++) {
+        for (int i = 0; i < type.length; i++) {
             if (values[i] == null) {
                 continue; //FIXME raise exception if non-optional data is missing
             }
@@ -233,7 +233,7 @@
 
         push(compLens, values);
         int seqLen = 0;
-        for (int i = 0, cur = 0; i < values.length; i++) {
+        for (int i = 0; i < values.length; i++) {
 
             content = cv[i];
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/InformationObjectSet.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/InformationObjectSet.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/InformationObjectSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/InformationObjectSet.java Thu Apr  6 23:52:51 2006
@@ -36,8 +36,6 @@
 
     private final int capacity;
 
-    private final int size;
-
     private final Entry[][] pool;
 
     public InformationObjectSet() {
@@ -46,8 +44,6 @@
 
     public InformationObjectSet(int capacity, int size) {
         this.capacity = capacity;
-        this.size = size;
-
         pool = new Entry[capacity][size];
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/DefaultPolicyParser.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/DefaultPolicyParser.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/DefaultPolicyParser.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/DefaultPolicyParser.java Thu Apr  6 23:52:51 2006
@@ -254,7 +254,7 @@
             boolean resolve) throws Exception {
         if (pe.name != null) {
             pe.name = PolicyUtils.expandGeneral(pe.name,
-                    new PermissionExpander().configure(ge, pe, ks));
+                    new PermissionExpander().configure(ge, ks));
         }
         if (resolve) {
             if (pe.name != null) {
@@ -292,16 +292,12 @@
         // Store GrantEntry
         private DefaultPolicyScanner.GrantEntry ge;
 
-        // Store PermissionEntry
-        private DefaultPolicyScanner.PermissionEntry pe;
-
         /** 
          * Combined setter of all required fields. 
          */
         public PermissionExpander configure(DefaultPolicyScanner.GrantEntry ge,
-                DefaultPolicyScanner.PermissionEntry pe, KeyStore ks) {
+                KeyStore ks) {
             this.ge = ge;
-            this.pe = pe;
             this.ks = ks;
             return this;
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Engine.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Engine.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Engine.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Engine.java Thu Apr  6 23:52:51 2006
@@ -38,7 +38,6 @@
     // for getInstance(String algorithm, Object param) optimization:
     // previous result
     private Provider.Service returnedService;
-    private Provider returnedProvider;
 
     // previous parameter
     private String lastAlgorithm;
@@ -80,9 +79,6 @@
      */
     public synchronized void getInstance(String algorithm, Object param)
             throws NoSuchAlgorithmException {
-        String className;
-        Class c;
-        Provider p;
         Provider.Service serv;
 
         if (algorithm == null) {
@@ -126,8 +122,6 @@
     public synchronized void getInstance(String algorithm, Provider provider,
             Object param) throws NoSuchAlgorithmException {
 
-        String className;
-        Object o;
         Provider.Service serv = null;
         if (algorithm == null) {
             throw new NoSuchAlgorithmException(serviceName

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Services.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Services.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Services.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Services.java Thu Apr  6 23:52:51 2006
@@ -111,7 +111,6 @@
      * @return
      */
     public static Provider getProvider(String name) {
-        Provider p;
         if (name == null) {
             return null;
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/Cache.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/Cache.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/Cache.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/Cache.java Thu Apr  6 23:52:51 2006
@@ -186,8 +186,6 @@
         //*/
     }
 
-    private int XXX = 0;
-    
     public Object get(long hash, byte[] encoding) {
         hash |= getSuffHash(encoding);
         int idx = -1*Arrays.binarySearch(hashes_idx, hash)-1;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/DRLCertFactory.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/DRLCertFactory.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/DRLCertFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/DRLCertFactory.java Thu Apr  6 23:52:51 2006
@@ -24,7 +24,6 @@
 import java.security.AccessController;
 import java.security.Provider;
 
-import java.security.cert.CertificateFactory;
 
 /**
  * DRLCertFactory

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java Thu Apr  6 23:52:51 2006
@@ -22,10 +22,11 @@
 package org.apache.harmony.security.provider.cert;
 
 import java.math.BigInteger;
-import java.util.Date;
-import java.util.Set;
 import java.security.cert.CRLException;
 import java.security.cert.X509CRLEntry;
+import java.util.Date;
+import java.util.Set;
+
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.harmony.security.x509.Extensions;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java Thu Apr  6 23:52:51 2006
@@ -21,37 +21,33 @@
 
 package org.apache.harmony.security.provider.cert;
 
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.security.cert.Certificate;
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigInteger;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.Principal;
 import java.security.PublicKey;
+import java.security.Signature;
 import java.security.SignatureException;
-import java.security.cert.CRL;
 import java.security.cert.CRLException;
+import java.security.cert.Certificate;
+import java.security.cert.X509CRL;
 import java.security.cert.X509CRLEntry;
-import java.security.cert.X509Extension;
+import java.security.cert.X509Certificate;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Set;
 import java.util.List;
+import java.util.Set;
+
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.harmony.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.x509.CertificateList;
 import org.apache.harmony.security.x509.Extensions;
 import org.apache.harmony.security.x509.TBSCertList;
-
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.security.Signature;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java Thu Apr  6 23:52:51 2006
@@ -22,12 +22,21 @@
 package org.apache.harmony.security.provider.cert;
 
 
-import java.io.*;
-import java.util.*;
-import java.security.cert.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.cert.CRL;
+import java.security.cert.CRLException;
+import java.security.cert.CertPath;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactorySpi;
+import java.security.cert.X509CRL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 
 import org.apache.harmony.misc.Base64;
-import org.apache.harmony.security.asn1.ASN1Any;
 import org.apache.harmony.security.asn1.BerInputStream;
 
 /**
@@ -55,7 +64,7 @@
             if (inStream.read(buff) < 28) {
                 throw new CertificateException(
                         "Input Stream contains not enought data.");
-            };
+            }
             if ("-----BEGIN CERTIFICATE-----".equals(new String(buff, 0, 27))) {
                 int size = inStream.available();
                 if (size == 0) {
@@ -167,7 +176,7 @@
             if (inStream.read(buff) < 28) {
                 throw new CRLException(
                         "Input Stream contains not enought data.");
-            };
+            }
 
             inStream.reset();
             long hash = CRL_CASHE.getHash(buff);
@@ -312,7 +321,7 @@
                 }
             }
             return inStream.read();
-        };
+        }
 
         public int read(byte[] b) throws IOException {
             return read(b, 0, b.length);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java Thu Apr  6 23:52:51 2006
@@ -21,33 +21,33 @@
 
 package org.apache.harmony.security.provider.cert;
 
-import java.security.cert.X509Certificate;
-import java.math.BigInteger;
-import javax.security.auth.x500.X500Principal;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Date;
-import java.util.Set;
-import java.security.Signature;
-import java.security.PublicKey;
-import java.security.Principal;
+import java.math.BigInteger;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.security.SignatureException;
 import java.security.NoSuchProviderException;
-import java.security.cert.CertificateException;
+import java.security.Principal;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.SignatureException;
 import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.CertificateParsingException;
+import java.security.cert.X509Certificate;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import javax.security.auth.x500.X500Principal;
 
 import org.apache.harmony.crypto.utils.AlgNameMapper;
-import org.apache.harmony.security.asn1.*;
-import org.apache.harmony.security.x509.*;
+import org.apache.harmony.security.x509.Certificate;
+import org.apache.harmony.security.x509.Extensions;
+import org.apache.harmony.security.x509.TBSCertificate;
 
 /**
  * X509CertImpl
@@ -115,7 +115,7 @@
         if (time > notAfter) {
             throw new CertificateExpiredException();
         }
-    };
+    }
 
     public void checkValidity(Date date) 
                                 throws CertificateExpiredException, 
@@ -131,18 +131,18 @@
         if (time > notAfter) {
             throw new CertificateExpiredException();
         }
-    };
+    }
     
     public int getVersion() {
         return 3;
-    };
+    }
 
     public BigInteger getSerialNumber() {
         if (serialNumber == null) {
             serialNumber = tbsCert.getSerialNumber();
         }
         return serialNumber;
-    };
+    }
 
     public Principal getIssuerDN() {
         if (issuer == null) {
@@ -150,7 +150,7 @@
                     tbsCert.getIssuer().getName(X500Principal.RFC2253));
         }
         return issuer;
-    };
+    }
 
     public X500Principal getIssuerX500Principal() {
         if (issuer == null) {
@@ -166,7 +166,7 @@
                     tbsCert.getSubject().getName(X500Principal.RFC2253));
         }
         return subject;
-    };
+    }
 
     public X500Principal getSubjectX500Principal() {
         if (subject == null) {
@@ -182,7 +182,7 @@
             notAfter = tbsCert.getValidity().getNotAfter().getTime();
         }
         return new Date(notBefore);
-    };
+    }
 
     public Date getNotAfter() {
         if (notBefore == -1) {
@@ -190,7 +190,7 @@
             notAfter = tbsCert.getValidity().getNotAfter().getTime();
         }
         return new Date(notAfter);
-    };
+    }
 
     public byte[] getTBSCertificate()
                         throws CertificateEncodingException
@@ -201,7 +201,7 @@
         byte[] result = new byte[tbsCertificate.length];
         System.arraycopy(tbsCertificate, 0, result, 0, tbsCertificate.length);
         return result;
-    };
+    }
 
     public byte[] getSignature() {
         if (signature == null) {
@@ -210,7 +210,7 @@
         byte[] result = new byte[signature.length];
         System.arraycopy(signature, 0, result, 0, signature.length);
         return result;
-    };
+    }
 
     public String getSigAlgName() {
         if (sigAlgOID == null) {
@@ -221,7 +221,7 @@
             }
         }
         return sigAlgName;
-    };
+    }
 
     public String getSigAlgOID() {
         if (sigAlgOID == null) {
@@ -232,7 +232,7 @@
             }
         }
         return sigAlgOID;
-    };
+    }
 
     public byte[] getSigAlgParams() {
         if (nullSigAlgParams) {
@@ -246,21 +246,21 @@
             }
         }
         return sigAlgParams;
-    };
+    }
 
     /**
      * @return
      */
     public boolean[] getIssuerUniqueID() {
         return tbsCert.getIssuerUniqueID();
-    };
+    }
 
     /**
      * @return
      */
     public boolean[] getSubjectUniqueID() {
         return tbsCert.getSubjectUniqueID();
-    };
+    }
 
     /**
      * @return
@@ -270,7 +270,7 @@
             return null;
         }
         return extensions.valueOfKeyUsage();
-    };
+    }
 
     public List/*<String>*/ getExtendedKeyUsage()
                                 throws CertificateParsingException {
@@ -289,7 +289,7 @@
             return Integer.MAX_VALUE;
         }
         return extensions.valueOfBasicConstrains();
-    };
+    }
 
     public Collection/*<List<?>>*/ getSubjectAlternativeNames()
                                 throws CertificateParsingException {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertPathImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertPathImpl.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertPathImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertPathImpl.java Thu Apr  6 23:52:51 2006
@@ -40,7 +40,6 @@
 import org.apache.harmony.security.pkcs7.ContentInfo;
 import org.apache.harmony.security.pkcs7.SignedData;
 import org.apache.harmony.security.x509.Certificate;
-import org.apache.harmony.security.x509.Extensions;
 
 
 /**
@@ -56,7 +55,7 @@
     private static final String[] encodingsArr = 
                                         new String[] {"PkiPath", "PKCS7"};
     static final List encodings = Collections.unmodifiableList(
-                                            Arrays.asList(encodingsArr));;
+                                            Arrays.asList(encodingsArr));
     private final List certificates;
     private byte[] pkiPathEncoding;
     private byte[] pkcs7Encoding;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/JarUtils.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/JarUtils.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/JarUtils.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/JarUtils.java Thu Apr  6 23:52:51 2006
@@ -110,7 +110,7 @@
             return null;
         }
 
-        if (((X509Certificate)certs[issuerSertIndex]).hasUnsupportedCriticalExtension()) {
+        if (certs[issuerSertIndex].hasUnsupportedCriticalExtension()) {
             throw new SecurityException("Can not recognize a critical extension");
         }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java Thu Apr  6 23:52:51 2006
@@ -397,8 +397,9 @@
                 curr_entry = curr_entry.next;
             }
             if (curr_entry == null) {
-                for (curr++; curr < arr.length && arr[curr] == null; curr++)
-                    ;
+                for (curr++; curr < arr.length && arr[curr] == null; curr++) {
+                }
+
                 if (curr < arr.length) {
                     curr_entry = arr[curr];
                 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java Thu Apr  6 23:52:51 2006
@@ -21,8 +21,8 @@
 
 package org.apache.harmony.security.x509;
 
-import java.math.BigInteger;
 import java.io.IOException;
+import java.math.BigInteger;
 
 import org.apache.harmony.security.asn1.ASN1Implicit;
 import org.apache.harmony.security.asn1.ASN1Integer;
@@ -30,8 +30,6 @@
 import org.apache.harmony.security.asn1.ASN1Sequence;
 import org.apache.harmony.security.asn1.ASN1Type;
 import org.apache.harmony.security.asn1.BerInputStream;
-
-import org.apache.harmony.security.asn1.*;
 
 /**
  * The class incapsulates the ASN.1 DER encoding/decoding work

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CRLDistributionPoints.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CRLDistributionPoints.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CRLDistributionPoints.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CRLDistributionPoints.java Thu Apr  6 23:52:51 2006
@@ -22,14 +22,12 @@
 package org.apache.harmony.security.x509;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collection;
+import java.util.List;
 
 import org.apache.harmony.security.asn1.ASN1SequenceOf;
 import org.apache.harmony.security.asn1.ASN1Type;
 import org.apache.harmony.security.asn1.BerInputStream;
-
-import org.apache.harmony.security.asn1.*;
 
 /**
  * The class incapsulates the ASN.1 DER encoding/decoding work 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/Certificate.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/Certificate.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/Certificate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/Certificate.java Thu Apr  6 23:52:51 2006
@@ -21,12 +21,11 @@
 
 package org.apache.harmony.security.x509;
 
+import org.apache.harmony.security.asn1.ASN1BitString;
 import org.apache.harmony.security.asn1.ASN1Sequence;
 import org.apache.harmony.security.asn1.ASN1Type;
 import org.apache.harmony.security.asn1.BerInputStream;
 import org.apache.harmony.security.asn1.BitString;
-
-import org.apache.harmony.security.asn1.ASN1BitString;
 
 /**
  * The class incapsulates the ASN.1 DER encoding/decoding work 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CertificateList.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CertificateList.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CertificateList.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CertificateList.java Thu Apr  6 23:52:51 2006
@@ -21,12 +21,11 @@
 
 package org.apache.harmony.security.x509;
 
+import org.apache.harmony.security.asn1.ASN1BitString;
 import org.apache.harmony.security.asn1.ASN1Sequence;
 import org.apache.harmony.security.asn1.ASN1Type;
 import org.apache.harmony.security.asn1.BerInputStream;
 import org.apache.harmony.security.asn1.BitString;
-
-import org.apache.harmony.security.asn1.ASN1BitString;
 
 /**
  * The class incapsulates the ASN.1 DER encoding/decoding work 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CertificatePolicies.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CertificatePolicies.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CertificatePolicies.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/CertificatePolicies.java Thu Apr  6 23:52:51 2006
@@ -21,17 +21,13 @@
 
 package org.apache.harmony.security.x509;
 
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.Collection;
 import java.util.List;
 
 import org.apache.harmony.security.asn1.ASN1SequenceOf;
 import org.apache.harmony.security.asn1.ASN1Type;
 import org.apache.harmony.security.asn1.BerInputStream;
-
-import org.apache.harmony.security.asn1.*;
 
 /**
  * The class incapsulates the ASN.1 DER encoding/decoding work 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/DistributionPoint.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/DistributionPoint.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/DistributionPoint.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/DistributionPoint.java Thu Apr  6 23:52:51 2006
@@ -28,8 +28,6 @@
 import org.apache.harmony.security.asn1.ASN1Type;
 import org.apache.harmony.security.asn1.BerInputStream;
 
-import org.apache.harmony.security.asn1.*;
-
 /**
  * The class incapsulates the ASN.1 DER encoding/decoding work 
  * with the DistributionPoint stucture which is the part of X.509 CRL

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/DistributionPointName.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/DistributionPointName.java?rev=392202&r1=392201&r2=392202&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/DistributionPointName.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/DistributionPointName.java Thu Apr  6 23:52:51 2006
@@ -24,8 +24,6 @@
 import org.apache.harmony.security.asn1.ASN1Choice;
 import org.apache.harmony.security.asn1.ASN1Implicit;
 import org.apache.harmony.security.asn1.ASN1Type;
-
-import org.apache.harmony.security.asn1.*;
 import org.apache.harmony.security.x501.Name;
 
 /**



Mime
View raw message