Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed grammar in my previous commit #6298

Merged
merged 1 commit into from
Jun 23, 2024
Merged

Fixed grammar in my previous commit #6298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class KeyToolUtils {
/** Name of property that can be used to override the default keytool location */
private static final String KEYTOOL_DIRECTORY = "keytool.directory"; // $NON-NLS-1$

private static final String DNAME_INTERMEDIATE_CA_KEY = "cn=JMeter Intermediate CA for recording (INSTALL ONLY IF ITS YOURS)"; // $NON-NLS-1$
private static final String DNAME_INTERMEDIATE_CA_KEY = "cn=JMeter Intermediate CA for recording (INSTALL ONLY IF IT IS YOURS)"; // $NON-NLS-1$

public static final String ROOT_CACERT_CRT_PFX = "ApacheJMeterTemporaryRootCA"; // $NON-NLS-1$ (do not change)
private static final String ROOT_CACERT_CRT = ROOT_CACERT_CRT_PFX + ".crt"; // $NON-NLS-1$ (Firefox and Windows)
Expand All @@ -73,7 +73,7 @@ public class KeyToolUtils {
static {
StringBuilder sb = new StringBuilder();

sb.append("CN=_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)"); // $NON-NLS-1$
sb.append("CN=_ JMeter Root CA for recording (INSTALL ONLY IF IT IS YOURS)"); // $NON-NLS-1$
String userName = System.getProperty("user.name"); // $NON-NLS-1$
userName = userName.replace('\\','/'); // Backslash is special (Bugzilla 56178)
addElement(sb, "OU=Username: ", userName); // $NON-NLS-1$
Expand Down
6 changes: 3 additions & 3 deletions xdocs/usermanual/component_reference.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6832,9 +6832,9 @@ As a consequence:
<li>The browser should display a dialogue asking if you want to accept the certificate or not. For example:
<source>
1) The server's name "<code>www.example.com</code>" does not match the certificate's name
"<code>_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)</code>". Somebody may be trying to eavesdrop on you.
2) The certificate for "<code>_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)</code>" is signed by the unknown Certificate Authority
"<code>_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)</code>". It is not possible to verify that this is a valid certificate.
"<code>_ JMeter Root CA for recording (INSTALL ONLY IF IT IS YOURS)</code>". Somebody may be trying to eavesdrop on you.
2) The certificate for "<code>_ JMeter Root CA for recording (INSTALL ONLY IF IT IS YOURS)</code>" is signed by the unknown Certificate Authority
"<code>_ JMeter Root CA for recording (INSTALL ONLY IF IT IS YOURS)</code>". It is not possible to verify that this is a valid certificate.
</source>
You will need to accept the certificate in order to allow the JMeter Proxy to intercept the SSL traffic in order to
record it.
Expand Down
Loading