Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 12573 invoked from network); 28 Mar 2010 11:55:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 28 Mar 2010 11:55:37 -0000 Received: (qmail 30451 invoked by uid 500); 28 Mar 2010 11:55:37 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 30393 invoked by uid 500); 28 Mar 2010 11:55:37 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 30386 invoked by uid 99); 28 Mar 2010 11:55:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Mar 2010 11:55:37 +0000 X-ASF-Spam-Status: No, hits=-1118.9 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Mar 2010 11:55:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DB65023889FA; Sun, 28 Mar 2010 11:55:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r928378 - /directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/StudioKeyStoreManager.java Date: Sun, 28 Mar 2010 11:55:15 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100328115515.DB65023889FA@eris.apache.org> Author: seelmann Date: Sun Mar 28 11:55:15 2010 New Revision: 928378 URL: http://svn.apache.org/viewvc?rev=928378&view=rev Log: Fix for DIRSTUDIO-642 (ADS does not remember the certificate if two certificates are used for the same server): o use SHA-1 hash as alias Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/StudioKeyStoreManager.java Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/StudioKeyStoreManager.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/StudioKeyStoreManager.java?rev=928378&r1=928377&r2=928378&view=diff ============================================================================== --- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/StudioKeyStoreManager.java (original) +++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/StudioKeyStoreManager.java Sun Mar 28 11:55:15 2010 @@ -32,6 +32,8 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import org.apache.commons.codec.digest.DigestUtils; + /** * A wrapper around {@link KeyStore}. @@ -226,8 +228,11 @@ public class StudioKeyStoreManager private void addToKeyStore( X509Certificate certificate, KeyStore keyStore ) throws Exception { - String alias = certificate.getSubjectX500Principal().getName(); - keyStore.setCertificateEntry( alias, certificate ); + // The alias is not relevant, it just needs to be an unique identifier. + // The SHA-1 hash of the certificate should be unique. + byte[] encoded = certificate.getEncoded(); + String shaHex = DigestUtils.shaHex( encoded ); + keyStore.setCertificateEntry( shaHex, certificate ); }