b=168448 Fixing bustage caused by previous checkin.

Filename nsIGeneratingKeypairInfoDialogs is too long,
moving to a short filename. Updating Makefiles and include statements.

security/manager/pki/src/nsNSSDialogs.h

@@ -32,7 +32,7 @@
 #include "nsICertPickDialogs.h"
 #include "nsITokenDialogs.h"
 #include "nsIDOMCryptoDialogs.h"
-#include "nsIGeneratingKeypairInfoDialogs.h"
+#include "nsIGenKeypairInfoDlg.h"
 
 #include "nsCOMPtr.h"
 #include "nsIStringBundle.h"

security/manager/ssl/macbuild/pipnssIDL.xml

@@ -764,7 +764,7 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsIGeneratingKeypairInfoDialogs.idl</PATH>
+                    <PATH>nsIGenKeypairInfoDlg.idl</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
@@ -999,7 +999,7 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsIGeneratingKeypairInfoDialogs.idl</PATH>
+                    <PATH>nsIGenKeypairInfoDlg.idl</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
@@ -1855,7 +1855,7 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsIGeneratingKeypairInfoDialogs.idl</PATH>
+                    <PATH>nsIGenKeypairInfoDlg.idl</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
@@ -2090,7 +2090,7 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsIGeneratingKeypairInfoDialogs.idl</PATH>
+                    <PATH>nsIGenKeypairInfoDlg.idl</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
@@ -2294,7 +2294,7 @@
         <FILEREF>
             <TARGETNAME>headers</TARGETNAME>
             <PATHTYPE>Name</PATHTYPE>
-            <PATH>nsIGeneratingKeypairInfoDialogs.idl</PATH>
+            <PATH>nsIGenKeypairInfoDlg.idl</PATH>
             <PATHFORMAT>MacOS</PATHFORMAT>
         </FILEREF>
         <FILEREF>

security/manager/ssl/public/Makefile.in

@@ -54,7 +54,7 @@ XPIDLSRCS = \
     nsICertPickDialogs.idl \
     nsIClientAuthDialogs.idl \
     nsIDOMCryptoDialogs.idl \
-    nsIGeneratingKeypairInfoDialogs.idl \
+    nsIGenKeypairInfoDlg.idl \
     nsITokenDialogs.idl \
     nsITokenPasswordDialogs.idl \
     nsISSLStatus.idl \

security/manager/ssl/public/nsIGenKeypairInfoDlg.idl

@@ -0,0 +1,41 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ */
+
+#include "nsISupports.idl"
+
+interface nsIInterfaceRequestor;
+interface nsIKeygenThread;
+
+/**
+ * nsIGeneratingKeypairInfoDialogs
+ *  This is the interface for giving feedback to the user
+ *  while generating a key pair.
+ */
+[scriptable, uuid(11bf5cdc-1dd2-11b2-ba6a-c76afb326fa1)]
+interface nsIGeneratingKeypairInfoDialogs : nsISupports
+{
+  void displayGeneratingKeypairInfo(in nsIInterfaceRequestor ctx,
+                                    in nsIKeygenThread runnable);
+};
+
+%{C++
+#define NS_GENERATINGKEYPAIRINFODIALOGS_CONTRACTID "@mozilla.org/nsGeneratingKeypairInfoDialogs;1"
+%}

security/manager/ssl/src/nsCrypto.cpp

@@ -50,7 +50,7 @@
 #include "nsScriptSecurityManager.h"
 #include "nsIPrincipal.h"
 #include "nsXPIDLString.h"
-#include "nsIGeneratingKeypairInfoDialogs.h"
+#include "nsIGenKeypairInfoDlg.h"
 #include "nsIDOMCryptoDialogs.h"
 #include "jsapi.h"
 #include "jsdbgapi.h"

security/manager/ssl/src/nsKeygenHandler.cpp

@@ -44,7 +44,7 @@ extern "C" {
 #include "nsUnicharUtils.h"
 #include "nsCRT.h"
 #include "nsITokenDialogs.h"
-#include "nsIGeneratingKeypairInfoDialogs.h"
+#include "nsIGenKeypairInfoDlg.h"
 
 //These defines are taken from the PKCS#11 spec
 #define CKM_RSA_PKCS_KEY_PAIR_GEN     0x00000000