From bb3c2c8a29ba6186970e973cfba65369fb40765f Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Wed, 15 May 2013 21:00:27 +0000 Subject: QPID-4849 The previous code was assuming that "CN" was the first entry in the name string. Changed the code to first find "CN" and then extract from there. testMultipleCertsInSingleStore verifies this change. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1483079 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'qpid/java/common') diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java index ce7cc105a1..a527c436f8 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java @@ -95,8 +95,9 @@ public class SSLUtil if (dn.contains("CN=")) { - id.append(dn.substring(3, - dn.indexOf(",") == -1? dn.length(): dn.indexOf(","))); + String str = dn.substring(dn.indexOf("CN=")+3, dn.length()); + id.append(str.substring(0, + str.indexOf(",") == -1? str.length(): str.indexOf(","))); } if (dn.contains("DC=")) -- cgit v1.2.1