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/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