diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2010-03-19 22:53:19 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2010-03-19 22:53:19 +0000 |
| commit | c196b8ef7ae21de43b0d4ccfb9252ee7d2b47733 (patch) | |
| tree | 54b9f7862462ed21246d96bbe8286b869e260a40 /java/common/src | |
| parent | 45b5d1cc1f48ed8f6caef8ee9652f788d69747a5 (diff) | |
| download | qpid-python-c196b8ef7ae21de43b0d4ccfb9252ee7d2b47733.tar.gz | |
Added test cases for QPID-2444 and QPID-2446
Modified SSLUtil to handle the case where distinguished name only contains the CN component.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@925469 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common/src')
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java b/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java index f23d9ae359..130ce04adc 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java +++ b/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java @@ -28,7 +28,8 @@ public class SSLUtil if (dn.contains("CN=")) { - hostname = dn.substring(3, dn.indexOf(",")); + hostname = dn.substring(3, + dn.indexOf(",") == -1? dn.length(): dn.indexOf(",")); } if (log.isDebugEnabled()) @@ -38,7 +39,8 @@ public class SSLUtil log.debug("Host Name obtained from DN : " + hostname); } - if (hostname != null && !hostname.equalsIgnoreCase(hostnameExpected)) + if (hostname != null && !(hostname.equalsIgnoreCase(hostnameExpected) || + hostname.equalsIgnoreCase(hostnameExpected + ".localdomain"))) { throw new TransportException("SSL hostname verification failed." + " Expected : " + hostnameExpected + |