Index: depends/files/java.security =================================================================== --- depends/files/java.security (revision 406879) +++ depends/files/java.security (working copy) @@ -23,8 +23,8 @@ # Open Source providers security.provider.1=org.apache.harmony.security.provider.cert.DRLCertFactory security.provider.2=org.bouncycastle.jce.provider.BouncyCastleProvider +security.provider.3=org.apache.harmony.security.provider.jsse.JSSEProvider - # # Class to instantiate as a default Configuration implementation # See specification for javax.security.auth.login.Configuration class. @@ -81,8 +81,8 @@ # See specification for # javax/net/ssl/SSLSocketFactory.html#getDefault() # javax/net/ssl/SSLServerSocketFactory.html#getDefault() -#ssl.SocketFactory.provider= -#ssl.ServerSocketFactory.provider= +ssl.SocketFactory.provider=org.apache.harmony.security.provider.jsse.SSLSocketFactoryImpl +ssl.ServerSocketFactory.provider=org.apache.harmony.security.provider.jsse.SSLServerSocketFactoryImpl # Default KeyStore type. @@ -94,6 +94,6 @@ # See specification for # javax/net/ssl/KeyManagerFactory.html#getDefaultAlgorithm() # javax/net/ssl/TrustManagerFactory.html#getDefaultAlgorithm() -#ssl.KeyManagerFactory.algorithm= -#ssl.TrustManagerFactory.algorithm= +ssl.KeyManagerFactory.algorithm=X509 +ssl.TrustManagerFactory.algorithm=X509 Index: modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java =================================================================== --- modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java (revision 406879) +++ modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java (working copy) @@ -55,6 +55,13 @@ /** * Constructs an empty HashMap + */ + public TwoKeyHashMap() { + this(DEFAULT_INITIAL_SIZE, DEFAULT_LOAD_FACTOR); + } + + /** + * Constructs an empty HashMap * @param initialCapacity */ public TwoKeyHashMap(int initialCapacity) { @@ -275,7 +282,7 @@ * Entry implementation for the TwoKeyHashMap class * */ - static class Entry { + public static class Entry { int hash; Object key1; Object key2;