From 19b359ea2974b080bab132c28f521dfea245c21c Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Wed, 20 Jan 2010 21:18:33 +0000
Subject: [PATCH] Remove extraneous generateCertificateRequest method from crypto manager. Issue 4497

---
 opends/src/server/org/opends/server/util/CertificateManager.java |   35 +----------------------------------
 1 files changed, 1 insertions(+), 34 deletions(-)

diff --git a/opends/src/server/org/opends/server/util/CertificateManager.java b/opends/src/server/org/opends/server/util/CertificateManager.java
index 4b78091..08818da 100644
--- a/opends/src/server/org/opends/server/util/CertificateManager.java
+++ b/opends/src/server/org/opends/server/util/CertificateManager.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2008-2009 Sun Microsystems, Inc.
+ *      Copyright 2008-2010 Sun Microsystems, Inc.
  */
 
 package org.opends.server.util;
@@ -284,39 +284,6 @@
         keyStorePath, alias, password, subjectDN, validity);
   }
 
-  /**
-   * Generates a certificate signing request (CSR) using the provided
-   * information.
-   *
-   * @param  alias      The nickname to use for the certificate in the key
-   *                    store.  For the server certificate, it should generally
-   *                    be "server-cert".  It must not be {@code null} or empty.
-   * @param  subjectDN  The subject DN to use for the certificate.  It must not
-   *                    be {@code null} or empty.
-   *
-   * @return  The file containing the generated certificate signing request.
-   *
-   * @throws  KeyStoreException  If a problem occurs while actually attempting
-   *                             to generate the private key in the key store or
-   *                             generate the certificate signing request based
-   *                             on that key.
-   *@throws IllegalArgumentException If the alias already exists in the
-   *                                 keystore.
-   */
-  public File
-  generateCertificateSigningRequest(final String alias, final String subjectDN)
-  throws KeyStoreException, IllegalArgumentException {
-    ensureValid(alias, CERT_ALIAS_MSG);
-    ensureValid(subjectDN, SUBJECT_DN_MSG);
-    if (aliasInUse(alias)) {
-      Message msg = ERR_CERTMGR_ALIAS_ALREADY_EXISTS.get(alias);
-      throw new IllegalArgumentException(msg.toString());
-    }
-    keyStore = null;
-    return Platform.generateCertificateRequest(getKeyStore(), keyStoreType,
-        keyStorePath, alias, password, subjectDN);
-  }
-
 
 
   /**

--
Gitblit v1.10.0