jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1529215 - in /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy: ProxyControl.java gui/ProxyControlGui.java
Date Fri, 04 Oct 2013 16:58:49 GMT
Author: sebb
Date: Fri Oct  4 16:58:49 2013
New Revision: 1529215

URL: http://svn.apache.org/r1529215
Log:
More details regarding certificate installation

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1529215&r1=1529214&r2=1529215&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Fri Oct  4 16:58:49 2013
@@ -559,7 +559,7 @@ public class ProxyControl extends Generi
         }
     }
 
-    public String[] getCertificateSerialAndFingerPrint() {
+    public String[] getCertificateDetails() {
         if (isDynamicMode()) {
             try {
                 X509Certificate caCert = (X509Certificate) keyStore.getCertificate(KeyToolUtils.getRootCAalias());
@@ -570,8 +570,7 @@ public class ProxyControl extends Generi
                 return new String[]
                         {
                         caCert.getSubjectX500Principal().toString(),
-                        "Fingerprint(SHA1):",
-                        JOrphanUtils.baToHexString(DigestUtils.sha1(caCert.getEncoded()),
' ')
+                        "Fingerprint(SHA1): " + JOrphanUtils.baToHexString(DigestUtils.sha1(caCert.getEncoded()),
' ')
                         };
             } catch (GeneralSecurityException e) {
                 log.error("Problem reading root CA from keystore", e);

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1529215&r1=1529214&r2=1529215&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Fri Oct  4 16:58:49 2013
@@ -70,6 +70,7 @@ import org.apache.jmeter.testelement.Tes
 import org.apache.jmeter.testelement.WorkBench;
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.exec.KeyToolUtils;
 import org.apache.jorphan.gui.GuiUtils;
 import org.apache.jorphan.gui.JLabeledTextField;
 import org.apache.jorphan.logging.LoggingManager;
@@ -478,14 +479,14 @@ public class ProxyControlGui extends Log
             stop.setEnabled(true);
             restart.setEnabled(false);
             if (ProxyControl.isDynamicMode()) {
-                String details[] = model.getCertificateSerialAndFingerPrint();
+                String details[] = model.getCertificateDetails();
                 StringBuilder sb = new StringBuilder();
                 for(String detail : details) {
-                    sb.append(detail).append("\n");
+                    sb.append(detail).append("\n"); // $NON-NLS-1$
                 }
                 JOptionPane.showMessageDialog(this,
                     sb.toString(),
-                    "Please check the certificate before installing it:",
+                    "Please check the certificate matches the details below before installing
" + KeyToolUtils.ROOT_CACERT_CRT_PFX,
                     JOptionPane.INFORMATION_MESSAGE);
             }
         } catch (InvalidVariableException e) {



Mime
View raw message