Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 8254 invoked from network); 2 Nov 2008 00:37:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Nov 2008 00:37:47 -0000 Received: (qmail 72795 invoked by uid 500); 2 Nov 2008 00:37:53 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 72768 invoked by uid 500); 2 Nov 2008 00:37:53 -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 72759 invoked by uid 99); 2 Nov 2008 00:37:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Nov 2008 17:37:53 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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, 02 Nov 2008 00:36:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5D8E3238899F; Sat, 1 Nov 2008 17:37:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r709814 - /directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java Date: Sun, 02 Nov 2008 00:37:27 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081102003727.5D8E3238899F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sat Nov 1 17:37:27 2008 New Revision: 709814 URL: http://svn.apache.org/viewvc?rev=709814&view=rev Log: Fixed the bad SSL algorithm value which was set to SunX509. Modified: directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java Modified: directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java?rev=709814&r1=709813&r2=709814&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java (original) +++ directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java Sat Nov 1 17:37:27 2008 @@ -51,10 +51,12 @@ { // Set up key manager factory to use our key store String algorithm = Security.getProperty( "ssl.KeyManagerFactory.algorithm" ); + if ( algorithm == null ) { - algorithm = "SunX509"; + algorithm = KeyManagerFactory.getDefaultAlgorithm(); } + KeyManagerFactory kmf = KeyManagerFactory.getInstance( algorithm ); kmf.init( ks, null );