You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by bl...@apache.org on 2001/11/01 17:10:08 UTC
cvs commit: jakarta-jmeter/src/org/apache/jmeter/util IaikSSLManager.java JsseSSLManager.java SSLManager.java
bloritsch 01/11/01 08:10:08
Modified: src/org/apache/jmeter/util IaikSSLManager.java
JsseSSLManager.java SSLManager.java
Log:
explicitly set the provider
Revision Changes Path
1.5 +3 -7 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IaikSSLManager.java 2001/10/29 22:03:13 1.4
+++ IaikSSLManager.java 2001/11/01 16:10:08 1.5
@@ -66,12 +66,8 @@
import java.io.FileInputStream;
import java.net.HttpURLConnection;
import java.security.KeyStore;
-import java.security.KeyStoreException;
import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
-import java.util.Enumeration;
/**
* The SSLManager handles the KeyStore information for JMeter. Basically, it
@@ -81,7 +77,7 @@
* make a decision, it will pop open a dialog asking you for more information.
*
* @author <a href="bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/10/29 22:03:13 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/11/01 16:10:08 $
*/
public class IaikSSLManager extends SSLManager {
private SSLContext context;
@@ -179,6 +175,8 @@
* our X509KeyManager so that we can choose our alias.
*/
protected IaikSSLManager() {
+ this.setProvider(new iaik.security.provider.IAIK());
+ this.setProvider(new sun.security.provider.Sun());
SSLClientContext clientContext = new SSLClientContext();
if ("all".equalsIgnoreCase(JMeterUtils.getPropDefault("javax.net.debug", "none"))) {
@@ -190,6 +188,4 @@
this.context = clientContext;
System.out.println("IaikSSLManager installed");
}
-
- protected void setProvider(Provider provider) {}
}
1.6 +3 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JsseSSLManager.java 2001/10/29 22:03:13 1.5
+++ JsseSSLManager.java 2001/11/01 16:10:08 1.6
@@ -77,7 +77,7 @@
* make a decision, it will pop open a dialog asking you for more information.
*
* @author <a href="bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/10/29 22:03:13 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/11/01 16:10:08 $
*/
public class JsseSSLManager extends SSLManager {
/** Cache the SecureRandom instance because it takes a long time to create */
@@ -245,6 +245,8 @@
}
protected void setProvider(Provider sslProvider) {
+ super.setProvider(sslProvider);
+
try {
this.context = SSLContext.getInstance("TLS", sslProvider);
KeyManagerFactory managerFactory = KeyManagerFactory.getInstance("SunX509");
1.9 +16 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SSLManager.java 2001/10/29 17:21:01 1.8
+++ SSLManager.java 2001/11/01 16:10:08 1.9
@@ -81,7 +81,7 @@
* make a decision, it will pop open a dialog asking you for more information.
*
* @author <a href="bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/10/29 17:21:01 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/11/01 16:10:08 $
*/
public abstract class SSLManager {
/** Singleton instance of the manager */
@@ -98,7 +98,21 @@
}
public abstract void setContext(HttpURLConnection conn);
- protected abstract void setProvider(Provider provider);
+
+ /**
+ * Default implementation of setting the Provider
+ */
+ protected void setProvider(Provider provider) {
+ if ( null != provider ) {
+ Security.addProvider( provider );
+ }
+ }
+
+ /**
+ * Uniform method of getting the JMeterKeyStore input file
+ */
+ protected File getUserKeyStore() {
+ }
/**
* Protected Constructor to remove the possibility of directly instantiating
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>