• Home
  • History
  • Annotate
  • only in /libcore/support/src/test/java/org/apache/harmony/security/tests/support/
History log of /libcore/support/src/test/java/org/apache/harmony/security/tests/support/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
e26b27faf689c17b7894c78caee32432176349ec 04-Jun-2011 Elliott Hughes <enh@google.com> Remove more dead "security theater" cruft.

There's probably still more stuff lying around that isn't useful,
but this was all I had time for on this particular Friday afternoon...

Change-Id: I69593f6c9ab5534d581c703cc85a9766ba8e40e5
yBasicPermission.java
yPermission.java
yPermissionCollection.java
6241c067e065065098eb50a7aef35a58f78447a6 13-Jan-2011 Dan Bornstein <danfuzz@android.com> Remove pointless tests.

Change-Id: I17ffa62ca632ff1cbcdd0847c97ce539877e8667
cl/AclEntryImpl.java
cl/AclEnumerator.java
cl/AclImpl.java
cl/GroupImpl.java
cl/OwnerImpl.java
cl/PermissionImpl.java
cl/PrincipalImpl.java
95d52b3b1446af2fefd46f57efc1afb6c679e8cc 30-Oct-2010 Dan Bornstein <danfuzz@android.com> Remove a pointless test, which just tested a test support class.

Change-Id: Ifef2b25500474f7e3b18ff97e7831717f2c9b391
ert/PolicyNodeImpl.java
52dea0ad773d902ad8402e1354afe0842dd364b5 04-Oct-2010 Brian Carlstrom <bdc@google.com> Update TestUtils certificates to fix CertPathBuilder1Test and CertPathTest

Bug: 2322662
Change-Id: I8ad9a91f4095807bd710045eef3a97a86b560f49
ert/TestUtils.java
0c131a2ca38465b7d1df4eaee63ac73ce4d5986d 21-May-2010 Brian Carlstrom <bdc@google.com> RI 6 support for javax.net.ssl

Summary:
- RI 6 support for javax.net.ssl
- SSLEngine fixes based on new SSLEngineTest
- fix Cipher.checkMode bug recently introduced in dalvik-dev

Details:

Fix Cipher.checkMode that was preventing most javax.net.ssl tests from working

luni/src/main/java/javax/crypto/Cipher.java

RI 6 has introduced the concept of a "Default" SSLContext. This is
accessed via SSLContext.getDefault() and also
SSLContext.getInstance("Default"). Harmony had its own
DefaultSSLContext but it was not created via an SSLContextSpi. It also
was a single shared instance whereas the new RI6 Default SSLContext
shares internal SSLSessionContext instances between different Default
SSLContexts.

Refactored the old code into an SSLContextImpl subclass that
allows it to be created via SSLContext.getInstance. SSLContextImpl
ensures that we only ever create one set of SSLSessionContext
instances for the Default context.

luni/src/main/java/javax/net/ssl/DefaultSSLContext.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DefaultSSLContextImpl.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java

Added SSLContext.getDefault and SSLContext.setDefault

luni/src/main/java/javax/net/ssl/SSLContext.java

Replace dependencies of old DefaultSSLContext with use of SSLContext.getDefault

luni/src/main/java/javax/net/ssl/SSLServerSocketFactory.java
luni/src/main/java/javax/net/ssl/SSLSocketFactory.java

Register "SSLContext.Default" as DefaultSSLContextImpl class for SSLContext.getInstance()

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java

Added constant for new "Default" standard name and added it to
SSL_CONTEXT_PROTOCOLS. New tests based on SSL_CONTEXT_PROTOCOLS
made it clear that neither Android or RI support SSLv2 so removed
it from SSL_CONTEXT_PROTOCOLS and SSL_SOCKET_PROTOCOLS. Added
constant for TLS as well which was previously scattered all over
tests. Remove SSLv2Hello from SSL_SOCKET_PROTOCOLS for Android
since with OpenSSL disablign SSLv2 means you can not use
SSLv2Hello either.

support/src/test/java/javax/net/ssl/StandardNames.java

Added tests for SSLContext.getDefault and
SSLContext.setDefault. Changed existing tests to work on all
protocols including new "Default".

luni/src/test/java/javax/net/ssl/SSLContextTest.java

RI 6 has introduced the notion of SSLParameters which encapsulate SSL
the handshake parameters of desired cipher suites, protocols, and
client authentication requirements.

The main new class SSLParameters is basically just a bag of fields
with accessors and a couple simple constructors. The only things
of note are that it clones all String arrays on input and output
and the setters for the two boolean fields ensure that only one is
true at a time.

luni/src/main/java/javax/net/ssl/SSLParameters.java

Added SSLContext.getDefaultSSLParameters and
SSLContext.getSupportedSSLParameters which simply delegate to the
SSLContextSpi.

luni/src/main/java/javax/net/ssl/SSLContext.java

Added abstract SSLContextSpi.engineGetDefaultSSLParameters and
SSLContext.engineGetSupportedSSLParameters.

luni/src/main/java/javax/net/ssl/SSLContextSpi.java

Added engineGetDefaultSSLParameters and
engineGetSupportedSSLParameters implementation. The RI documents
in SSLContextSpi that these are implemented by default by creating
a socket via the SSLContext's SocketFactory and asking for the
enabled/supported cipher suites and protocols respectively, so
that is what is done. The doc mentions throwing
UnsupportedOperationException if there is a problem, so we do that
as well.

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java

Added {SSLEngine,SSLSocket}.{getSSLParameters,setSSLParameters}
which are analogous.

luni/src/main/java/javax/net/ssl/SSLEngine.java
luni/src/main/java/javax/net/ssl/SSLSocket.java

Added SSLParametersTest

luni/src/test/java/javax/net/ssl/SSLParametersTest.java
luni/src/test/java/javax/net/ssl/AllTests.java

Added SSLContext.get{Default,Supported}SSLParameters tests

luni/src/test/java/javax/net/ssl/SSLContextTest.java

Added SSLSocket.{getSSLParameters,setSSLParameters} tests and added
some extra asserts to test_SSLSocketPair_create based on experience
with test_SSLEnginePair_create.

luni/src/test/java/javax/net/ssl/SSLSocketTest.java

Dummy implementation of new SSLContextSpi for test classes.

support/src/test/java/org/apache/harmony/security/tests/support/MySSLContextSpi.java
support/src/test/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java

Other minor RI 6 API changes:

RI 6 removed Serializable from HandshakeCompletedEvent and SSLSessionBindingEvent

luni/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
luni/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java

RI 6 added generic types to the KeyStoreBuilderParameters List
constructor and accessor as well as to
SSLSessionContext.getIds. Fixed tests to compile with generic types.

luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
luni/src/main/java/javax/net/ssl/SSLSessionContext.java
luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java

SSLEngine improvements. Since I was changing SSLEngine, I wrote an
SSLEngineTest based on my SSLSocketTest to do some simply sanity
checking. It expose a number of issues. I've fixed the small ones,
marked the rest as known failures.

Renamed some TLS_ cipher suites to SSL_ to match JSSE standard
names. These were all old suites no longer supported by RI or
OpenSSL which is why they were missed in an earlier cleanup of this
type in this class. Also fixed SSLEngine supported cipher suites
list not to include SSL_NULL_WITH_NULL_NULL which is not a valid
suite to negotiate.

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java

SSLEngine instances can have null host values, which caused a
NullPointerException in the ClientSessionContext implementation.

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java

SSLEngine tests were failing because SSLParameters was throwing
NullPointerException instead of IllegalArgument exception on null
element values. Fixed null pointer message style while I was here.

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java

Fixed SSLEngine instances to default to server mode like RI

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java

Fixed KEY_TYPES based on SSLEngine implementation. Removed dead
code NativeCrypto.getEnabledProtocols which was recently made
obsolete. Cleaned up null exception messages to follow our convention.

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java

Added SSLEngineTest which parallels SSLSocketTest in its
coverage. Similarly added TestSSLEnginePair which loosely parallels
TestSSLSocketPair.

luni/src/test/java/javax/net/ssl/SSLEngineTest.java
luni/src/test/java/javax/net/ssl/AllTests.java
support/src/test/java/javax/net/ssl/TestSSLEnginePair.java

SSLEngineTest betters exposed the differences between SSLSocket and
SSLEngine supported cipher suites. StandardNames now has an
CIPHER_SUITES_SSLENGINE definition which denotes what is missing
and what is extra and why in the SSLEngine implementation.

support/src/test/java/javax/net/ssl/StandardNames.java

Created StandardNames.assert{Valid,Supported}{CipherSuites,Protocols}
to factor out some code test code that is also used by new tests.

support/src/test/java/javax/net/ssl/StandardNames.java
luni/src/test/java/javax/net/ssl/SSLSocketFactoryTest.java
luni/src/test/java/javax/net/ssl/SSLSocketTest.java

Remove SSLSocketTest known failure and add new SSLEngineTest known failures

expectations/knownfailures.txt

SSL_OP_NO_TICKET change was recently merged from master which required some fixes.

For the moment, sslServerSocketSupportsSessionTickets always returns false.

support/src/test/java/javax/net/ssl/TestSSLContext.java

Fixed flakey test_SSLSocket_HandshakeCompletedListener which had a
race because the client thread look in the server session context
for an session by id potentially before the server thread had a
chance to store its session. Made noticable because of
SSL_OP_NO_TICKET recently merged from master (before this code
path was host only, not device)

luni/src/test/java/javax/net/ssl/SSLSocketTest.java

Fix checkjni issue where we need to check for pending exception in
OpenSSL callback. Possibly introduced by recent merge of
SSL_OP_NO_TICKET from master.

luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp

Expectation updates

Remove SSLSocketTest known failure and add new SSLEngineTest known failures

expectations/knownfailures.txt

Tag test_SSLSocket_getSupportedCipherSuites_connect as large

expectations/taggedtests.txt

Misc changes:

opening brace on wrong line

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerSessionContext.java

Long line cleanup while debugging

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketFactoryImpl.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java
support/src/test/java/javax/net/ssl/TestKeyStore.java

Removed bogus import

luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java

Comment clarify while debugging

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java

Ctor -> Constructor in comment

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java

Fixed naming of SocketTest_Test_create to TestSocketPair_Create to match renamed classes

luni/src/test/java/javax/net/ssl/SSLSocketTest.java

Change-Id: I99505e97d6047eeabe4a0b93202075a0b2d486ec
ySSLContextSpi.java
f33eae7e84eb6d3b0f4e86b59605bb3de73009f3 13-May-2010 Elliott Hughes <enh@google.com> Remove all trailing whitespace from the dalvik team-maintained parts of libcore.

Gentlemen, you may now set your editors to "strip trailing whitespace"...

Change-Id: I85b2f6c80e5fbef1af6cab11789790b078c11b1b
ertificateStub.java
dentityScopeStub.java
dentityStub.java
eyStoreTestSupport.java
DGoldenData.java
yAlgorithmParameterGeneratorSpi.java
yKeyPairGenerator1.java
yKeyPairGenerator2.java
yKeyPairGenerator3.java
yKeyPairGeneratorSpi.java
yKeyStore.java
yKeyStoreSpi.java
yLoadStoreParams.java
yMessageDigest1.java
yMessageDigest2.java
ySSLContextSpi.java
ySignature1.java
ySignature2.java
yTrustManagerFactorySpi.java
rivateKeyStub.java
ublicKeyStub.java
andomImpl.java
ecurityChecker.java
ignerStub.java
piEngUtils.java
estCertUtils.java
estKeyPair.java
estKeyStoreSpi.java
estUtils.java
ert/MyCRL.java
ert/MyCertPath.java
ert/MyCertPathBuilderSpi.java
ert/MyCertPathValidatorSpi.java
ert/MyCertStoreParameters.java
ert/MyCertStoreSpi.java
ert/MyCertificate.java
ert/MyCertificateFactorySpi.java
ert/MyFailingCertPath.java
ert/MyFailingCertificate.java
ert/TestUtils.java
nterfaces/DSAKeyPairGeneratorImpl.java
nterfaces/RSAMultiPrimePrivateCrtKeyImpl.java
mpCallbackHandler.java
1c422fc0ab0692e10a05af6f48c6276c4dad4bea 16-Oct-2009 Jesse Wilson <jessewilson@google.com> Respond to impossible CloneNotSupportedExceptions with AssertionErrors.

See bug 2183132.
ert/MyCertStoreParameters.java
ab28398a565e5ce8a56cdfd50ac6226e5317cf66 11-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137873
ert/TestUtils.java
adc854b798c1cfe3bfd4c27d68d5cee38ca617da 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ertificateStub.java
dentityScopeStub.java
dentityStub.java
eyStoreTestSupport.java
DGoldenData.java
yAlgorithmParameterGeneratorSpi.java
yBasicPermission.java
yGuard.java
yKeyPairGenerator1.java
yKeyPairGenerator2.java
yKeyPairGenerator3.java
yKeyPairGeneratorSpi.java
yKeyStore.java
yKeyStoreSpi.java
yLoadStoreParams.java
yMessageDigest1.java
yMessageDigest2.java
yPermission.java
yPermissionCollection.java
yProvider.java
ySSLContextSpi.java
ySignature1.java
ySignature2.java
yTrustManagerFactorySpi.java
rivateKeyStub.java
ublicKeyStub.java
andomImpl.java
ecurityChecker.java
ignerStub.java
piEngUtils.java
estCertUtils.java
estKeyPair.java
estKeyStoreSpi.java
estUtils.java
cl/AclEntryImpl.java
cl/AclEnumerator.java
cl/AclImpl.java
cl/GroupImpl.java
cl/OwnerImpl.java
cl/PermissionImpl.java
cl/PrincipalImpl.java
ert/MyCRL.java
ert/MyCertPath.java
ert/MyCertPathBuilderSpi.java
ert/MyCertPathValidatorSpi.java
ert/MyCertStoreParameters.java
ert/MyCertStoreSpi.java
ert/MyCertificate.java
ert/MyCertificateFactorySpi.java
ert/MyFailingCertPath.java
ert/MyFailingCertificate.java
ert/PolicyNodeImpl.java
ert/TestUtils.java
nterfaces/DSAKeyPairGeneratorImpl.java
nterfaces/RSAMultiPrimePrivateCrtKeyImpl.java
pec/MyEncodedKeySpec.java
mpCallbackHandler.java
1c0fed63c71ddb230f3b304aac12caffbedf2f21 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ertificateStub.java
dentityScopeStub.java
dentityStub.java
eyStoreTestSupport.java
DGoldenData.java
yAlgorithmParameterGeneratorSpi.java
yBasicPermission.java
yGuard.java
yKeyPairGenerator1.java
yKeyPairGenerator2.java
yKeyPairGenerator3.java
yKeyPairGeneratorSpi.java
yKeyStore.java
yKeyStoreSpi.java
yLoadStoreParams.java
yMessageDigest1.java
yMessageDigest2.java
yPermission.java
yPermissionCollection.java
yProvider.java
ySSLContextSpi.java
ySignature1.java
ySignature2.java
yTrustManagerFactorySpi.java
rivateKeyStub.java
ublicKeyStub.java
andomImpl.java
ecurityChecker.java
ignerStub.java
piEngUtils.java
estCertUtils.java
estKeyPair.java
estKeyStoreSpi.java
estUtils.java
cl/AclEntryImpl.java
cl/AclEnumerator.java
cl/AclImpl.java
cl/GroupImpl.java
cl/OwnerImpl.java
cl/PermissionImpl.java
cl/PrincipalImpl.java
ert/MyCRL.java
ert/MyCertPath.java
ert/MyCertPathBuilderSpi.java
ert/MyCertPathValidatorSpi.java
ert/MyCertStoreParameters.java
ert/MyCertStoreSpi.java
ert/MyCertificate.java
ert/MyCertificateFactorySpi.java
ert/MyFailingCertPath.java
ert/MyFailingCertificate.java
ert/PolicyNodeImpl.java
ert/TestUtils.java
nterfaces/DSAKeyPairGeneratorImpl.java
nterfaces/RSAMultiPrimePrivateCrtKeyImpl.java
pec/MyEncodedKeySpec.java
mpCallbackHandler.java
b7926325a1c1a370c84c81db80372f59af240a53 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
ySignature1.java
a0881d052ee72e3f7e773374e9b1aa75fbd6be4c 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
yKeyStoreSpi.java
yProvider.java
ySSLContextSpi.java
upport_Configuration.java
estKeyStoreSpi.java
cl/AclEntryImpl.java
cl/AclEnumerator.java
cl/AclImpl.java
cl/GroupImpl.java
cl/OwnerImpl.java
cl/PermissionImpl.java
cl/PrincipalImpl.java
ert/MyCertPath.java
ert/MyCertificate.java
ert/MyCertificateFactorySpi.java
ert/MyFailingCertPath.java
ert/MyFailingCertificate.java
ert/PolicyNodeImpl.java
ert/TestUtils.java
nterfaces/DSAKeyPairGeneratorImpl.java
nterfaces/RSAMultiPrimePrivateCrtKeyImpl.java
esource/Support_Resources.java
dd828f42a5c83b4270d4fbf6fce2da1878f1e84a 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
ySSLContextSpi.java
yTrustManagerFactorySpi.java
upport_Configuration.java
ert/MyCertPath.java
ert/MyCertStoreSpi.java
ert/MyCertificate.java
ert/MyCertificateFactorySpi.java
esource/Support_Resources.java
fdb2704414a9ed92394ada0d1395e4db86889465 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ertificateStub.java
dentityScopeStub.java
dentityStub.java
eyStoreTestSupport.java
DGoldenData.java
yAlgorithmParameterGeneratorSpi.java
yBasicPermission.java
yGuard.java
yKeyPairGenerator1.java
yKeyPairGenerator2.java
yKeyPairGenerator3.java
yKeyPairGeneratorSpi.java
yKeyStore.java
yKeyStoreSpi.java
yLoadStoreParams.java
yMessageDigest1.java
yMessageDigest2.java
yPermission.java
yPermissionCollection.java
ySignature1.java
ySignature2.java
rivateKeyStub.java
ublicKeyStub.java
andomImpl.java
ecurityChecker.java
ignerStub.java
piEngUtils.java
estCertUtils.java
estKeyPair.java
estUtils.java
ert/MyCRL.java
ert/MyCertPath.java
ert/MyCertPathBuilderSpi.java
ert/MyCertPathValidatorSpi.java
ert/MyCertStoreParameters.java
ert/MyCertStoreSpi.java
ert/MyCertificate.java
ert/MyCertificateFactorySpi.java
ert/TestUtils.java
pec/MyEncodedKeySpec.java
mpCallbackHandler.java