|
From: <bob...@us...> - 2003-09-19 19:57:27
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv28903/hk/hku/cecid/phoenix/message/transport
Modified Files:
Http.java
Log Message:
Fix a bug on PKISignatureImpl.sign, which ignore the signing algo previously.
Make Http to support the default SSL client authentication settings.
Index: Http.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/transport/Http.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Http.java 11 Sep 2003 08:58:09 -0000 1.7
--- Http.java 19 Sep 2003 06:54:45 -0000 1.8
***************
*** 148,151 ****
--- 148,152 ----
private static TrustManager[] trustManagers = null;
private static Map keyManagerMap = null;
+ private static KeyManager defaultKeyStoreKeyManager = null;
//private static SSLSocketFactory sslSocketFactory;
public static void configure(Property prop) throws InitializationException {
***************
*** 256,266 ****
realKeyStoreFile = null;
}
! try {
! url = new URL(urlString);
! } catch (java.net.MalformedURLException e) {
! logger.warn("Malformed url for SSL Client auth '" + urlString
! + "' : " + e.getMessage());
}
! if (realKeyStoreFile != null && url != null) {
KeyManager keyManager = null;
try {
--- 257,270 ----
realKeyStoreFile = null;
}
! if (urlString != null ) {
! try {
! url = new URL(urlString);
! } catch (java.net.MalformedURLException e) {
! logger.warn("Malformed url for SSL Client auth '"
! + urlString + "' : " + e.getMessage());
! }
}
! if (realKeyStoreFile != null
! && (urlString == null || url != null)) {
KeyManager keyManager = null;
try {
***************
*** 275,281 ****
}
if (keyManager != null) {
! logger.info("Add SSL Client Authentication entry : "
! + url + " " + realKeyStoreFile);
! result.put(url, keyManager);
}
} else {
--- 279,292 ----
}
if (keyManager != null) {
! if (url != null) {
! logger.info("Add SSL Client Authentication entry : "
! + url + " " + realKeyStoreFile);
! result.put(url, keyManager);
! } else {
! logger.info("Add default SSL Client "
! + "Authentication entry : "
! + realKeyStoreFile);
! defaultKeyStoreKeyManager = keyManager;
! }
}
} else {
***************
*** 394,397 ****
--- 405,412 ----
logger.debug("use key manager for url : " + url);
keyManagers = new KeyManager[]{keyManager};
+ } else if (defaultKeyStoreKeyManager != null) {
+ logger.debug("use default key manager");
+ keyManagers
+ = new KeyManager[]{defaultKeyStoreKeyManager};
}
}
|