bloritsch 01/10/26 06:22:10
Modified: . build.xml
src/org/apache/jmeter/util IaikSSLManager.java
JsseSSLManager.java SSLManager.java
Log:
fix runtime dependancies on SSLManager
Revision Changes Path
1.41 +2 -1 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- build.xml 2001/10/24 17:31:32 1.40
+++ build.xml 2001/10/26 13:22:10 1.41
@@ -87,7 +87,8 @@
token="@VERSION@" value="${version}"/>
<javac srcdir="${sources.src.dir}"
destdir="${classes.dest.dir}"
- optimize="${optimize}">
+ optimize="${optimize}"
+ debug="on">
<exclude name="**/*.df*"/>
<exclude name="**/*.html"/>
<exclude name="**/*.tpr"/>
1.3 +10 -8 jakarta-jmeter/src/org/apache/jmeter/util/IaikSSLManager.java
Index: IaikSSLManager.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/util/IaikSSLManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IaikSSLManager.java 2001/10/24 17:11:39 1.2
+++ IaikSSLManager.java 2001/10/26 13:22:10 1.3
@@ -82,7 +82,7 @@
* make a decision, it will pop open a dialog asking you for more information.
*
* @author <a href="[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/10/24 17:11:39 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/26 13:22:10 $
*/
public class IaikSSLManager extends SSLManager {
private SSLContext context;
@@ -171,7 +171,7 @@
X509Certificate[] certs = null;
PrivateKey key = null;
-
+
if (keyStore == null) {
key = pkcsKey.getKeyBag().getPrivateKey();
CertificateBag[] bags = pkcsKey.getCertificateBags();
@@ -185,14 +185,14 @@
Enumeration aliases = keyStore.aliases();
while (aliases.hasMoreElements()) {
if (key != null) continue;
-
+
String alias = (String) aliases.nextElement();
-
+
if (keyStore.isKeyEntry(alias)) {
key = (PrivateKey) keyStore.getKey(alias,
password.toCharArray());
Certificate[] keycerts =
keyStore.getCertificateChain(alias);
certs = new X509Certificate[keycerts.length];
-
+
for (int i = 0; i < keycerts.length; i++) {
certs[i] = (X509Certificate) keycerts[i];
}
@@ -214,16 +214,18 @@
* this object. Create the SSLContext, and wrap all the X509KeyManagers with
* our X509KeyManager so that we can choose our alias.
*/
- protected IaikSSLManager(Provider sslProvider) {
+ protected IaikSSLManager() {
SSLClientContext clientContext = new SSLClientContext();
if ("all".equalsIgnoreCase(JMeterUtils.getPropDefault("javax.net.debug",
"none"))) {
clientContext.setDebugStream(System.err);
}
-
+
clientContext.addClientCredentials(this.getKeyAndCert());
-
+
this.context = clientContext;
System.out.println("IaikSSLManager installed");
}
+
+ protected void setProvider(Provider provider) {}
}
1.4 +6 -4 jakarta-jmeter/src/org/apache/jmeter/util/JsseSSLManager.java
Index: JsseSSLManager.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/util/JsseSSLManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JsseSSLManager.java 2001/10/24 17:11:39 1.3
+++ JsseSSLManager.java 2001/10/26 13:22:10 1.4
@@ -76,7 +76,7 @@
* make a decision, it will pop open a dialog asking you for more information.
*
* @author <a href="[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/10/24 17:11:39 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/26 13:22:10 $
*/
public class JsseSSLManager extends SSLManager {
/** Cache the SecureRandom instance because it takes a long time to create */
@@ -229,7 +229,7 @@
* this object. Create the SSLContext, and wrap all the X509KeyManagers with
* our X509KeyManager so that we can choose our alias.
*/
- protected JsseSSLManager(Provider sslProvider) {
+ protected JsseSSLManager() {
if (null == this.rand) {
this.rand = new SecureRandom();
}
@@ -238,6 +238,10 @@
System.setProperty("javax.net.debug", "all");
}
+ System.out.println("JsseSSLManager installed");
+ }
+
+ protected void setProvider(Provider sslProvider) {
try {
this.context = SSLContext.getInstance("TLS", sslProvider);
KeyManagerFactory managerFactory =
KeyManagerFactory.getInstance("SunX509");
@@ -260,8 +264,6 @@
HttpsURLConnection.setDefaultSSLSocketFactory(context.getSocketFactory());
} catch (Exception e) {
}
-
- System.out.println("JsseSSLManager installed");
}
/**
1.6 +4 -3 jakarta-jmeter/src/org/apache/jmeter/util/SSLManager.java
Index: SSLManager.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/util/SSLManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SSLManager.java 2001/10/26 13:07:54 1.5
+++ SSLManager.java 2001/10/26 13:22:10 1.6
@@ -81,7 +81,7 @@
* make a decision, it will pop open a dialog asking you for more information.
*
* @author <a href="[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/10/26 13:07:54 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/26 13:22:10 $
*/
public abstract class SSLManager {
/** Singleton instance of the manager */
@@ -98,6 +98,7 @@
}
public abstract void setContext(HttpURLConnection conn);
+ protected abstract void setProvider(Provider provider);
/**
* Protected Constructor to remove the possibility of directly instantiating
@@ -121,8 +122,8 @@
try {
Class clazz =
SSLManager.class.getClassLoader().loadClass(classname);
- Constructor constructor = clazz.getConstructor(new Class[]
{SSLManager.sslProvider.getClass()});
- SSLManager.manager = (SSLManager) constructor.newInstance(new
Object[] {SSLManager.sslProvider});
+ SSLManager.manager = (SSLManager) clazz.newInstance();
+ SSLManager.manager.setProvider(SSLManager.sslProvider);
} catch (Exception e) {
e.printStackTrace(System.err);
SSLManager.isSSLSupported = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
