This commit was manufactured by cvs2svn to create branch

'PSM_CLIENT_BRENACH'.

git-svn-id: svn://10.0.0.236/branches/PSM_CLIENT_BRENACH@84010 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/mailnews/base/public/nsIMapiRegistry.idl

@@ -1,70 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Srilatha Moturi <srilatha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-interface nsIDOMWindow;
-
-/**
- * This interface provides support for registering Mozilla as the default
- * Mail Client. This interface can also be used to get/set the user preference
- * for the default Mail Client.
- * 
- */
-[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
-interface nsIMapiRegistry: nsISupports {
-
-   /** This is set to TRUE if Mozilla is the default Application
-    */
-   attribute boolean isDefaultMailClient;
-
-   /** This is set TRUE only once per session.
-    */
-   readonly attribute boolean showDialog;
-
-   /** This will bring the dialog asking the user if he/she wants to set
-    * Mozilla as default Mail Client.
-    * Call this only if Mozilla is not the default Mail client
-    */
-   void showMailIntegrationDialog(in nsIDOMWindow parentWindow);
-   
-};
-
-%{C++
-#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
-#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
-%}

mozilla/mailnews/mapi/mapiDll/Mapi32.DEF

@@ -1,54 +0,0 @@
-; ***** BEGIN LICENSE BLOCK *****
-; Version: MPL 1.1/GPL 2.0/LGPL 2.1
-;
-; 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.
-;
-; The Initial Developer of the Original Code is
-; Netscape Communications Corp.
-; Portions created by the Initial Developer are Copyright (C) 2001
-; the Initial Developer. All Rights Reserved.
-;
-; Contributor(s):  Krishna Mohan Khandrika (kkhandrika@netscape.com)
-;
-; Alternatively, the contents of this file may be used under the terms of
-; either the GNU General Public License Version 2 or later (the "GPL"), or
-; the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-; in which case the provisions of the GPL or the LGPL are applicable instead
-; of those above. If you wish to allow use of your version of this file only
-; under the terms of either the GPL or the LGPL, and not to allow others to
-; use your version of this file under the terms of the MPL, indicate your
-; decision by deleting the provisions above and replace them with the notice
-; and other provisions required by the GPL or the LGPL. If you do not delete
-; the provisions above, a recipient may use your version of this file under
-; the terms of any one of the MPL, the GPL or the LGPL.
-;
-; ***** END LICENSE BLOCK ***** 
-
-LIBRARY         mozMapi32.dll
-DESCRIPTION     'Mozilla Simple MAPI Support'
-
-EXPORTS
-        MAPILogon
-        MAPILogoff
-	MAPISendMail
-	MAPISendDocuments
-        MAPIFindNext
-        MAPIReadMail
-        MAPISaveMail
-        MAPIDeleteMail
-        MAPIAddress
-        MAPIDetails
-        MAPIResolveName
-        MAPIFreeBuffer
-        GetMapiDllVersion
-

mozilla/mailnews/mapi/mapiDll/MapiDll.cpp

@@ -1,346 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <windows.h>
-#include <tchar.h>
-#include <mapidefs.h>
-#include <mapi.h>
-#include "msgMapi.h"
-#include "msgMapiMain.h"
-
-#define MAX_RECIPS  100
-#define MAX_FILES   100
-
-const CLSID CLSID_CMapiImp = {0x29f458be, 0x8866, 0x11d5,
-                              {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
-const IID IID_nsIMapi = {0x6EDCD38E,0x8861,0x11d5,
-                        {0xA3,0xDD,0x00,0xB0,0xD0,0xF3,0xBA,0xA7}};
-
-DWORD tId = 0;
-
-BOOL WINAPI DllMain(HINSTANCE aInstance, DWORD aReason, LPVOID aReserved)
-{
-    switch (aReason)
-    {
-        case DLL_PROCESS_ATTACH : tId = TlsAlloc();
-                                  if (tId == 0xFFFFFFFF)
-                                      return FALSE;
-                                  break;
-
-        case DLL_PROCESS_DETACH : TlsFree(tId);
-                                  break;
-    }
-    return TRUE;
-}
-
-BOOL InitMozillaReference(nsIMapi **aRetValue)
-{
-    // Check wehther this thread has a valid Interface
-    // by looking into thread-specific-data variable
-
-    *aRetValue = (nsIMapi *)TlsGetValue(tId);
-
-    // Check whether the pointer actually resolves to
-    // a valid method call; otherwise mozilla is not running
-
-    if ((*aRetValue) && (*aRetValue)->IsValid() == S_OK)
-         return TRUE;
-
-    HRESULT hRes = ::CoInitialize(nsnull) ;
-
-    hRes = ::CoCreateInstance(CLSID_CMapiImp, NULL, CLSCTX_LOCAL_SERVER,
-                                         IID_nsIMapi, (LPVOID *)aRetValue);
-
-    if (hRes == S_OK && (*aRetValue)->Initialize() == S_OK)
-        if (TlsSetValue(tId, (LPVOID)(*aRetValue)))
-            return TRUE;
-
-    // Either CoCreate or TlsSetValue failed; so return FALSE
-
-    if ((*aRetValue))
-        (*aRetValue)->Release();
-
-            ::CoUninitialize();
-    return FALSE;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-// The MAPILogon function begins a Simple MAPI session, loading the default message ////
-// store and address book providers                            ////
-////////////////////////////////////////////////////////////////////////////////////////
-
-ULONG FAR PASCAL MAPILogon(ULONG aUIParam, LPTSTR aProfileName,
-                            LPTSTR aPassword, FLAGS aFlags,
-                            ULONG aReserved, LPLHANDLE aSession)
-{
-    HRESULT hr = 0;
-    ULONG nSessionId = 0;
-    nsIMapi *pNsMapi = NULL;
-
-    if (!InitMozillaReference(&pNsMapi))
-        return MAPI_E_FAILURE;
-
-    if (!(aFlags & MAPI_UNICODE))
-    {
-        // Need to convert the parameters to Unicode.
-
-        char *pUserName = (char *) aProfileName;
-        char *pPassWord = (char *) aPassword;
-
-        TCHAR ProfileName[MAX_NAME_LEN] = {0};
-        TCHAR PassWord[MAX_PW_LEN] = {0};
-
-        if (pUserName != NULL)
-        {
-            if (!MultiByteToWideChar(CP_ACP, 0, pUserName, -1, ProfileName,
-                                                            MAX_NAME_LEN))
-                return MAPI_E_FAILURE;
-        }
-
-        if (pPassWord != NULL)
-        {
-            if (!MultiByteToWideChar(CP_ACP, 0, pPassWord, -1, PassWord,
-                                                            MAX_NAME_LEN))
-                return MAPI_E_FAILURE;
-        }
-
-        hr = pNsMapi->Login(aUIParam, ProfileName, PassWord, aFlags,
-                                                        &nSessionId);
-    }
-    else
-        hr = pNsMapi->Login(aUIParam, aProfileName, aPassword,
-                                                aFlags, &nSessionId);
-    if (hr == S_OK)
-        (*aSession) = (LHANDLE) nSessionId;
-    else
-        return nSessionId;
-
-    return SUCCESS_SUCCESS;
-}
-
-ULONG FAR PASCAL MAPILogoff (LHANDLE aSession, ULONG aUIParam,
-                                            FLAGS aFlags, ULONG aReserved)
-{
-    nsIMapi *pNsMapi = (nsIMapi *)TlsGetValue(tId);
-    if (pNsMapi != NULL)
-    {
-        if (pNsMapi->Logoff((ULONG) aSession) == S_OK)
-            pNsMapi->Release();
-        pNsMapi = NULL;
-    }
-
-    TlsSetValue(tId, NULL);
-
-    ::CoUninitialize();
-
-    return SUCCESS_SUCCESS;
-}
-
-ULONG FAR PASCAL MAPISendMail (LHANDLE lhSession, ULONG ulUIParam, lpnsMapiMessage lpMessage,
-                FLAGS flFlags, ULONG ulReserved )
-{
-    HRESULT hr = 0;
-    BOOL bTempSession = FALSE ;
-    nsIMapi *pNsMapi = NULL;
-
-    if (!InitMozillaReference(&pNsMapi))
-        return MAPI_E_FAILURE;
-
-    if (lpMessage->nRecipCount > MAX_RECIPS)
-        return MAPI_E_TOO_MANY_RECIPIENTS ;
-
-    if (lpMessage->nFileCount > MAX_FILES)
-        return MAPI_E_TOO_MANY_FILES ;
-
-    if ( (!(flFlags & MAPI_DIALOG)) && (lpMessage->lpRecips == NULL) )
-        return MAPI_E_UNKNOWN_RECIPIENT ;
-
-    if (!lhSession || pNsMapi->IsValidSession(lhSession) != S_OK)
-    {
-        FLAGS LoginFlag ;
-        if ( (flFlags & MAPI_LOGON_UI) && (flFlags & MAPI_NEW_SESSION) )
-            LoginFlag = MAPI_LOGON_UI | MAPI_NEW_SESSION ;
-        else if (flFlags & MAPI_LOGON_UI) 
-            LoginFlag = MAPI_LOGON_UI ;
-
-        hr = MAPILogon (ulUIParam, (LPTSTR) NULL, (LPTSTR) NULL, LoginFlag, 0, &lhSession) ;
-        if (hr != SUCCESS_SUCCESS)
-            return MAPI_E_LOGIN_FAILURE ;
-        bTempSession = TRUE ;
-    }
-
-    // we need to deal with null data passed in by MAPI clients, specially when MAPI_DIALOG is set.
-    // The MS COM type lib code generated by MIDL for the MS COM interfaces checks for these parameters
-    // to be non null, although null is a valid value for them here. 
-    nsMapiRecipDesc * lpRecips ;
-    nsMapiFileDesc * lpFiles ;
-
-    nsMapiMessage Message ;
-    memset (&Message, 0, sizeof (nsMapiMessage) ) ;
-    nsMapiRecipDesc Recipient ;
-    memset (&Recipient, 0, sizeof (nsMapiRecipDesc) );
-    nsMapiFileDesc Files ;
-    memset (&Files, 0, sizeof (nsMapiFileDesc) ) ;
-
-    if(!lpMessage)
-    {
-       lpMessage = &Message ;
-    }
-    if(!lpMessage->lpRecips)
-    {
-        lpRecips = &Recipient ;
-    }
-    else
-        lpRecips = lpMessage->lpRecips ;
-    if(!lpMessage->lpFiles)
-    {
-        lpFiles = &Files ;
-    }
-    else
-        lpFiles = lpMessage->lpFiles ;
-
-    HANDLE hEvent = CreateEvent (NULL, FALSE, FALSE, (LPCTSTR) MAPI_SENDCOMPLETE_EVENT) ;
-
-    hr = pNsMapi->SendMail (lhSession, lpMessage, 
-                            (short) lpMessage->nRecipCount, lpRecips,
-                            (short) lpMessage->nFileCount, lpFiles,
-                            flFlags, ulReserved);
-
-    // we are seeing a problem when using Word, although we return success from the MAPI support
-    // MS COM interface in mozilla, we are getting this error here. This is a temporary hack !!
-    if (hr == 0x800703e6)
-        hr = SUCCESS_SUCCESS;
-    
-    if (hr == SUCCESS_SUCCESS)
-        WaitForSingleObject (hEvent, INFINITE) ;
-    CloseHandle (hEvent) ;
-    
-    if (bTempSession)
-        MAPILogoff (lhSession, ulUIParam, 0,0) ;
-
-    return hr ; 
-}
-
-
-ULONG FAR PASCAL MAPISendDocuments(ULONG ulUIParam, LPTSTR lpszDelimChar, LPTSTR lpszFilePaths,
-                                LPTSTR lpszFileNames, ULONG ulReserved)
-{
-    LHANDLE lhSession ;
-    nsIMapi *pNsMapi = NULL;
-
-    if (!InitMozillaReference(&pNsMapi))
-        return MAPI_E_FAILURE;
-
-    unsigned long result = MAPILogon (ulUIParam, (LPTSTR) NULL, (LPTSTR) NULL, MAPI_LOGON_UI, 0, &lhSession) ;
-    if (result != SUCCESS_SUCCESS)
-        return MAPI_E_LOGIN_FAILURE ;
-
-    HRESULT hr;
-
-    HANDLE hEvent = CreateEvent (NULL, FALSE, FALSE, (LPCTSTR) MAPI_SENDCOMPLETE_EVENT) ;
-
-    hr = pNsMapi->SendDocuments(lhSession, (LPTSTR) lpszDelimChar, (LPTSTR) lpszFilePaths, 
-                                    (LPTSTR) lpszFileNames, ulReserved) ;
-
-    if (hr == SUCCESS_SUCCESS)
-        WaitForSingleObject (hEvent, INFINITE) ;
-    CloseHandle (hEvent) ;
-
-    MAPILogoff (lhSession, ulUIParam, 0,0) ;
-
-    return hr ;
-}
-
-ULONG FAR PASCAL MAPIFindNext(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageType,
-                              LPTSTR lpszSeedMessageID, FLAGS flFlags, ULONG ulReserved,
-                              LPTSTR lpszMessageID)
-{
-    return MAPI_E_FAILURE;
-}
-
-ULONG FAR PASCAL MAPIReadMail(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageID,
-                              FLAGS flFlags, ULONG ulReserved, lpMapiMessage FAR *lppMessage)
-{
-    return MAPI_E_FAILURE;
-}
-
-ULONG FAR PASCAL MAPISaveMail(LHANDLE lhSession, ULONG ulUIParam, lpMapiMessage lpMessage,
-                              FLAGS flFlags, ULONG ulReserved, LPTSTR lpszMessageID)
-{
-    return MAPI_E_FAILURE;
-}
-
-ULONG FAR PASCAL MAPIDeleteMail(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageID,
-                                FLAGS flFlags, ULONG ulReserved)
-{
-    return MAPI_E_FAILURE;
-}
-
-ULONG FAR PASCAL MAPIAddress(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszCaption,
-                             ULONG nEditFields, LPTSTR lpszLabels, ULONG nRecips,
-                             lpMapiRecipDesc lpRecips, FLAGS flFlags,
-                             ULONG ulReserved, LPULONG lpnNewRecips,
-                             lpMapiRecipDesc FAR *lppNewRecips)
-{
-    return MAPI_E_FAILURE;
-}
-
-ULONG FAR PASCAL MAPIDetails(LHANDLE lhSession, ULONG ulUIParam, lpMapiRecipDesc lpRecip,
-                             FLAGS flFlags, ULONG ulReserved)
-{
-    return MAPI_E_FAILURE;
-}
-
-ULONG FAR PASCAL MAPIResolveName(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszName,
-                                 FLAGS flFlags, ULONG ulReserved, lpMapiRecipDesc FAR *lppRecip)
-{
-    return MAPI_E_FAILURE;
-}
-
-ULONG FAR PASCAL MAPIFreeBuffer(LPVOID pv)
-{
-    return MAPI_E_FAILURE;
-}
-
-ULONG FAR PASCAL GetMapiDllVersion()
-{
-    return 94;
-}
-
-
-
-

mozilla/mailnews/mapi/mapiDll/makefile.win

@@ -1,62 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corp.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK ***** 
-
-DEPTH=..\..\..
-
-MODULE          = mozMapi32
-EXPORT_LIBRARY  = $(MODULE)
-LIBRARY_NAME    = $(MODULE)
-DEFFILE         = Mapi32.def
-
-REQUIRES	= MapiProxy \
-                  msgMapi \
-		  xpcom \
-		  string \
-		  $(NULL)
-
-include <$(DEPTH)\config\config.mak>
-###############################################################
-
-LCFLAGS=-DUNICODE -D_UNICODE
-
-OBJS= .\$(OBJDIR)\MapiDll.obj \
-	  $(NULL)
-
-WIN_LIBS= ole32.lib \
-          $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-

mozilla/mailnews/mapi/mapihook/build/MapiProxy.def

@@ -1,47 +0,0 @@
-; ***** BEGIN LICENSE BLOCK *****
-; Version: MPL 1.1/GPL 2.0/LGPL 2.1
-;
-; 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.
-;
-; The Initial Developer of the Original Code is
-; Netscape Communications Corp.
-; Portions created by the Initial Developer are Copyright (C) 2001
-; the Initial Developer. All Rights Reserved.
-;
-; Contributor(s):  Krishna Mohan Khandrika (kkhandrika@netscape.com)
-;
-; Alternatively, the contents of this file may be used under the terms of
-; either the GNU General Public License Version 2 or later (the "GPL"), or
-; the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-; in which case the provisions of the GPL or the LGPL are applicable instead
-; of those above. If you wish to allow use of your version of this file only
-; under the terms of either the GPL or the LGPL, and not to allow others to
-; use your version of this file under the terms of the MPL, indicate your
-; decision by deleting the provisions above and replace them with the notice
-; and other provisions required by the GPL or the LGPL. If you do not delete
-; the provisions above, a recipient may use your version of this file under
-; the terms of any one of the MPL, the GPL or the LGPL.
-;
-; ***** END LICENSE BLOCK ***** 
-
-LIBRARY         MapiProxy.dll
-DESCRIPTION     'Proxy/Stub DLL'
-
-EXPORTS
-                DllGetClassObject   @1  PRIVATE
-                DllCanUnloadNow     @2  PRIVATE
-                GetProxyDllInfo     @3  PRIVATE
-                DllRegisterServer   @4  PRIVATE
-                DllUnregisterServer @5  PRIVATE
-
-

mozilla/mailnews/mapi/mapihook/build/makefile.win

@@ -1,68 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corp.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):  Krishna Mohan Khandrika (kkhandrika@netscape.com)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK ***** 
-
-DEPTH=..\..\..\..
-
-MODULE           = MapiProxy
-EXPORT_LIBRARY   = $(MODULE)
-LIBRARY_NAME     = $(MODULE)
-DEFFILE          = MapiProxy.def
-
-include <$(DEPTH)\config\config.mak>
-
-##################################################################
-
-LCFLAGS=-DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE
-
-OBJS= .\$(OBJDIR)\dlldata.obj   \
-    .\$(OBJDIR)\msgMapi_p.obj     \
-    .\$(OBJDIR)\msgMapi_i.obj   \
-    $(NULL)
-
-WIN_LIBS= rpcrt4.lib
-
-EXPORTS= msgMapi.h  \
-     $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c : msgMapi.idl
-    midl $(UNICODE_FLAGS) msgMapi.idl
-
-clobber::
-	rm -f dlldata.c msgMapi_i.c msgMapi_p.c msgMapi.h
-
-

mozilla/mailnews/mapi/mapihook/build/msgMapi.idl

@@ -1,114 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// This idl will be compiled by MIDL.  MS-COM is used 
-// as brdige between MAPI clients and the Mozilla.
-
-import "unknwn.idl";
-
-typedef wchar_t LOGIN_PW_TYPE[256];
-
-typedef struct
-{
-    unsigned long     ulReserved;            
-    unsigned long     flFlags;               /* Flags */
-    unsigned long     nPosition_NotUsed;     /* character in text to be replaced by attachment */
-    LPTSTR            lpszPathName;          /* Full path name including file name */
-    LPTSTR            lpszFileName;          /* Real (original) file name */
-    unsigned char *   lpFileType_NotUsed ;
-} nsMapiFileDesc, * lpnsMapiFileDesc;
-
-
-typedef struct
-{
-    unsigned long      ulReserved;           
-    unsigned long      ulRecipClass;  /* MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG    */
-    LPTSTR             lpszName;      /* Recipient name to display */
-    LPTSTR             lpszAddress;   /* Recipient email address */
-    unsigned long      ulEIDSize_NotUsed;     
-    unsigned char  *   lpEntryID_NotUsed ;
-} nsMapiRecipDesc, * lpnsMapiRecipDesc;
-
-typedef struct
-{
-    unsigned long    ulReserved;					
-    LPTSTR           lpszSubject;  /* Message Subject */
-    LPTSTR           lpszNoteText; /* Message Text */
-    LPTSTR           lpszMessageType_NotUsed;		
-    LPTSTR           lpszDateReceived_notUsed;	 /* in YYYY/MM/DD HH:MM format */
-    LPTSTR           lpszConversationID_NotUsed; /* conversation thread ID */
-    unsigned long    flFlags; /* unread,return receipt */
-    lpnsMapiRecipDesc  lpOriginator;  /* Originator descriptor  */
-    unsigned long      nRecipCount;   /* Number of recipients   */
-    lpnsMapiRecipDesc  lpRecips;      /* Recipient descriptors  */
-    unsigned long      nFileCount;    /* # of file attachments  */
-    lpnsMapiFileDesc   lpFiles;       /* Attachment descriptors */
-} nsMapiMessage, * lpnsMapiMessage;
-
-
-[
-    object,
-    uuid(6EDCD38E-8861-11d5-A3DD-00B0D0F3BAA7),
-    helpstring("nsIMapi Inteface"),
-    pointer_default(unique)
-]
-
-interface nsIMapi : IUnknown
-{
-    HRESULT Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin,
-                  LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
-                  [out] unsigned long *aSessionId);
-
-    HRESULT Initialize();
-    HRESULT IsValid();
-    HRESULT IsValidSession([in] unsigned long aSession);
-
-    HRESULT SendMail([in] unsigned long aSession, [in] lpnsMapiMessage aMessage,
-                  [in] short aRecipCount, [in, size_is(aRecipCount)] lpnsMapiRecipDesc aRecips, 
-                  [in] short aFileCount, [in, size_is(aFileCount)] lpnsMapiFileDesc aFiles, 
-                  [in] unsigned long aFlags, [in] unsigned long aReserved) ;
-
-    HRESULT SendDocuments( [in] unsigned long aSession, 
-                  [in] LPTSTR aDelimChar, [in] LPTSTR aFilePaths,
-                  [in] LPTSTR aFileNames, [in] ULONG aFlags ) ;
-
-    HRESULT Logoff (unsigned long aSession);
-    HRESULT CleanUp();
-};
-
-
-

mozilla/mailnews/mapi/mapihook/makefile.win

@@ -1,41 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corp.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):  Srilatha Moturi (srilatha@netscape.com)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK ***** 
-
-DEPTH=..\..\..
-
-DIRS= build public src
-
-include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapihook/public/makefile.win

@@ -1,49 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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 the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Srilatha Moturi <srilatha@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH=..\..\..\..
-
-MODULE=msgMapi
-XPIDL_MODULE=mapihook
-
-XPIDLSRCS =	\
-           .\nsIMapiRegistry.idl \
-           .\nsIMapiSupport.idl  \
-            $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-

mozilla/mailnews/mapi/mapihook/public/nsIMapiRegistry.idl

@@ -1,70 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Srilatha Moturi <srilatha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-interface nsIDOMWindow;
-
-/**
- * This interface provides support for registering Mozilla as the default
- * Mail Client. This interface can also be used to get/set the user preference
- * for the default Mail Client.
- * 
- */
-[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
-interface nsIMapiRegistry: nsISupports {
-
-   /** This is set to TRUE if Mozilla is the default Application
-    */
-   attribute boolean isDefaultMailClient;
-
-   /** This is set TRUE only once per session.
-    */
-   readonly attribute boolean showDialog;
-
-   /** This will bring the dialog asking the user if he/she wants to set
-    * Mozilla as default Mail Client.
-    * Call this only if Mozilla is not the default Mail client
-    */
-   void showMailIntegrationDialog(in nsIDOMWindow parentWindow);
-   
-};
-
-%{C++
-#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
-#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
-%}

mozilla/mailnews/mapi/mapihook/public/nsIMapiSupport.idl

@@ -1,64 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-/**
- * This interface provides support for registering Mozilla as a COM component
- * for extending the use of Mail/News through Simple MAPI.
- * 
- */
-
-[noscript, uuid(8967fed2-c8bb-11d5-a3e9-00b0d0f3baa7)]
-interface nsIMapiSupport : nsISupports {
-
-   /** Initiates MAPI support
-    */
-
-   void initializeMAPISupport();
-
-   /**  Shuts down the MAPI support
-    */
-
-   void shutdownMAPISupport();
-};
-
-%{C++
-#define NS_IMAPISUPPORT_CONTRACTID    "@mozilla.org/mapisupport;1"
-#define NS_IMAPISUPPORT_CLASSNAME     "Mozilla MAPI Support"
-%}
-
-

mozilla/mailnews/mapi/mapihook/src/Registry.cpp

@@ -1,323 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika <kkhandrika@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#undef _UNICODE
-#undef UNICODE
-
-#include <objbase.h>
-#include "nsString.h"
-#include "Registry.h"
-
-#define MAPI_PROXY_DLL_NAME   "MapiProxy.dll"
-#define MAPI_STARTUP_ARG      " /MAPIStartUp"
-#define MAX_SIZE              2048
-
-// Size of a CLSID as a string
-const int CLSID_STRING_SIZE = 39;
-
-// Proxy/Stub Dll Routines
-
-typedef HRESULT (__stdcall ProxyServer)();
-
-
-// Convert a CLSID to a char string.
-
-BOOL CLSIDtochar(const CLSID& clsid, char* szCLSID,
-                 int length)
-{
-    LPOLESTR wszCLSID = NULL;
-
-    // Get CLSID
-    HRESULT hr = StringFromCLSID(clsid, &wszCLSID);
-    if (FAILED(hr))
-        return FALSE;
-
-    // Covert from wide characters to non-wide.
-    wcstombs(szCLSID, wszCLSID, length);
-
-    // Free memory.
-    CoTaskMemFree(wszCLSID);
-
-    return TRUE;
-}
-
-// Create a key and set its value.
-
-BOOL setKeyAndValue(nsCAutoString keyName, const char* subKey,
-                    const char* theValue)
-{
-    HKEY hKey;
-    BOOL retValue = TRUE;
-
-    nsCAutoString theKey(keyName);
-    if (subKey != NULL)
-    {
-        theKey += "\\";
-        theKey += subKey;
-    }
-
-    // Create and open key and subkey.
-    long lResult = RegCreateKeyEx(HKEY_CLASSES_ROOT, theKey.get(), 
-                                  0, NULL, REG_OPTION_NON_VOLATILE,
-                                  KEY_ALL_ACCESS, NULL, &hKey, NULL);
-    if (lResult != ERROR_SUCCESS)
-        return FALSE ;
-
-    // Set the Value.
-    if (theValue != NULL)
-    {
-       lResult = RegSetValueEx(hKey, NULL, 0, REG_SZ, (BYTE *)theValue, 
-                      strlen(theValue)+1);
-       if (lResult != ERROR_SUCCESS)
-           retValue = FALSE;
-    }
-
-    RegCloseKey(hKey);
-    return TRUE;
-}
-
-// Delete a key and all of its descendents.
-
-LONG recursiveDeleteKey(HKEY hKeyParent,           // Parent of key to delete
-                        const char* lpszKeyChild)  // Key to delete
-{
-    // Open the child.
-    HKEY hKeyChild ;
-    LONG lRes = RegOpenKeyEx(hKeyParent, lpszKeyChild, 0,
-                             KEY_ALL_ACCESS, &hKeyChild) ;
-    if (lRes != ERROR_SUCCESS)
-    {
-        return lRes ;
-    }
-
-    // Enumerate all of the decendents of this child.
-    FILETIME time ;
-    char szBuffer[MAX_SIZE] ;
-    DWORD dwSize = MAX_SIZE ;
-    while (RegEnumKeyEx(hKeyChild, 0, szBuffer, &dwSize, NULL,
-                        NULL, NULL, &time) == S_OK)
-    {
-        // Delete the decendents of this child.
-        lRes = recursiveDeleteKey(hKeyChild, szBuffer) ;
-        if (lRes != ERROR_SUCCESS)
-        {
-            // Cleanup before exiting.
-            RegCloseKey(hKeyChild) ;
-            return lRes;
-        }
-        dwSize = MAX_SIZE;
-    }
-
-    // Close the child.
-    RegCloseKey(hKeyChild) ;
-
-    // Delete this child.
-    return RegDeleteKey(hKeyParent, lpszKeyChild) ;
-}
-
-void RegisterProxy()
-{
-    HINSTANCE h = NULL;
-    ProxyServer *RegisterFunc = NULL;
-
-    char szModule[MAX_SIZE];
-    char *pTemp = NULL;
-
-    HMODULE hModule = GetModuleHandle(NULL);
-    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
-                                          sizeof(szModule)/sizeof(char));
-    if (dwResult == 0)
-        return;
-
-    pTemp = strrchr(szModule, '\\');
-    if (pTemp == NULL)
-        return;
-
-    *pTemp = '\0';
-    nsCAutoString proxyPath(szModule);
-
-    proxyPath += "\\";
-    proxyPath += MAPI_PROXY_DLL_NAME;
-
-    h = LoadLibrary(proxyPath.get());
-    if (h == NULL)
-        return;
-
-    RegisterFunc = (ProxyServer *) GetProcAddress(h, "DllRegisterServer");
-    if (RegisterFunc)
-        RegisterFunc();
-
-    FreeLibrary(h);
-}
-
-void UnRegisterProxy()
-{
-    HINSTANCE h = NULL;
-    ProxyServer *UnRegisterFunc = NULL;
-
-    char szModule[MAX_SIZE];
-    char *pTemp = NULL;
-
-    HMODULE hModule = GetModuleHandle(NULL);
-    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
-                                          sizeof(szModule)/sizeof(char));
-    if (dwResult == 0)
-        return;
-
-    pTemp = strrchr(szModule, '\\');
-    if (pTemp == NULL)
-        return;
-
-    *pTemp = '\0';
-    nsCAutoString proxyPath(szModule);
-
-    proxyPath += "\\";
-    proxyPath += MAPI_PROXY_DLL_NAME;
-
-    h = LoadLibrary(proxyPath.get());
-    if (h == NULL)
-        return;
-
-    UnRegisterFunc = (ProxyServer *) GetProcAddress(h, "DllUnregisterServer");
-    if (UnRegisterFunc)
-        UnRegisterFunc();
-
-    FreeLibrary(h);
-}
-
-// Register the component in the registry.
-
-HRESULT RegisterServer(const CLSID& clsid,         // Class ID
-                       const char* szFriendlyName, // Friendly Name
-                       const char* szVerIndProgID, // Programmatic
-                       const char* szProgID)       //   IDs
-{
-    HMODULE hModule = GetModuleHandle(NULL);
-    char szModuleName[MAX_SIZE];
-    char szCLSID[CLSID_STRING_SIZE];
-
-    nsCAutoString independentProgId(szVerIndProgID);
-    nsCAutoString progId(szProgID);
-
-    DWORD dwResult = ::GetModuleFileName(hModule, szModuleName,
-                              sizeof(szModuleName)/sizeof(char));
-
-    if (dwResult == 0)
-        return S_FALSE;
-
-    nsCAutoString moduleName(szModuleName);
-    nsCAutoString registryKey("CLSID\\");
-
-    moduleName += MAPI_STARTUP_ARG;
-
-    // Convert the CLSID into a char.
-
-    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
-        return S_FALSE;
-    registryKey += szCLSID;
-
-    // Add the CLSID to the registry.
-    if (!setKeyAndValue(registryKey, NULL, szFriendlyName))
-        return S_FALSE;
-
-    if (!setKeyAndValue(registryKey, "LocalServer32", moduleName.get()))
-        return S_FALSE;
-
-    // Add the ProgID subkey under the CLSID key.
-    if (!setKeyAndValue(registryKey, "ProgID", szProgID))
-        return S_FALSE;
-
-    // Add the version-independent ProgID subkey under CLSID key.
-    if (!setKeyAndValue(registryKey, "VersionIndependentProgID", szVerIndProgID))
-        return S_FALSE;
-
-    // Add the version-independent ProgID subkey under HKEY_CLASSES_ROOT.
-    if (!setKeyAndValue(independentProgId, NULL, szFriendlyName))
-        return S_FALSE; 
-    if (!setKeyAndValue(independentProgId, "CLSID", szCLSID))
-        return S_FALSE;
-    if (!setKeyAndValue(independentProgId, "CurVer", szProgID))
-        return S_FALSE;
-
-    // Add the versioned ProgID subkey under HKEY_CLASSES_ROOT.
-    if (!setKeyAndValue(progId, NULL, szFriendlyName))
-        return S_FALSE; 
-    if (!setKeyAndValue(progId, "CLSID", szCLSID))
-        return S_FALSE;
-
-    RegisterProxy();
-
-    return S_OK;
-}
-
-LONG UnregisterServer(const CLSID& clsid,         // Class ID
-                      const char* szVerIndProgID, // Programmatic
-                      const char* szProgID)       //   IDs
-{
-    LONG lResult = S_OK;
-
-    // Convert the CLSID into a char.
-
-    char szCLSID[CLSID_STRING_SIZE];
-    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
-        return S_FALSE;
-
-    UnRegisterProxy();
-
-    nsCAutoString registryKey("CLSID\\");
-    registryKey += szCLSID;
-
-    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
-    if (lResult == ERROR_SUCCESS || lResult == ERROR_FILE_NOT_FOUND)
-        return lResult;
-
-    registryKey += "\\LocalServer32";
-
-    // Delete only the path for this server.
-
-    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
-    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
-        return lResult;
-
-    // Delete the version-independent ProgID Key.
-    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szVerIndProgID);
-    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
-        return lResult;
-
-    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szProgID);
-
-    return lResult;
-}

mozilla/mailnews/mapi/mapihook/src/Registry.h

@@ -1,56 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Krishna Mohan Khandrika <kkhandrika@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _REGISTRY_H_
-#define _REGISTRY_H_
-
-#include <objbase.h>
-
-// This function will register a component in the Registry.
-
-HRESULT RegisterServer(const CLSID& clsid, 
-                       const char* szFriendlyName,
-                       const char* szVerIndProgID,
-                       const char* szProgID) ;
-
-// This function will unregister a component.
-
-HRESULT UnregisterServer(const CLSID& clsid,
-                         const char* szVerIndProgID,
-                         const char* szProgID) ;
-
-#endif

mozilla/mailnews/mapi/mapihook/src/makefile.win

@@ -1,107 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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 the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Srilatha Moturi <srilatha@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH=..\..\..\..
-
-MODULE          = msgMapi
-MAKE_OBJ_TYPE = DLL
-LIBRARY_NAME=$(MODULE)
-MODULE_NAME	= $(MODULE)
-
-REQUIRES        = xpcom \
-                  string \
-		  MapiProxy \
-		  appshell \
-		  windowwatcher \
-		  dom \
-		  profile \
-		  msgbase \
-		  pref \
-		  msgbaseutil \
-		  msgcompo \
-		  mailnews \
-		  necko \
-		  intl \
-		  editor \
-		  msgdb \
-		  uriloader \
- 	          appstartup \
-	$(NULL)
-
-include <$(DEPTH)\config\config.mak>
-############################################################################
-
-LCFLAGS=-DUNICODE -D_UNICODE
-
-
-
-OBJS=   \
-    ..\build\$(OBJDIR)\msgMapi_i.obj    \
-    .\$(OBJDIR)\msgMapiFactory.obj  \
-    .\$(OBJDIR)\msgMapiHook.obj \
-    .\$(OBJDIR)\msgMapiImp.obj  \
-    .\$(OBJDIR)\msgMapiMain.obj \
-    .\$(OBJDIR)\msgMapiSupport.obj  \
-	.\$(OBJDIR)\nsMapiRegistry.obj	\
-	.\$(OBJDIR)\nsMapiRegistryUtils.obj \
-    .\$(OBJDIR)\Registry.obj  \
-	$(NULL)
-
-
-
-LLIBS=                               \
- $(DIST)\lib\xpcom.lib               \
- $(DIST)\lib\msgbsutl.lib            \
- $(LIBNSPR)                          \
- $(NULL)
-
-WIN_LIBS=       \
-	ole32.lib   \
-    $(NULL)
-
-EXPORTS=	\
-    msgMapiFactory.h    \
-    msgMapiHook.h       \
-    msgMapiImp.h        \
-    msgMapiMain.h       \
-    msgMapiSupport.h    \
-	nsMapiRegistry.h		\
-	nsMapiRegistryUtils.h   \
-    Registry.h \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapihook/src/msgMapiFactory.cpp

@@ -1,118 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#undef UNICODE
-#undef _UNICODE
-
-#include "msgMapiFactory.h"
-#include "msgMapiImp.h"
-#include "msgMapi.h"
-
-CMapiFactory ::CMapiFactory()
-: m_cRef(1)
-{
-}
-
-CMapiFactory::~CMapiFactory()
-{
-}
-
-STDMETHODIMP CMapiFactory::QueryInterface(const IID& aIid, void** aPpv)
-{    
-    if ((aIid == IID_IUnknown) || (aIid == IID_IClassFactory))
-    {
-        *aPpv = static_cast<IClassFactory*>(this); 
-    }
-    else
-    {
-        *aPpv = nsnull;
-        return E_NOINTERFACE;
-    }
-    reinterpret_cast<IUnknown*>(*aPpv)->AddRef();
-    return S_OK;
-}
-
-STDMETHODIMP_(ULONG) CMapiFactory::AddRef()
-{
-    return (PR_AtomicIncrement(&m_cRef));
-}
-
-STDMETHODIMP_(ULONG) CMapiFactory::Release() 
-{
-    PRInt32 temp;
-    temp = PR_AtomicDecrement(&m_cRef);
-    if (m_cRef == 0)
-    {
-        delete this;
-        return 0;
-    }
-
-    return temp;
-}
-
-STDMETHODIMP CMapiFactory::CreateInstance(IUnknown* aUnknownOuter,
-                                           const IID& aIid,
-                                           void** aPpv) 
-{
-    // Cannot aggregate.
-
-    if (aUnknownOuter != nsnull)
-    {
-        return CLASS_E_NOAGGREGATION ;
-    }
-
-    // Create component.
-
-    CMapiImp* pImp = new CMapiImp();
-    if (pImp == nsnull)
-    {
-        return E_OUTOFMEMORY ;
-    }
-
-    // Get the requested interface.
-    HRESULT hr = pImp->QueryInterface(aIid, aPpv);
-
-    // Release the IUnknown pointer.
-    // (If QueryInterface failed, component will delete itself.)
-
-    pImp->Release();
-    return hr;
-}
-
-STDMETHODIMP CMapiFactory::LockServer(PRBool aLock) 
-{
-    return S_OK ;
-}

mozilla/mailnews/mapi/mapihook/src/msgMapiFactory.h

@@ -1,69 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MSG_MAPI_FACTORY_H
-#define MSG_MAPI_FACTORY_H
-
-#include <windows.h>
-#include <objbase.h>
-#include "nspr.h"
-
-
-class CMapiFactory : public IClassFactory
-{
-public :
-
-    // IUnknown
-
-    STDMETHODIMP            QueryInterface (REFIID aIid, void** aPpv);
-    STDMETHODIMP_(ULONG)    AddRef(void);
-    STDMETHODIMP_(ULONG)    Release(void);
-
-    // IClassFactory
-
-    STDMETHODIMP        CreateInstance (LPUNKNOWN aUnkOuter, REFIID aIid, void **aPpv);
-    STDMETHODIMP        LockServer (BOOL aLock);
-
-    CMapiFactory ();
-    ~CMapiFactory ();
-
-private :
-
-    PRInt32 m_cRef;
-};
-
-#endif  // MSG_MAPI_FACTORY_H
-

mozilla/mailnews/mapi/mapihook/src/msgMapiHook.cpp

@@ -1,777 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- * Contributor(s): Srilatha Moturi (srilatha@netscape.com)
- * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#define MAPI_STARTUP_ARG       "/MAPIStartUp"
-
-#define MAPI_STARTUP_ARG       "/MAPIStartUp"
-
-#include <mapidefs.h>
-#include <mapi.h>
-#include <tchar.h>
-
-#include "nsCOMPtr.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsISupports.h"
-#include "nsIPromptService.h"
-#include "nsAppShellCIDs.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsIAppShellService.h"
-#include "nsINativeAppSupport.h"
-#include "nsICmdLineService.h"
-#include "nsIProfileInternal.h"
-#include "nsIMsgAccountManager.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsXPIDLString.h"
-#include "nsReadableUtils.h"
-#include "nsMsgBaseCID.h"
-#include "nsIStringBundle.h"
-#include "nsIPref.h"
-#include "nsString.h"
-
-#include "nsIMsgAttachment.h"
-#include "nsIMsgCompFields.h"
-#include "nsIMsgComposeParams.h"
-#include "nsIMsgCompose.h"
-#include "nsMsgCompCID.h"
-#include "nsIMsgSend.h"
-#include "nsIProxyObjectManager.h"
-#include "nsIMsgComposeService.h"
-#include "nsProxiedService.h"
-#include "nsSpecialSystemDirectory.h"
-#include "nsMsgI18N.h"
-
-#include "msgMapi.h"
-#include "msgMapiHook.h"
-#include "msgMapiSupport.h"
-#include "msgMapiMain.h"
-#include "nsNetUtil.h"
-
-static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
-
-class nsMAPISendListener : public nsIMsgSendListener
-{
-public:
-
-    virtual ~nsMAPISendListener() { }
-
-    // nsISupports interface
-    NS_DECL_ISUPPORTS
-
-    /* void OnStartSending (in string aMsgID, in PRUint32 aMsgSize); */
-    NS_IMETHOD OnStartSending(const char *aMsgID, PRUint32 aMsgSize) { return NS_OK; }
-
-    /* void OnProgress (in string aMsgID, in PRUint32 aProgress, in PRUint32 aProgressMax); */
-    NS_IMETHOD OnProgress(const char *aMsgID, PRUint32 aProgress, PRUint32 aProgressMax) { return NS_OK;}
-
-    /* void OnStatus (in string aMsgID, in wstring aMsg); */
-    NS_IMETHOD OnStatus(const char *aMsgID, const PRUnichar *aMsg) { return NS_OK;}
-
-    /* void OnStopSending (in string aMsgID, in nsresult aStatus, in wstring aMsg, in nsIFileSpec returnFileSpec); */
-    NS_IMETHOD OnStopSending(const char *aMsgID, nsresult aStatus, const PRUnichar *aMsg, 
-                           nsIFileSpec *returnFileSpec) {
-        m_done = PR_TRUE;
-        HANDLE hEvent = CreateEvent (NULL, FALSE, FALSE, (LPCTSTR) MAPI_SENDCOMPLETE_EVENT) ;
-        SetEvent (hEvent) ;
-        CloseHandle (hEvent) ;
-        return NS_OK ;
-    }
-
- /* void OnSendNotPerformed */
- NS_IMETHOD OnSendNotPerformed(const char *aMsgID, nsresult aStatus)
- {
- return OnStopSending(aMsgID, aStatus, nsnull, nsnull) ;
- }
- 
-    /* void OnGetDraftFolderURI (); */
-    NS_IMETHOD OnGetDraftFolderURI(const char *aFolderURI) {return NS_OK;}
-
-    static nsresult CreateMAPISendListener( nsIMsgSendListener **ppListener);
-
-    PRBool IsDone() { return m_done ; }
-
-protected :
-    nsMAPISendListener() {
-        NS_INIT_REFCNT(); 
-        m_done = PR_FALSE;
-    }
-
-    PRBool          m_done;
-};
-
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsMAPISendListener, nsIMsgSendListener)
-
-nsresult nsMAPISendListener::CreateMAPISendListener( nsIMsgSendListener **ppListener)
-{
-    NS_ENSURE_ARG_POINTER(ppListener) ;
-
-    *ppListener = new nsMAPISendListener();
-    if (! *ppListener)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(*ppListener);
-    return NS_OK;
-}
-
-PRBool nsMapiHook::isMapiService = PR_FALSE;
-
-PRBool nsMapiHook::Initialize()
-{
-    nsresult rv;
-    nsCOMPtr<nsINativeAppSupport> native;
-
-    nsCOMPtr<nsICmdLineService> cmdLineArgs(do_GetService(kCmdLineServiceCID, &rv));
-    if (NS_FAILED(rv)) return PR_FALSE;
-
-    nsCOMPtr<nsIAppShellService> appShell (do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
-    if (NS_FAILED(rv)) return PR_FALSE;
-
-    rv = appShell->GetNativeAppSupport( getter_AddRefs( native ));
-    if (NS_FAILED(rv)) return PR_FALSE;
-
-    rv = native->EnsureProfile(cmdLineArgs);
-    if (NS_FAILED(rv)) return PR_FALSE;
-
-    return PR_TRUE;
-}
-
-void nsMapiHook::CleanUp()
-{
-    // This routine will be fully implemented in future
-    // to cleanup mapi related stuff inside mozilla code.
-}
-
-PRBool nsMapiHook::DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, \
-                      PRUnichar **aPassword)
-{
-    nsresult rv;
-    PRBool btnResult = PR_FALSE;
-
-    nsCOMPtr<nsIAppShellService> appShell(do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
-    if (NS_FAILED(rv) || !appShell) return PR_FALSE;
-   
-    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
-    if (NS_SUCCEEDED(rv) && dlgService)
-    {
-        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
-        if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
-
-        nsCOMPtr<nsIStringBundle> bundle;
-        rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
-        if (NS_FAILED(rv) || !bundle) return PR_FALSE;
-
-        nsCOMPtr<nsIStringBundle> brandBundle;
-        rv = bundleService->CreateBundle(
-                        "chrome://global/locale/brand.properties",
-                        getter_AddRefs(brandBundle));
-        if (NS_FAILED(rv)) return PR_FALSE;
-
-        nsXPIDLString brandName;
-        rv = brandBundle->GetStringFromName(
-                           NS_LITERAL_STRING("brandShortName").get(),
-                           getter_Copies(brandName));
-        if (NS_FAILED(rv)) return PR_FALSE;
-        
-        nsXPIDLString loginTitle;
-        const PRUnichar *brandStrings[] = { brandName.get() };
-        NS_NAMED_LITERAL_STRING(loginTitlePropertyTag, "loginTitle");
-        const PRUnichar *dTitlePropertyTag = loginTitlePropertyTag.get();
-        rv = bundle->FormatStringFromName(dTitlePropertyTag, brandStrings, 1,
-                                          getter_Copies(loginTitle));
-        if (NS_FAILED(rv)) return PR_FALSE;
-        
-        if (aLogin)
-        {
-            nsXPIDLString loginText;
-            rv = bundle->GetStringFromName(NS_LITERAL_STRING("loginTextwithName").get(),
-                                           getter_Copies(loginText));
-            if (NS_FAILED(rv) || !loginText) return PR_FALSE;
-
-
-
-            rv = dlgService->PromptUsernameAndPassword(nsnull, loginTitle,
-                                                       loginText, aUsername, aPassword,
-                                                       nsnull, PR_FALSE, &btnResult);
-        }
-        else
-        {
-            //nsString loginString; 
-            nsXPIDLString loginText;
-            const PRUnichar *userNameStrings[] = { *aUsername };
-
-            NS_NAMED_LITERAL_STRING(loginTextPropertyTag, "loginText");
-            const PRUnichar *dpropertyTag = loginTextPropertyTag.get();
-            rv = bundle->FormatStringFromName(dpropertyTag, userNameStrings, 1,
-                                              getter_Copies(loginText));
-            if (NS_FAILED(rv)) return PR_FALSE;
-
-            rv = dlgService->PromptPassword(nsnull, loginTitle, loginText,
-                                            aPassword, nsnull, PR_FALSE, &btnResult);
-        }
-    }            
-
-    return btnResult;
-}
-
-PRBool nsMapiHook::VerifyUserName(const PRUnichar *aUsername, char **aIdKey)
-{
-    nsresult rv;
-
-    if (aUsername == nsnull)
-        return PR_FALSE;
-
-    nsCOMPtr<nsIMsgAccountManager> accountManager(do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv));
-    if (NS_FAILED(rv)) return PR_FALSE;
-    nsCOMPtr<nsISupportsArray> identities;
-    rv = accountManager->GetAllIdentities(getter_AddRefs(identities));
-    if (NS_FAILED(rv)) return PR_FALSE;
-    PRUint32 numIndentities;
-    identities->Count(&numIndentities);
-
-    for (PRUint32 i = 0; i < numIndentities; i++)
-    {
-        // convert supports->Identity
-        nsCOMPtr<nsISupports> thisSupports;
-        rv = identities->GetElementAt(i, getter_AddRefs(thisSupports));
-        if (NS_FAILED(rv)) continue;
-        nsCOMPtr<nsIMsgIdentity> thisIdentity(do_QueryInterface(thisSupports, &rv));
-        if (NS_SUCCEEDED(rv) && thisIdentity)
-        {
-            nsXPIDLCString email;
-            rv = thisIdentity->GetEmail(getter_Copies(email));
-            if (NS_FAILED(rv)) continue;
-
-            // get the username from the email and compare with the username
-            nsCAutoString aEmail(email.get());
-            PRInt32 index = aEmail.FindChar('@');
-            if (index != -1)
-                aEmail.Truncate(index);
-
-if (nsDependentString(aUsername) == NS_ConvertASCIItoUCS2(aEmail))  // == overloaded
-                return NS_SUCCEEDED(thisIdentity->GetKey(aIdKey));
-        }
-    }
-
-    return PR_FALSE;
-}
-
-PRBool 
-nsMapiHook::IsBlindSendAllowed()
-{
-    PRBool enabled = PR_FALSE;
-    PRBool warn = PR_TRUE;
-    nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
-    if (prefs) {
-	    prefs->GetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,&warn);
-            prefs->GetBoolPref(PREF_MAPI_BLIND_SEND_ENABLED,&enabled);
-    } 
-    if (!enabled)
-        return PR_FALSE;
-
-    if (!warn)
-        return PR_TRUE; // Everything is okay.  
-
-    nsresult rv;
-    nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
-    if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
-
-    nsCOMPtr<nsIStringBundle> bundle;
-    rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
-    if (NS_FAILED(rv) || !bundle) return PR_FALSE;
-
-    nsXPIDLString warningMsg;
-    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendWarning").get(),
-                                        getter_Copies(warningMsg));
-    if (NS_FAILED(rv)) return PR_FALSE;
-    
-   nsXPIDLString dontShowAgainMessage;
-    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendDontShowAgain").get(),
-                                        getter_Copies(dontShowAgainMessage));
-    if (NS_FAILED(rv)) return PR_FALSE;
-
-    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
-    if (NS_FAILED(rv) || !dlgService) return PR_FALSE;
-    
-    PRBool continueToWarn = PR_TRUE;
-    PRBool okayToContinue = PR_FALSE;
-    dlgService->ConfirmCheck(nsnull, nsnull, warningMsg, dontShowAgainMessage, &continueToWarn, &okayToContinue);
-        
-    if (!continueToWarn && okayToContinue && prefs)
-        prefs->SetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,PR_FALSE);
-    
-    return okayToContinue;
-        
-}
-
-// this is used for Send without UI
-nsresult nsMapiHook::BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) 
-{
-    nsresult rv = NS_OK ;
-
-    if (!IsBlindSendAllowed())
-        return NS_ERROR_FAILURE;
-
-    /** create nsIMsgComposeParams obj and other fields to populate it **/    
-
-    // get parent window
-    nsCOMPtr<nsIAppShellService> appService = do_GetService( "@mozilla.org/appshell/appShellService;1", &rv);
-    if (NS_FAILED(rv)|| (!appService) ) return rv ;
-
-    nsCOMPtr<nsIDOMWindowInternal>  hiddenWindow;
-    rv = appService->GetHiddenDOMWindow(getter_AddRefs(hiddenWindow));
-
-    if ( NS_FAILED(rv) ) return rv ;
-
-    // smtp password and Logged in used IdKey from MapiConfig (session obj)
-    nsMAPIConfiguration * pMapiConfig = nsMAPIConfiguration::GetMAPIConfiguration() ;
-    if (!pMapiConfig) return NS_ERROR_FAILURE ;  // get the singelton obj
-    PRUnichar * password = pMapiConfig->GetPassword(aSession) ;
-    // password
-    nsCAutoString smtpPassword ;
-    smtpPassword.AssignWithConversion (password) ;
-    // Id key
-    char * MsgIdKey = pMapiConfig->GetIdKey(aSession) ;
-
-    // get the MsgIdentity for the above key using AccountManager
-    nsCOMPtr <nsIMsgAccountManager> accountManager = do_GetService (NS_MSGACCOUNTMANAGER_CONTRACTID) ;
-    if (NS_FAILED(rv) || (!accountManager) ) return rv ;
-
-    nsCOMPtr <nsIMsgIdentity> pMsgId ;
-    rv = accountManager->GetIdentity (MsgIdKey, getter_AddRefs(pMsgId)) ;
-    if (NS_FAILED(rv) ) return rv ;
-
-    // create a send listener to get back the send status
-    nsCOMPtr <nsIMsgSendListener> sendListener ;
-    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
-    if (NS_FAILED(rv) || (!sendListener) ) return rv;
-
-    // create the compose params object 
-    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
-    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
-
-    // populate the compose params
-    pMsgComposeParams->SetType(nsIMsgCompType::New);
-    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
-    pMsgComposeParams->SetIdentity(pMsgId);
-    pMsgComposeParams->SetComposeFields(aCompFields); 
-    pMsgComposeParams->SetSendListener(sendListener) ;
-    pMsgComposeParams->SetSmtpPassword(smtpPassword.get());
-
-    // create the nsIMsgCompose object to send the object
-    nsCOMPtr<nsIMsgCompose> pMsgCompose (do_CreateInstance(NS_MSGCOMPOSE_CONTRACTID, &rv));
-    if (NS_FAILED(rv) || (!pMsgCompose) ) return rv ;
-
-    /** initialize nsIMsgCompose, Send the message, wait for send completion response **/
-
-    rv = pMsgCompose->Initialize(hiddenWindow, pMsgComposeParams) ;
-    if (NS_FAILED(rv)) return rv ;
-
-    pMsgCompose->SendMsg(nsIMsgSend::nsMsgDeliverNow, pMsgId, nsnull) ;
-    if (NS_FAILED(rv)) return rv ;
-
-    // assign to interface pointer from nsCOMPtr to facilitate typecast below
-    nsIMsgSendListener * pSendListener = sendListener ;  
-
-    // we need to wait here to make sure that we return only after send is completed
-    // so we will have a event loop here which will process the events till the Send IsDone.
-    nsCOMPtr<nsIEventQueueService> pEventQService = do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv);
-    nsCOMPtr<nsIEventQueue> eventQueue;
-    pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD,getter_AddRefs(eventQueue));
-    while ( !((nsMAPISendListener *) pSendListener)->IsDone() )
-        eventQueue->ProcessPendingEvents();
-
-    return rv ;
-}
-
-// this is used to populate comp fields with Unicode data
-nsresult nsMapiHook::PopulateCompFields(lpnsMapiMessage aMessage, 
-                                    nsIMsgCompFields * aCompFields)
-{
-    nsresult rv = NS_OK ;
-
-    if (aMessage->lpOriginator)
-    {
-        PRUnichar * From = aMessage->lpOriginator->lpszAddress ;
-        aCompFields->SetFrom (From) ;
-    }
-
-    nsAutoString To ;
-    nsAutoString Cc ; 
-    nsAutoString Bcc ;
-
-    nsAutoString Comma ;
-    Comma.AssignWithConversion(",");
-
-    if (aMessage->lpRecips)
-    {
-        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
-        {
-            if (aMessage->lpRecips[i].lpszAddress)
-            {
-                switch (aMessage->lpRecips[i].ulRecipClass)
-                {
-                case MAPI_TO :
-                    if (To.Length() > 0)
-                        To += Comma ;
-                    To += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ;
-                    break ;
-
-                case MAPI_CC :
-                    if (Cc.Length() > 0)
-                        Cc += Comma ;
-                    Cc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
-                    break ;
-
-                case MAPI_BCC :
-                    if (Bcc.Length() > 0)
-                        Bcc += Comma ;
-                    Bcc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
-                    break ;
-                }
-            }
-        }
-    }
-
-    // set To, Cc, Bcc
-    aCompFields->SetTo (To.get()) ;
-    aCompFields->SetCc (Cc.get()) ;
-    aCompFields->SetBcc (Bcc.get()) ;
-
-    // set subject
-    if (aMessage->lpszSubject)
-    {
-        PRUnichar * Subject = aMessage->lpszSubject ;
-        aCompFields->SetSubject(Subject) ;
-    }
-
-    // handle attachments as File URL
-    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_TRUE) ;
-    if (NS_FAILED(rv)) return rv ;    
-
-    // set body
-    if (aMessage->lpszNoteText)
-    {
-        PRUnichar * Body = aMessage->lpszNoteText ;
-        rv = aCompFields->SetBody(Body) ;
-    }
-
-#ifdef RAJIV_DEBUG
-    // testing what all was set in CompFields
-    printf ("To : %S \n", To.get()) ;
-    printf ("CC : %S \n", Cc.get() ) ;
-    printf ("BCC : %S \n", Bcc.get() ) ;
-#endif
-
-    return rv ;
-
-}
-
-nsresult nsMapiHook::HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
-                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode)
-{
-    nsresult rv = NS_OK ;
-
-    nsCAutoString Attachments ;
-    nsCAutoString TempFiles ;
-
-    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
-    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
-
-    for (int i=0 ; i < aFileCount ; i++)
-    {
-        if (aFiles[i].lpszPathName)
-        {
-            // check if attachment exists
-            if (aIsUnicode)
-                pFile->InitWithUnicodePath (aFiles[i].lpszPathName) ; 
-            else
-                pFile->InitWithPath ((char *) aFiles[i].lpszPathName) ; 
-            PRBool bExist ;
-            rv = pFile->Exists(&bExist) ;
-            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
-
-            // create Msg attachment object
-            nsCOMPtr<nsIMsgAttachment> attachment = do_CreateInstance(NS_MSGATTACHMENT_CONTRACTID, &rv);
-            if (NS_FAILED(rv) || (!attachment) ) return rv ;
-
-            // set url 
-            nsXPIDLCString pURL ;
-            NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
-            attachment->SetUrl(pURL) ;
-
-            if (aFiles[i].lpszFileName)
-            {
-                if (! aIsUnicode)
-                {
-                    nsAutoString realFileName ;
-                    realFileName.AssignWithConversion ((char *) aFiles[i].lpszFileName) ;
-                    attachment->SetName(realFileName.get()) ;
-                    // attachment->SetName( (nsDependentString(aFiles[i].lpszFileName)).get() );
-            }
-                else
-                    attachment->SetName(aFiles[i].lpszFileName) ;
-        }
-
-            attachment->SetTemporary(PR_FALSE) ;
-
-            rv = aCompFields->AddAttachment (attachment);
-        }
-    }
-    return rv ;
-}
-
-
-// this is used to convert non Unicode data and then populate comp fields
-nsresult nsMapiHook::PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
-                                    nsIMsgCompFields * aCompFields)
-{
-    nsresult rv = NS_OK ;
-
-    if (aMessage->lpOriginator)
-    {
-        nsAutoString From ;
-        From.AssignWithConversion((char *) aMessage->lpOriginator->lpszAddress);
-        aCompFields->SetFrom (From.get()) ;
-    }
-
-    nsAutoString To ;
-    nsAutoString Cc ; 
-    nsAutoString Bcc ;
-
-    nsAutoString Comma ;
-    Comma.AssignWithConversion(",");
-
-    if (aMessage->lpRecips)
-    {
-        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
-        {
-            if (aMessage->lpRecips[i].lpszAddress)
-            {
-                switch (aMessage->lpRecips[i].ulRecipClass)
-                {
-                case MAPI_TO :
-                    if (To.Length() > 0)
-                        To += Comma ;
-                    To.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress);
-                    break ;
-
-                case MAPI_CC :
-                    if (Cc.Length() > 0)
-                        Cc += Comma ;
-                    Cc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress); 
-                    break ;
-
-                case MAPI_BCC :
-                    if (Bcc.Length() > 0)
-                        Bcc += Comma ;
-                    Bcc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress) ; 
-                    break ;
-                }
-            }
-        }
-    }
-    
-    // set To, Cc, Bcc
-    aCompFields->SetTo (To.get()) ;
-    aCompFields->SetCc (Cc.get()) ;
-    aCompFields->SetBcc (Bcc.get()) ;
-
-    nsCAutoString platformCharSet;
-    // set subject
-    if (aMessage->lpszSubject)
-    {
-        nsAutoString Subject ;
-        if (platformCharSet.IsEmpty())
-            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
-        rv = ConvertToUnicode(platformCharSet.get(), (char *) aMessage->lpszSubject, Subject);
-        if (NS_FAILED(rv)) return rv ;         
-        aCompFields->SetSubject(Subject.get()) ;
-    }
-
-    // handle attachments as File URL
-    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_FALSE) ;
-    if (NS_FAILED(rv)) return rv ;    
-
-    // set body
-    if (aMessage->lpszNoteText)
-    {
-        nsAutoString Body ;
-        if (platformCharSet.IsEmpty())
-            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
-        rv = ConvertToUnicode(platformCharSet.get(), (char *) aMessage->lpszNoteText, Body);
-        if (NS_FAILED(rv)) return rv ;
-        rv = aCompFields->SetBody(Body.get()) ;
-    }
-
-#ifdef RAJIV_DEBUG
-    // testing what all was set in CompFields
-    printf ("To : %S \n", To.get()) ;
-    printf ("CC : %S \n", Cc.get() ) ;
-    printf ("BCC : %S \n", Bcc.get() ) ;
-#endif
-
-    return rv ;
-}
-
-// this is used to populate the docs as attachments in the Comp fields for Send Documents
-nsresult nsMapiHook::PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, ULONG aFlags, 
-                            PRUnichar * aDelimChar, PRUnichar * aFilePaths)
-{
-    nsAutoString strDelimChars ;
-    nsString strFilePaths;
-    nsresult rv = NS_OK ;
-
-    if (aFlags & MAPI_UNICODE)
-    {
-        if (aDelimChar)
-            strDelimChars.Assign (aDelimChar) ;
-        if (aFilePaths)
-            strFilePaths.Assign (aFilePaths) ;
-    }
-	else
-    {
-        if (aDelimChar)
-            strDelimChars.AssignWithConversion ((char*) aDelimChar) ;
-        if (aFilePaths)
-            strFilePaths.AssignWithConversion ((char *) aFilePaths) ;
-    }
-
-    // check for comma in filename 
-    if (strDelimChars.Find (",") == kNotFound)  // if comma is not in the delimiter specified by user
-    {
-        if (strFilePaths.Find(",") != kNotFound) // if comma found in filenames return error
-            return NS_ERROR_FILE_INVALID_PATH ;
-    }
-
-    nsCString Attachments ;
-
-    // only 1 file is to be sent, no delim specified
-    if ((!strDelimChars.Length()) && (strFilePaths.Length()>0))
-    {
-        nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
-        if (NS_FAILED(rv) || (!pFile) ) return rv ;        
-        pFile->InitWithUnicodePath (strFilePaths.get()) ;
-
-        PRBool bExist ;
-        rv = pFile->Exists(&bExist) ;
-        if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
-
-        nsXPIDLCString pURL ;
-        NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
-        if (pURL)
-            Attachments.Assign(pURL) ;
-
-        // set attachments for comp field and return
-        rv = aCompFields->SetAttachments (Attachments.get());
-        return rv ;
-    }
-
-    // multiple files to be sent, delim specified
-    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
-    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
-    PRInt32 offset = 0 ;
-    PRInt32 FilePathsLen = strFilePaths.Length() ;
-    if (FilePathsLen)
-    {
-        PRUnichar * newFilePaths = (PRUnichar *) strFilePaths.get() ;
-        while (offset != kNotFound)
-        {
-            nsString RemainingPaths ;
-            RemainingPaths.Assign(newFilePaths) ;
-            offset = RemainingPaths.Find (strDelimChars) ;
-            if (offset != kNotFound)
-            {
-                RemainingPaths.SetLength (offset) ;
-                if ((offset + strDelimChars.Length()) < FilePathsLen)
-                    newFilePaths += offset + strDelimChars.Length() ;
-            }
-
-            pFile->InitWithUnicodePath (RemainingPaths.get()) ;
-
-    #ifdef RAJIV_DEBUG
-            printf ("File : %S \n", RemainingPaths.get()) ; 
-    #endif 
-            PRBool bExist ;
-            rv = pFile->Exists(&bExist) ;
-            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
-
-            nsXPIDLCString pURL ;
-            NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
-            if (pURL)
-            {
-				if (Attachments.Length() > 0)
-					Attachments.Append(",") ;
-                Attachments.Append(pURL) ;
-            }
-        }
-        rv = aCompFields->SetAttachments (Attachments.get());
-    }
-
-    return rv ;
-}
-
-// this used for Send with UI
-nsresult nsMapiHook::ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) 
-{
-    nsresult rv = NS_OK ;
-
-    // create a send listener to get back the send status
-    nsCOMPtr <nsIMsgSendListener> sendListener ;
-    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
-    if (NS_FAILED(rv) || (!sendListener) ) return rv ;
-
-    // create the compose params object 
-    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
-    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
-
-    // populate the compose params
-    pMsgComposeParams->SetType(nsIMsgCompType::New);
-    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
-    pMsgComposeParams->SetComposeFields(aCompFields); 
-    pMsgComposeParams->SetSendListener(sendListener) ;
-
-    /** get the nsIMsgComposeService object to open the compose window **/
-    nsCOMPtr <nsIMsgComposeService> compService = do_GetService (NS_MSGCOMPOSESERVICE_CONTRACTID) ;
-    if (NS_FAILED(rv)|| (!compService) ) return rv ;
-
-    rv = compService->OpenComposeWindowWithParams(nsnull, pMsgComposeParams) ;
-    if (NS_FAILED(rv)) return rv ;
-
-    return rv ;
-}

mozilla/mailnews/mapi/mapihook/src/msgMapiHook.h

@@ -1,66 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MSG_MAPI_HOOK_H_
-#define MSG_MAPI_HOOK_H_
-
-#include "prtypes.h"
-
-class nsMapiHook
-{
-    public :
-
-        static PRBool Initialize();
-        static PRBool DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, 
-                        PRUnichar **aPassword);
-        static PRBool VerifyUserName(const PRUnichar *aUsername, char **aIdKey);
-
-        static PRBool IsBlindSendAllowed () ;
-        static nsresult BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
-        static nsresult ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
-        static nsresult PopulateCompFields(lpnsMapiMessage aMessage, nsIMsgCompFields * aCompFields) ;
-        static nsresult PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
-                                        nsIMsgCompFields * aCompFields) ;
-        static nsresult PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, 
-                                        ULONG aFlags, LPTSTR aDelimChar, LPTSTR aFilePaths) ;
-        static nsresult HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
-                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode) ;
-        static void CleanUp();
-
-        static PRBool isMapiService;
-};
-
-#endif  // MSG_MAPI_HOOK_H_

mozilla/mailnews/mapi/mapihook/src/msgMapiImp.cpp

@@ -1,266 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <mapidefs.h>
-#include <mapi.h>
-#include "msgMapi.h"
-#include "msgMapiImp.h"
-#include "msgMapiFactory.h"
-#include "msgMapiMain.h"
-
-#include "nsMsgCompFields.h"
-#include "msgMapiHook.h"
-#include "nsString.h"
-#include "nsCOMPtr.h"
-#include "nsISupports.h"
-#include "nsMsgCompCID.h"
-
-
-
-CMapiImp::CMapiImp()
-: m_cRef(1)
-{
-    m_Lock = PR_NewLock();
-}
-
-CMapiImp::~CMapiImp() 
-{ 
-    if (m_Lock)
-        PR_DestroyLock(m_Lock);
-}
-
-STDMETHODIMP CMapiImp::QueryInterface(const IID& aIid, void** aPpv)
-{    
-    if (aIid == IID_IUnknown)
-    {
-        *aPpv = static_cast<nsIMapi*>(this); 
-    }
-    else if (aIid == IID_nsIMapi)
-    {
-        *aPpv = static_cast<nsIMapi*>(this);
-    }
-    else
-    {
-        *aPpv = nsnull;
-        return E_NOINTERFACE;
-    }
-
-    reinterpret_cast<IUnknown*>(*aPpv)->AddRef();
-    return S_OK;
-}
-
-STDMETHODIMP_(ULONG) CMapiImp::AddRef()
-{
-    return PR_AtomicIncrement(&m_cRef);
-}
-
-STDMETHODIMP_(ULONG) CMapiImp::Release() 
-{
-    PRInt32 temp;
-    temp = PR_AtomicDecrement(&m_cRef);
-    if (m_cRef == 0)
-    {
-        delete this;
-        return 0;
-    }
-
-    return temp;
-}
-
-STDMETHODIMP CMapiImp::IsValid()
-{
-    return S_OK;
-}
-
-STDMETHODIMP CMapiImp::IsValidSession(unsigned long aSession)
-{
-    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
-    if (pConfig && pConfig->IsSessionValid(aSession))
-        return S_OK;
-
-    return E_FAIL;
-}
-
-STDMETHODIMP CMapiImp::Initialize()
-{
-    HRESULT hr = E_FAIL;
-
-    if (!m_Lock)
-        return E_FAIL;
-
-    PR_Lock(m_Lock);
-
-    // Initialize MAPI Configuration
-
-    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
-    if (pConfig != nsnull)
-        if (nsMapiHook::Initialize())
-            hr = S_OK;
-
-    PR_Unlock(m_Lock);
-
-    return hr;
-}
-
-STDMETHODIMP CMapiImp::Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, LOGIN_PW_TYPE aPassWord,
-                unsigned long aFlags, unsigned long *aSessionId)
-{
-    HRESULT hr = E_FAIL;
-    PRBool bNewSession = PR_FALSE;
-    char *id_key = nsnull;
-
-    if (aFlags & MAPI_NEW_SESSION)
-        bNewSession = PR_TRUE;
-
-    // Check For Profile Name
-
-    if (aLogin != nsnull && aLogin[0] != '\0')
-    {
-        if (nsMapiHook::VerifyUserName(aLogin, &id_key) == PR_FALSE)
-    {
-        *aSessionId = MAPI_E_LOGIN_FAILURE;
-        return hr;
-    }
-    }
-
-    // finally register(create) the session.
-
-    PRUint32 nSession_Id;
-    PRInt16 nResult = 0;
-
-    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
-    if (pConfig != nsnull)
-        nResult = pConfig->RegisterSession(aUIArg, aLogin, aPassWord,
-                                           (aFlags & MAPI_FORCE_DOWNLOAD), bNewSession,
-                                           &nSession_Id, id_key);
-
-    switch (nResult)
-    {
-        case -1 :
-        {
-            *aSessionId = MAPI_E_TOO_MANY_SESSIONS;
-            return hr;
-        }
-        case 0 :
-        {
-            *aSessionId = MAPI_E_INSUFFICIENT_MEMORY;
-            return hr;
-        }
-        default :
-        {
-            *aSessionId = nSession_Id;
-            break;
-        }
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP CMapiImp::SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
-     short aRecipCount, lpnsMapiRecipDesc aRecips , short aFileCount, lpnsMapiFileDesc aFiles , 
-     unsigned long aFlags, unsigned long aReserved)
-{
-    nsresult rv = NS_OK ;
-
-    // Assign the pointers in the aMessage struct to the array of Recips and Files
-    // recieved here from MS COM. These are used in BlindSendMail and ShowCompWin fns 
-    aMessage->lpRecips = aRecips ;
-    aMessage->lpFiles = aFiles ;
-
-    /** create nsIMsgCompFields obj and populate it **/
-    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
-    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
-
-    if (aFlags & MAPI_UNICODE)
-        rv = nsMapiHook::PopulateCompFields(aMessage, pCompFields) ;
-    else
-        rv = nsMapiHook::PopulateCompFieldsWithConversion(aMessage, pCompFields) ;
-    
-    if (NS_SUCCEEDED (rv))
-    {
-        // see flag to see if UI needs to be brought up
-        if (!(aFlags & MAPI_DIALOG))
-        {
-            rv = nsMapiHook::BlindSendMail(aSession, pCompFields);
-        }
-        else
-        {
-            rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
-        }
-    }
-    
-    return nsMAPIConfiguration::GetMAPIErrorFromNSError (rv) ;
-}
-
-
-STDMETHODIMP CMapiImp::SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
-                            LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags)
-{
-    nsresult rv = NS_OK ;
-
-    /** create nsIMsgCompFields obj and populate it **/
-    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
-    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
-
-    if (aFilePaths)
-    {
-        rv = nsMapiHook::PopulateCompFieldsForSendDocs(pCompFields, aFlags, aDelimChar, aFilePaths) ;
-    }
-
-    if (NS_SUCCEEDED (rv)) 
-        rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
-
-    return nsMAPIConfiguration::GetMAPIErrorFromNSError (rv) ;
-}
-
-STDMETHODIMP CMapiImp::Logoff (unsigned long aSession)
-{
-    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
-
-    if (pConfig->UnRegisterSession((PRUint32)aSession))
-        return S_OK;
-
-    return E_FAIL;
-}
-
-STDMETHODIMP CMapiImp::CleanUp()
-{
-    nsMapiHook::CleanUp();
-    return S_OK;
-}
-
-

mozilla/mailnews/mapi/mapihook/src/msgMapiImp.h

@@ -1,92 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MSG_MAPI_IMP_H
-#define MSG_MAPI_IMP_H
-
-#include <windows.h>
-#include <mapi.h>
-#include "msgMapi.h"
-#include "nsXPIDLString.h"
-#include "nspr.h"
-
-const CLSID CLSID_CMapiImp = {0x29f458be, 0x8866, 0x11d5, {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
-
-// this class implements the MS COM interface nsIMapi that provides the methods
-// called by mapi32.dll to perform the mail operations as specified by MAPI.
-// These class methods in turn use the Mozilla Mail XPCOM interfaces to do so.
-class CMapiImp : public nsIMapi
-{
-
-public :
-
-    // IUnknown
-
-    STDMETHODIMP            QueryInterface(const IID& aIid, void** aPpv);
-    STDMETHODIMP_(ULONG)    AddRef();
-    STDMETHODIMP_(ULONG)    Release();
-
-    // Interface INsMapi
-
-    STDMETHODIMP Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, 
-                       LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
-                       unsigned long *aSessionId);
-
-    STDMETHODIMP SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
-         short aRecipCount, lpnsMapiRecipDesc aRecips , 
-         short aFileCount, lpnsMapiFileDesc aFiles , 
-         unsigned long aFlags, unsigned long aReserved) ;
-
-    STDMETHODIMP SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
-                                LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags);
-
-    STDMETHODIMP Initialize();
-    STDMETHODIMP IsValid();
-    STDMETHODIMP IsValidSession(unsigned long aSession);
-
-    STDMETHODIMP Logoff (unsigned long aSession);
-    STDMETHODIMP CleanUp();
-
-    CMapiImp();
-    ~CMapiImp();
-
-private :
-
-    PRLock *m_Lock;
-    PRInt32 m_cRef;
-};
-
-#endif // MSG_MAPI_IMP_H

mozilla/mailnews/mapi/mapihook/src/msgMapiMain.cpp

@@ -1,376 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <mapidefs.h>
-#include <mapi.h>
-
-#include "msgCore.h"
-#include "nsMsgComposeStringBundle.h"
-#include "msgMapiMain.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-
-// move to xpcom bug 81956.
-class nsPRUintKey : public nsHashKey {
-protected:
-    PRUint32 mKey;
-public:
-    nsPRUintKey(PRUint32 key) : mKey(key) {}
-
-    PRUint32 HashCode(void) const {
-        return mKey;
-    }
-
-    PRBool Equals(const nsHashKey *aKey) const {
-        return mKey == ((const nsPRUintKey *) aKey)->mKey;
-    }
-    nsHashKey *Clone() const {
-        return new nsPRUintKey(mKey);
-    }
-    PRUint32 GetValue() { return mKey; }
-};
-//
-
-
-nsMAPIConfiguration *nsMAPIConfiguration::m_pSelfRef = nsnull;
-PRUint32 nsMAPIConfiguration::session_generator = 0;
-PRUint32 nsMAPIConfiguration::sessionCount = 0;
-
-nsMAPIConfiguration *nsMAPIConfiguration::GetMAPIConfiguration()
-{
-    if (m_pSelfRef == nsnull)
-        m_pSelfRef = new nsMAPIConfiguration();
-
-    return m_pSelfRef;
-}
-
-nsMAPIConfiguration::nsMAPIConfiguration()
-: m_nMaxSessions(MAX_SESSIONS)
-{
-    m_Lock = PR_NewLock();
-}
-
-static PRBool
-FreeSessionMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
-{
-    nsMAPISession *pTemp = (nsMAPISession*) aData;
-    if (pTemp)
-    {
-    delete pTemp;
-    pTemp = nsnull;
-    }
-    return PR_TRUE;
-}
-
-static PRBool
-FreeProfileMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
-{
-    return PR_TRUE;
-}
-
-nsMAPIConfiguration::~nsMAPIConfiguration()
-{
-    if (m_Lock)
-        PR_DestroyLock(m_Lock);
-
-    m_SessionMap.Reset(FreeSessionMapEntries);
-    m_ProfileMap.Reset(FreeProfileMapEntries);
-    }
-
-void nsMAPIConfiguration::OpenConfiguration()
-{
-    // No. of max. sessions is set to MAX_SESSIONS.  In future
-    // if it is decided to have configuration (registry)
-    // parameter, this function can be used to set the
-    // max sessions;
-
-    return;
-}
-
-PRInt16 nsMAPIConfiguration::RegisterSession(PRUint32 aHwnd,
-                const PRUnichar *aUserName, const PRUnichar *aPassword,
-                PRBool aForceDownLoad, PRBool aNewSession,
-                PRUint32 *aSession, char *aIdKey)
-{
-    PRInt16 nResult = 0;
-    PRUint32 n_SessionId = 0;
-
-    PR_Lock(m_Lock);
-
-    // Check whether max sessions is exceeded
-
-    if (sessionCount >= m_nMaxSessions)
-    {
-        PR_Unlock(m_Lock);
-        return -1;
-    }
-
-    if (aUserName != nsnull && aUserName[0] != '\0')
-    {
-    nsStringKey usernameKey(aUserName);
-    n_SessionId = (PRUint32) m_ProfileMap.Get(&usernameKey);
-    }
-
-    // try to share a session; if not create a session
-
-    if (n_SessionId > 0)
-    {
-        nsPRUintKey sessionKey(n_SessionId);
-        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
-        if (pTemp != nsnull)
-        {
-            pTemp->IncrementSession();
-            *aSession = n_SessionId;
-            nResult = 1;
-        }
-    }
-    else if (aNewSession || n_SessionId == 0) // checking for n_SessionId is a concession
-    {
-        // create a new session ; if new session is specified OR there is no session
-        nsMAPISession *pTemp = nsnull;
-        pTemp = new nsMAPISession(aHwnd, aUserName,
-                               aPassword, aForceDownLoad, aIdKey);
-
-        if (pTemp != nsnull)
-        {
-            session_generator++;
-
-            // I don't think there will be (2 power 32) sessions alive
-            // in a cycle.  This is an assumption
-
-            if (session_generator == 0)
-                session_generator++;
-
-            nsPRUintKey sessionKey(session_generator);
-            m_SessionMap.Put(&sessionKey, pTemp);
-            if (aUserName != nsnull && aUserName[0] != '\0')
-            {
-                nsStringKey usernameKey(aUserName);
-            m_ProfileMap.Put(&usernameKey, (void*)session_generator);
-            }
-
-            *aSession = session_generator;
-            sessionCount++;
-            nResult = 1;
-        }
-    }
-
-    PR_Unlock(m_Lock);
-    return nResult;
-}
-
-PRBool nsMAPIConfiguration::UnRegisterSession(PRUint32 aSessionID)
-{
-    PRBool bResult = PR_FALSE;
-
-    PR_Lock(m_Lock);
-
-    if (aSessionID != 0)
-    {
-        nsPRUintKey sessionKey(aSessionID);
-        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
-
-        if (pTemp != nsnull)
-        {
-            if (pTemp->DecrementSession() == 0)
-            {
-                if (pTemp->m_pProfileName.get() != nsnull)
-                {
-                nsStringKey stringKey(pTemp->m_pProfileName.get());
-                m_ProfileMap.Remove(&stringKey);
-                }
-                m_SessionMap.Remove(&sessionKey);
-                sessionCount--;
-                bResult = PR_TRUE;
-            }
-        }
-    }
-
-    PR_Unlock(m_Lock);
-    return bResult;
-}
-
-PRBool nsMAPIConfiguration::IsSessionValid(PRUint32 aSessionID)
-{
-    if (aSessionID == 0)
-        return PR_FALSE;
-
-    PRBool retValue = PR_FALSE;
-    nsPRUintKey sessionKey(aSessionID);
-
-    PR_Lock(m_Lock);
-
-    retValue = m_SessionMap.Exists(&sessionKey);
-        
-    PR_Unlock(m_Lock);
-
-    return retValue;
-}
-
-
-PRUnichar *nsMAPIConfiguration::GetPassword(PRUint32 aSessionID)
-{
-    PRUnichar *pResult = nsnull;
-
-    PR_Lock(m_Lock);
-
-    if (aSessionID != 0)
-    {
-        nsPRUintKey sessionKey(aSessionID);
-        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
-
-        if (pTemp)
-        {
-            pResult = pTemp->GetPassword();
-        }
-    }
-
-    PR_Unlock(m_Lock);
-
-    return pResult;
-}
-
-char *nsMAPIConfiguration::GetIdKey(PRUint32 aSessionID)
-{
-    char *pResult = nsnull;
-
-    PR_Lock(m_Lock);
-
-    if (aSessionID != 0)
-    {
-        nsPRUintKey sessionKey(aSessionID);
-        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
-        if (pTemp)
-        {
-           pResult = pTemp->GetIdKey();
-        }
-    }
-
-    PR_Unlock(m_Lock);
-    return pResult;
-}
-
-// util func
-HRESULT nsMAPIConfiguration::GetMAPIErrorFromNSError (nsresult res)
-{
-    HRESULT hr = SUCCESS_SUCCESS ;
-
-    if (NS_SUCCEEDED (hr)) return hr ;
-
-    // if failure return the related MAPI failure code
-    switch (res)
-    {
-        case NS_MSG_NO_RECIPIENTS :
-            hr = MAPI_E_BAD_RECIPTYPE ;
-            break ;
-        case NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS :
-            hr = MAPI_E_INVALID_RECIPS ; 
-            break ;
-        case NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER :
-            hr = MAPI_E_LOGIN_FAILURE ;
-            break ;
-        case NS_MSG_UNABLE_TO_OPEN_FILE :                 
-        case NS_MSG_UNABLE_TO_OPEN_TMP_FILE :
-        case NS_MSG_COULDNT_OPEN_FCC_FOLDER :
-        case NS_ERROR_FILE_INVALID_PATH :
-            hr = MAPI_E_ATTACHMENT_OPEN_FAILURE ;
-            break ;
-        case NS_ERROR_FILE_TARGET_DOES_NOT_EXIST :
-            hr = MAPI_E_ATTACHMENT_NOT_FOUND ;
-            break ;
-        case NS_MSG_CANCELLING :
-            hr = MAPI_E_USER_ABORT ;
-            break ;
-        case NS_MSG_ERROR_WRITING_FILE :
-        case NS_MSG_UNABLE_TO_SAVE_TEMPLATE :
-        case NS_MSG_UNABLE_TO_SAVE_DRAFT :
-            hr = MAPI_E_ATTACHMENT_WRITE_FAILURE ;
-            break ;
-        default :
-            hr = MAPI_E_FAILURE ;
-            break ;
-    }
-
-    return hr ;
-}
-
-
-nsMAPISession::nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName,\
-                             const PRUnichar *aPassword, \
-                             PRBool aForceDownLoad, char *aKey)
-: m_bIsForcedDownLoad(aForceDownLoad),
-  m_hAppHandle(aHwnd),
-  m_nShared(1),
-  m_pIdKey(aKey)
-{
-    m_pProfileName.Assign(aUserName);
-    m_pPassword.Assign(aPassword);
-}
-
-nsMAPISession::~nsMAPISession()
-{
-    if (m_pIdKey != nsnull)
-    {
-        delete [] m_pIdKey;
-        m_pIdKey = nsnull;
-    }
-}
-
-PRUint32 nsMAPISession::IncrementSession()
-{
-    return ++m_nShared;
-}
-
-PRUint32 nsMAPISession::DecrementSession()
-{
-    return --m_nShared;
-}
-
-PRUint32 nsMAPISession::GetSessionCount()
-{
-    return m_nShared;
-}
-
-PRUnichar *nsMAPISession::GetPassword()
-{
-    return (PRUnichar *)m_pPassword.get();
-}
-
-char *nsMAPISession::GetIdKey()
-{
-    return m_pIdKey;
-}
-

mozilla/mailnews/mapi/mapihook/src/msgMapiMain.h

@@ -1,112 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MSG_MAPI_MAIN_H_
-#define NSG_MAPI_MAIN_H_
-
-#define        MAX_NAME_LEN    256
-#define        MAX_PW_LEN      256
-#define        MAX_SESSIONS    50
-#define        MAPI_SENDCOMPLETE_EVENT   "SendCompletionEvent"
-
-#define MAPI_PROPERTIES_CHROME "chrome://messenger-mapi/locale/mapi.properties"
-#define PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND "mapi.blind-send.warn"
-#define PREF_MAPI_BLIND_SEND_ENABLED "mapi.blind-send.enabled"
-
-#include "nsXPIDLString.h"
-#include "nspr.h"
-#include "nsString.h"
-#include "nsHashtable.h"
-
-class nsMAPIConfiguration
-{
-private :
-
-    static PRUint32 session_generator;
-    static PRUint32 sessionCount;
-    static nsMAPIConfiguration *m_pSelfRef;
-    PRLock *m_Lock;
-    PRUint32  m_nMaxSessions;
-
-
-    nsHashtable m_ProfileMap;
-    nsHashtable m_SessionMap;
-    nsMAPIConfiguration();
-
-public :
-    static nsMAPIConfiguration *GetMAPIConfiguration();
-    void OpenConfiguration();
-    PRInt16 RegisterSession(PRUint32 aHwnd, const PRUnichar *aUserName, \
-                            const PRUnichar *aPassword, PRBool aForceDownLoad, \
-                            PRBool aNewSession, PRUint32 *aSession, char *aIdKey);
-    PRBool IsSessionValid(PRUint32 aSessionID);
-    PRBool UnRegisterSession(PRUint32 aSessionID);
-    PRUnichar *GetPassword(PRUint32 aSessionID);
-    char *GetIdKey(PRUint32 aSessionID);
-    ~nsMAPIConfiguration();
-
-    // a util func
-    static HRESULT GetMAPIErrorFromNSError (nsresult res) ;
-};
-
-class nsMAPISession
-{
-    friend class nsMAPIConfiguration;
-
-    private :
-
-        PRBool   m_bIsForcedDownLoad;
-        PRBool   m_bApp_or_Service;
-        PRUint32 m_hAppHandle;
-        PRUint32 m_nShared;
-        char     *m_pIdKey;
-        nsString m_pProfileName;
-        nsString m_pPassword;
-
-    public :
-
-        nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName, \
-                      const PRUnichar *aPassword, \
-                      PRBool aForceDownLoad, char *aKey);
-        PRUint32 IncrementSession();
-        PRUint32 DecrementSession();
-        PRUint32 GetSessionCount();
-        PRUnichar *nsMAPISession::GetPassword();
-        char *nsMAPISession::GetIdKey();
-        ~nsMAPISession();
-};
-
-#endif    // MSG_MAPI_MAIN_H_

mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.cpp

@@ -1,209 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#include "nsCOMPtr.h"
-#include "objbase.h"
-#include "nsISupports.h"
-
-#include "nsIGenericFactory.h"
-#include "nsIObserverService.h"
-#include "nsIAppStartupNotifier.h"
-#include "nsIServiceManager.h"
-#include "nsIComponentManager.h"
-#include "nsICategoryManager.h"
-
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
-#include "nsIPrefBranchInternal.h"
-
-#include "msgMapiSupport.h"
-#include "nsMapiRegistryUtils.h" 
-#include "nsMapiRegistry.h"
-#include "msgMapiImp.h"
-
-/** Implementation of the nsIMapiSupport interface.
- *  Use standard implementation of nsISupports stuff.
- */
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsMapiSupport, nsIMapiSupport, nsIObserver);
-
-static NS_METHOD nsMapiRegistrationProc(nsIComponentManager *aCompMgr,
-                   nsIFile *aPath, const char *registryLocation, const char *componentType,
-                   const nsModuleComponentInfo *info)
-        {
-    
-  nsresult rv;
-
-  nsCOMPtr<nsICategoryManager> categoryManager(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
-  if (NS_SUCCEEDED(rv)) 
-      rv = categoryManager->AddCategoryEntry(APPSTARTUP_CATEGORY, "Mapi Support", 
-                  "service," NS_IMAPISUPPORT_CONTRACTID, PR_TRUE, PR_TRUE, nsnull);
- 
-  return rv ;
-
-}
-
-NS_IMETHODIMP
-nsMapiSupport::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData)
-{
-    nsresult rv = NS_OK ;
-
-    if (!nsCRT::strcmp(aTopic, "profile-after-change"))
-        return InitializeMAPISupport();
-
-    if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
-        return ShutdownMAPISupport();
-
-    if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID))
-    {
-        nsCOMPtr<nsIPrefBranch> prefs = do_QueryInterface(aSubject, &rv);
-        if (NS_FAILED(rv))  return rv;
-        // which preference changed?
-        if (!nsCRT::strcmp(MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT, NS_ConvertUCS2toUTF8(aData).get()))
-        {
-            PRBool bIsDefault = PR_FALSE ;
-            rv = prefs->GetBoolPref(MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT, &bIsDefault);
-            if (NS_FAILED(rv)) return rv;
-            nsCOMPtr <nsIMapiRegistry> mapiRegistry = do_CreateInstance(NS_IMAPIREGISTRY_CONTRACTID, &rv) ;
-            if (NS_FAILED(rv)) return rv;
-            return mapiRegistry->SetIsDefaultMailClient(bIsDefault) ;
-        }
-        return rv ;
-    }
-
-    nsCOMPtr<nsIObserverService> observerService(do_GetService("@mozilla.org/observer-service;1", &rv));
-    if (NS_FAILED(rv)) return rv;
- 
-    rv = observerService->AddObserver(this,"profile-after-change", PR_FALSE);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
-    if (NS_FAILED(rv))  return rv;
-
-     nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
-    if (NS_FAILED(rv))  return rv;
-
-    nsCOMPtr<nsIPrefBranchInternal> prefInternal = do_QueryInterface(prefs, &rv);
-    if (NS_FAILED(rv))  return rv;
-
-    rv = prefInternal->AddObserver(MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT, this, PR_FALSE);
-    if (NS_FAILED(rv))  return rv;
-           
-    return rv;
-}
-
-
-nsMapiSupport::nsMapiSupport()
-: m_dwRegister(0),
-  m_nsMapiFactory(nsnull)
-{
-   NS_INIT_ISUPPORTS();
-}
-
-nsMapiSupport::~nsMapiSupport()
-{
-}
-
-NS_IMETHODIMP
-nsMapiSupport::InitializeMAPISupport()
-{
-    ::CoInitialize(nsnull) ;
-
-    if (m_nsMapiFactory == nsnull)    // No Registering if already done.  Sanity Check!!
-    {
-        m_nsMapiFactory = new CMapiFactory();
-
-        if (m_nsMapiFactory != nsnull)
-        {
-            HRESULT hr = ::CoRegisterClassObject(CLSID_CMapiImp, \
-                                                 m_nsMapiFactory, \
-                                                 CLSCTX_LOCAL_SERVER, \
-                                                 REGCLS_MULTIPLEUSE, \
-                                                 &m_dwRegister);
-
-            if (FAILED(hr))
-            {
-                m_nsMapiFactory->Release() ;
-                m_nsMapiFactory = nsnull;
-                return NS_ERROR_FAILURE;
-            }
-        }
-    }
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMapiSupport::ShutdownMAPISupport()
-{
-    if (m_dwRegister != 0)
-        ::CoRevokeClassObject(m_dwRegister);
-
-    if (m_nsMapiFactory != nsnull)
-    {
-        m_nsMapiFactory->Release();
-        m_nsMapiFactory = nsnull;
-    }
-
-    ::CoUninitialize();
-
-    return NS_OK ;
-}
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiRegistry);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiSupport);
-
-// The list of components we register
-static nsModuleComponentInfo components[] = 
-{
-  {
-    NS_IMAPIREGISTRY_CLASSNAME, 
-    NS_IMAPIREGISTRY_CID,
-    NS_IMAPIREGISTRY_CONTRACTID, 
-    nsMapiRegistryConstructor
-  },
-
-{
-    NS_IMAPISUPPORT_CLASSNAME,
-    NS_IMAPISUPPORT_CID,
-    NS_IMAPISUPPORT_CONTRACTID,
-    nsMapiSupportConstructor,
-    nsMapiRegistrationProc,
-    nsnull
-}
-};
-
-NS_IMPL_NSGETMODULE(msgMapiModule, components);
-

mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.h

@@ -1,66 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- *
- * The Initial Developer of the Original Code is 
- # Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MSG_MAPI_SUPPORT_H_
-#define MSG_MAPI_SUPPORT_H_
-
-#include "nsIObserver.h"
-#include "nsIMapiSupport.h"
-#include "msgMapiFactory.h"
-
-#define NS_IMAPISUPPORT_CID \
-  {0x8967fed2, 0xc8bb, 0x11d5, \
-    { 0xa3, 0xe9, 0x00, 0xb0, 0xd0, 0xf3, 0xba, 0xa7 }}
-
-class nsMapiSupport : public nsIMapiSupport,
-                      public nsIObserver
-{
-    public :
-        nsMapiSupport();
-        ~nsMapiSupport();
-
-        // Declare all interface methods we must implement.
-        NS_DECL_ISUPPORTS
-        NS_DECL_NSIOBSERVER
-        NS_DECL_NSIMAPISUPPORT
-
-    private :
-
-        DWORD   m_dwRegister;
-        CMapiFactory *m_nsMapiFactory;
-};
-
-#endif  // MSG_MAPI_SUPPORT_H_

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistry.cpp

@@ -1,167 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Srilatha Moturi <srilatha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-#include "nsIServiceManager.h"
-#include "nsXPIDLString.h"
-#include "nsIPromptService.h"
-#include "nsIProxyObjectManager.h"
-#include "nsProxiedService.h"
-
-#include "nsMapiRegistryUtils.h" 
-#include "nsMapiRegistry.h"
-
-static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
-
-/** Implementation of the nsIMapiRegistry interface.
- *  Use standard implementation of nsISupports stuff.
- */
-NS_IMPL_ISUPPORTS1(nsMapiRegistry, nsIMapiRegistry);
-
-nsMapiRegistry::nsMapiRegistry() {
-    NS_INIT_ISUPPORTS();
-    m_ShowDialog = ! m_registryUtils.verifyRestrictedAccess();
-    m_DefaultMailClient = m_registryUtils.IsDefaultMailClient();
-}
-
-nsMapiRegistry::~nsMapiRegistry() {
-}
-
-NS_IMETHODIMP
-nsMapiRegistry::GetIsDefaultMailClient(PRBool * retval) {
-    // we need to get the value from registry everytime
-    // because the registry settings can be changed from
-    // other mail applications.
-    *retval = m_registryUtils.IsDefaultMailClient();
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMapiRegistry::GetShowDialog(PRBool * retval) {
-    *retval = m_ShowDialog;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMapiRegistry::SetIsDefaultMailClient(PRBool aIsDefaultMailClient) 
-{
-    nsresult rv = NS_OK ;
-
-    if (aIsDefaultMailClient)
-    {
-        rv = m_registryUtils.setDefaultMailClient();
-    if (NS_SUCCEEDED(rv))
-        m_DefaultMailClient = PR_TRUE;
-    else
-            m_registryUtils.ShowMapiErrorDialog();
-}
-    else
-    {
-        rv = m_registryUtils.unsetDefaultMailClient();
-    if (NS_SUCCEEDED(rv))
-        m_DefaultMailClient = PR_FALSE;
-    else
-            m_registryUtils.ShowMapiErrorDialog();
-}
-
-    return rv ;
-}
-
-/** This will bring up the dialog box only once per session and 
- * only if the current app is not default Mail Client.
- * This also checks the registry if the registry key
- * showMapiDialog is set
- */
-NS_IMETHODIMP
-nsMapiRegistry::ShowMailIntegrationDialog(nsIDOMWindow *aParentWindow) {
-    nsresult rv;
-    if (!m_ShowDialog || !m_registryUtils.getShowDialog()) return NS_OK;
-    nsCOMPtr<nsIPromptService> promptService(do_GetService(
-                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
-    if (NS_SUCCEEDED(rv) && promptService)
-    {
-        nsCOMPtr<nsIStringBundle> bundle;
-        rv = m_registryUtils.MakeMapiStringBundle (getter_AddRefs (bundle)) ;
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        nsXPIDLString dialogTitle;
-        const PRUnichar *brandStrings[] = { m_registryUtils.brandName() };
-        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "dialogTitle");
-        rv = bundle->FormatStringFromName(dialogTitlePropertyTag.get(),
-                                          brandStrings, 1,
-                                          getter_Copies(dialogTitle));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-        
-        nsXPIDLString dialogText;
-        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "dialogText");
-        rv = bundle->FormatStringFromName(dialogTextPropertyTag.get(),
-                                          brandStrings, 1,
-                                          getter_Copies(dialogText));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        nsXPIDLString checkboxText;
-        rv = bundle->GetStringFromName(
-                           NS_LITERAL_STRING("checkboxText").get(),
-                           getter_Copies(checkboxText));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        PRBool checkValue = PR_FALSE;
-        PRInt32 buttonPressed = 0;
-        rv = promptService->ConfirmEx(aParentWindow,
-                                      dialogTitle,
-                                      dialogText.get(),
-                                      (nsIPromptService::BUTTON_TITLE_YES * 
-                                      nsIPromptService::BUTTON_POS_0) +
-                                      (nsIPromptService::BUTTON_TITLE_NO * 
-                                      nsIPromptService::BUTTON_POS_1),
-                                      nsnull,
-                                      nsnull,
-                                      nsnull,
-                                      checkboxText,
-                                      &checkValue,
-                                      &buttonPressed);
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-        rv = m_registryUtils.SetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
-                                "showMapiDialog", (checkValue) ? "0" : "1");
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        m_ShowDialog = PR_FALSE;
-        if (!buttonPressed)
-            rv = SetIsDefaultMailClient(PR_TRUE) ; // SetDefaultMailClient();
-    }
-    return rv;
-}
-

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistry.h

@@ -1,76 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Srilatha Moturi <srilatha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsmapiregistry_h____
-#define nsmapiregistry_h____
-
-#include "nsIMapiRegistry.h"
-
-#ifndef MAX_BUF
-#define MAX_BUF 4096
-#endif
-
-/* c5be14ba-4e0a-4eec-a1b8-04363761d63c */
-#define NS_IMAPIREGISTRY_CID \
- { 0xc5be14ba, 0x4e0a, 0x4eec, {0xa1, 0xb8, 0x04, 0x36, 0x37, 0x61, 0xd6, 0x3c} }
-#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
-#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
-
-#define MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT  "mailnews.default_mail_client"
-
-class nsMapiRegistry : public nsIMapiRegistry {
-public:
-    // ctor/dtor
-    nsMapiRegistry();
-    virtual ~nsMapiRegistry();
-
-    // Declare all interface methods we must implement.
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIMAPIREGISTRY
-
-protected:
-    
-    PRBool m_DefaultMailClient;
-    PRBool m_ShowDialog;
-    nsMapiRegistryUtils m_registryUtils ;
-
-private:
-    // Special member to handle initialization.
-    PRBool mHaveBeenSet;
-}; // nsMapiRegistry
-
-#endif // nsmapiregistry_h____

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp

@@ -1,743 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Srilatha Moturi <srilatha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#undef UNICODE
-#undef _UNICODE
-
-#include "nsIServiceManager.h"
-#include "msgMapiImp.h"
-#include "msgMapiMain.h"
-#include "nsMapiRegistryUtils.h"
-#include "nsString.h"
-#include "nsIStringBundle.h"
-#include "nsIPromptService.h"
-#include "nsXPIDLString.h"
-#include "nsSpecialSystemDirectory.h"
-#include "nsDirectoryService.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsIPref.h"
-
-static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
-
-#define EXE_EXTENSION ".exe" 
-#define USERAGENT_VERSION_PREF "general.useragent.misc"
-#define USERAGENT_VERSION_NS_PREF "general.useragent.vendorSub"
-#define USERAGENT_PREF_PREFIX "rv:"
-
-nsMapiRegistryUtils::nsMapiRegistryUtils()
-{
-   m_mapiStringBundle = nsnull ;
-}
-    
-const char * nsMapiRegistryUtils::thisApplication()
-{
-    if (m_thisApp.IsEmpty()) {
-        char buffer[MAX_PATH] = {0};
-        DWORD len = ::GetModuleFileName(NULL, buffer, MAX_PATH);
-        if (!len) return nsnull ; 
-        char shortPathBuf[MAX_PATH] = {0};
-        len = ::GetShortPathName(buffer, shortPathBuf, MAX_PATH);
-        if (!len) return nsnull ; 
-        m_thisApp = buffer;
-        m_thisApp.ToUpperCase();
-    }
-
-    return m_thisApp.get() ;
-}
-
-const PRUnichar * nsMapiRegistryUtils::brandName() 
-{
-    nsresult rv;
-    if (m_brand.IsEmpty()) {
-        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
-                                         kStringBundleServiceCID, &rv));
-        if (NS_SUCCEEDED(rv) && bundleService) {
-            nsCOMPtr<nsIStringBundle> brandBundle;
-            rv = bundleService->CreateBundle(
-                        "chrome://global/locale/brand.properties",
-                        getter_AddRefs(brandBundle));
-            if (NS_SUCCEEDED(rv)) {
-                nsXPIDLString brandName;
-                rv = brandBundle->GetStringFromName(
-                           NS_LITERAL_STRING("brandShortName").get(),
-                           getter_Copies(brandName));
-                if (NS_SUCCEEDED(rv)) {
-                    m_brand = brandName ;
-                }
-            }
-        }
-    }
-
-    return m_brand.get()  ;
-}
-
-const PRUnichar * nsMapiRegistryUtils::versionNo()
-{
- if (!m_versionNo.IsEmpty())
-   return m_versionNo.get() ;
-
- nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
- if (prefs) {
-     nsXPIDLCString versionStr ;
-     nsresult rv = prefs->GetCharPref(USERAGENT_VERSION_NS_PREF, getter_Copies(versionStr));
-     if (NS_SUCCEEDED(rv) && versionStr)
-         m_versionNo.AssignWithConversion (versionStr.get()) ;
-     else {
-         rv = prefs->GetCharPref(USERAGENT_VERSION_PREF, getter_Copies(versionStr));
-         if (NS_SUCCEEDED(rv) && versionStr)  {
-             m_versionNo.AssignWithConversion (versionStr.get()) ;
-             m_versionNo.StripChars (USERAGENT_PREF_PREFIX) ;
-         }
-     }
- }
-
- return m_versionNo.get() ;
-}
-
-
-PRBool nsMapiRegistryUtils::verifyRestrictedAccess() {
-    char   subKey[] = "Software\\Mozilla - Test Key";
-    PRBool result = PR_FALSE;
-    DWORD  dwDisp = 0;
-    HKEY   key;
-    // Try to create/open a subkey under HKLM.
-    DWORD rc = ::RegCreateKeyEx(HKEY_LOCAL_MACHINE,
-                                subKey,
-                                0,
-                                NULL,
-                                REG_OPTION_NON_VOLATILE,
-                                KEY_WRITE,
-                                NULL,
-                                &key,
-                                &dwDisp);
-
-    if (rc == ERROR_SUCCESS) {
-        // Key was opened; first close it.
-        ::RegCloseKey(key);
-        // Delete it if we just created it.
-        switch(dwDisp) {
-            case REG_CREATED_NEW_KEY:
-                ::RegDeleteKey(HKEY_LOCAL_MACHINE, subKey);
-                break;
-            case REG_OPENED_EXISTING_KEY:
-                break;
-        }
-    } else {
-        // Can't create/open it; we don't have access.
-        result = PR_TRUE;
-    }
-    return result;
-}
-
-nsresult nsMapiRegistryUtils::SetRegistryKey(HKEY baseKey, const char * keyName, 
-                        const char * valueName, char * value)
-{
-    nsresult result = NS_ERROR_FAILURE;
-    HKEY   key;
-    LONG   rc = ::RegCreateKey(baseKey, keyName, &key);
-  
-    if (rc == ERROR_SUCCESS) {
-        rc = ::RegSetValueEx(key, valueName, NULL, REG_SZ, 
-                                 (LPBYTE)(const char*)value, strlen(value));
-        if (rc == ERROR_SUCCESS) {
-            result = NS_OK;
-        }
-        ::RegCloseKey(key);
-    }
-    return result;
-}
-
-nsresult nsMapiRegistryUtils::DeleteRegistryValue(HKEY baseKey, const char * keyName, 
-                        const char * valueName)
-{
-    nsresult result = NS_ERROR_FAILURE;
-    HKEY   key;
-    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
-  
-    if (rc == ERROR_SUCCESS) {
-        rc = ::RegDeleteValue(key, valueName);
-        if (rc == ERROR_SUCCESS)
-            result = NS_OK;
-        ::RegCloseKey(key);
-    }
-    return result;
-}
-
-void nsMapiRegistryUtils::GetRegistryKey(HKEY baseKey, const char * keyName, 
-                         const char * valueName, nsCAutoString & value)
-{
-    HKEY   key;
-    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
-    if (rc == ERROR_SUCCESS) {
-        char buffer[MAX_PATH] = {0};
-        DWORD len = sizeof buffer;
-        rc = ::RegQueryValueEx(key, valueName, NULL, NULL, 
-                               (LPBYTE)buffer, &len);
-        if (rc == ERROR_SUCCESS) {
-            if (len)
-                value = buffer;
-        }
-        ::RegCloseKey(key);
-     }
-}
-
-
-
-PRBool nsMapiRegistryUtils::IsDefaultMailClient()
-{
-    if (!isSmartDll() && !isMozDll()) 
-        return PR_FALSE;
-    nsCAutoString name; 
-    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Clients\\Mail", "", name);
-    if (!name.IsEmpty()) {
-         nsCAutoString keyName("Software\\Clients\\Mail\\");
-         keyName += name.get(); 
-         keyName += "\\protocols\\mailto\\shell\\open\\command";
-
-         nsCAutoString result;
-         GetRegistryKey(HKEY_LOCAL_MACHINE, keyName.get(), "", result);
-         if (!result.IsEmpty()) {
-             nsCAutoString strExtension;
-             strExtension.Assign(EXE_EXTENSION);
-             result.ToUpperCase();
-             strExtension.ToUpperCase();
-             PRInt32 index = result.RFind(strExtension.get());
-             if (index != kNotFound) {
-                 result.Truncate(index + strExtension.Length());
-             }
-             nsCAutoString thisApp (thisApplication()) ;
-             return (result == thisApp);
-        }
-    }
-    return PR_FALSE;
-
-}
-
-nsresult nsMapiRegistryUtils::saveDefaultMailClient()
-{
-    nsresult rv;
-    nsCAutoString name ;
-    GetRegistryKey(HKEY_LOCAL_MACHINE,"Software\\Clients\\Mail", "", name);
-    if (!name.IsEmpty()) {
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            "Software\\Mozilla\\Desktop", 
-                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
-                            (char *)name.get());
-        if (NS_SUCCEEDED(rv)) {
-            nsCAutoString keyName("Software\\Clients\\Mail\\");
-            keyName += name.get(); 
-            keyName += "\\protocols\\mailto\\shell\\open\\command";
-            nsCAutoString appPath ;
-            GetRegistryKey(HKEY_LOCAL_MACHINE, keyName.get(), "", appPath);
-            if (!appPath.IsEmpty()) {
-                nsCAutoString stringName("HKEY_LOCAL_MACHINE\\");
-                stringName += keyName.get();
-                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                  "Software\\Mozilla\\Desktop", 
-                                  stringName.get(), (char *)appPath.get());
-            }
-        }
-    }
-    else
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            "Software\\Mozilla\\Desktop", 
-                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
-                            "");
-    return rv;
-} 
-
-nsresult nsMapiRegistryUtils::saveUserDefaultMailClient()
-{
-    nsresult rv;
-    nsCAutoString name ;
-    GetRegistryKey(HKEY_CURRENT_USER,"Software\\Clients\\Mail", "", name);
-    if (!name.IsEmpty()) {
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            "Software\\Mozilla\\Desktop", 
-                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
-                            (char *)name.get());
-    }
-    else {
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            "Software\\Mozilla\\Desktop", 
-                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
-                            "");
-   }
-   return rv;
-}
-
-/**
- * Check whether it is a smart dll or not. Smart dll is the one installed by
- * IE5 or Outlook Express which forwards the MAPI calls to the dll based on the 
- * registry key setttings.
- * Returns TRUE if is a smart dll.
- */
-
-typedef HRESULT (FAR PASCAL GetOutlookVersionFunc)(); 
-PRBool nsMapiRegistryUtils::isSmartDll() 
-{ 
-    char buffer[MAX_PATH] = {0};
-    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
-        return PR_FALSE;
-    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll");
-    
-    HINSTANCE hInst; 
-    GetOutlookVersionFunc *doesExist = nsnull;
-    hInst = LoadLibrary(buffer); 
-    if (hInst == nsnull) 
-        return PR_FALSE;
-        
-    doesExist = (GetOutlookVersionFunc *) GetProcAddress (hInst, "GetOutlookVersion"); 
-    FreeLibrary(hInst); 
-
-    return (doesExist != nsnull); 
-} 
-
-typedef HRESULT (FAR PASCAL GetMapiDllVersion)(); 
-/**
- * Checks whether mapi32.dll is installed by this app. 
- * Returns TRUE if it is.
- */
-PRBool nsMapiRegistryUtils::isMozDll() 
-{ 
-    char buffer[MAX_PATH] = {0};
-    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
-        return PR_FALSE;
-    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll"); 
-
-    HINSTANCE hInst; 
-    GetMapiDllVersion *doesExist = nsnull;
-    hInst = LoadLibrary(buffer); 
-    if (hInst == nsnull) 
-        return PR_FALSE;
-        
-    doesExist = (GetMapiDllVersion *) GetProcAddress (hInst, "GetMapiDllVersion"); 
-    FreeLibrary(hInst); 
-
-    return (doesExist != nsnull); 
-} 
-
-/** Renames Mapi32.dl in system directory to Mapi32_moz_bak.dll
- *  copies the mozMapi32.dll from bin directory to the system directory
- */
-nsresult nsMapiRegistryUtils::CopyMozMapiToWinSysDir()
-{
-    nsresult rv;
-    char buffer[MAX_PATH] = {0};
-    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
-        return NS_ERROR_FAILURE;
-
-    nsCAutoString filePath(buffer);
-    filePath.Append("\\Mapi32_moz_bak.dll");
-
-    nsCOMPtr<nsILocalFile> pCurrentMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
-    if (NS_FAILED(rv) || !pCurrentMapiFile) return rv;        
-    pCurrentMapiFile->InitWithPath(filePath.get());
-
-    nsCOMPtr<nsIFile> pMozMapiFile;
-    nsCOMPtr<nsIProperties> directoryService =
-          do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
-    if (!directoryService) return NS_ERROR_FAILURE;
-    rv = directoryService->Get(NS_OS_CURRENT_PROCESS_DIR,
-                              NS_GET_IID(nsIFile),
-                              getter_AddRefs(pMozMapiFile));
-
-    if (NS_FAILED(rv)) return rv;
-    pMozMapiFile->Append("mozMapi32.dll");
-
-    PRBool bExist;
-    rv = pMozMapiFile->Exists(&bExist);
-    if (NS_FAILED(rv) || !bExist) return rv;
-
-    rv = pCurrentMapiFile->Exists(&bExist);
-    if (NS_SUCCEEDED(rv) && bExist)
-    {
-        rv = pCurrentMapiFile->Remove(PR_FALSE);
-    }
-    if (NS_FAILED(rv)) return rv;
-    filePath.Assign(buffer);
-    filePath.Append("\\Mapi32.dll");
-    pCurrentMapiFile->InitWithPath(filePath.get());
-    rv = pCurrentMapiFile->Exists(&bExist);
-    if (NS_SUCCEEDED(rv) && bExist)
-    {
-        rv = pCurrentMapiFile->MoveTo(nsnull, "Mapi32_moz_bak.dll");
-        if (NS_FAILED(rv)) return rv;
-        nsCAutoString fullFilePath(buffer);
-        fullFilePath.Append("\\Mapi32_moz_bak.dll");
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            "Software\\Mozilla\\Desktop", 
-                            "Mapi_backup_dll", 
-                            (char *)fullFilePath.get());
-        if (NS_FAILED(rv)) {
-             RestoreBackedUpMapiDll();
-             return rv;
-        }
-    }
-    
-    NS_NAMED_LITERAL_STRING(fileName, "Mapi32.dll");
-    filePath.Assign(buffer);
-    pCurrentMapiFile->InitWithPath(filePath.get());
-    rv = pMozMapiFile->CopyToUnicode(pCurrentMapiFile, fileName.get());
-    if (NS_FAILED(rv))
-        RestoreBackedUpMapiDll();
-    return rv;
-}
-
-/** deletes the Mapi32.dll in system directory and renames Mapi32_moz_bak.dll
- *  to Mapi32.dll
- */
-nsresult nsMapiRegistryUtils::RestoreBackedUpMapiDll()
-{
-    nsresult rv;
-    char buffer[MAX_PATH] = {0};
-    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
-        return NS_ERROR_FAILURE;
-
-    nsCAutoString filePath(buffer);
-    nsCAutoString previousFileName(buffer);
-    filePath.Append("\\Mapi32.dll");
-    previousFileName.Append("\\Mapi32_moz_bak.dll");
-
-    nsCOMPtr <nsILocalFile> pCurrentMapiFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
-    if (NS_FAILED(rv) || !pCurrentMapiFile) return NS_ERROR_FAILURE;        
-    pCurrentMapiFile->InitWithPath(filePath.get());
-    
-    nsCOMPtr<nsILocalFile> pPreviousMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
-    if (NS_FAILED(rv) || !pPreviousMapiFile) return NS_ERROR_FAILURE;       
-    pPreviousMapiFile->InitWithPath(previousFileName.get());
-
-    PRBool bExist;
-    rv = pCurrentMapiFile->Exists(&bExist);
-    if (NS_SUCCEEDED(rv) && bExist) {
-        rv = pCurrentMapiFile->Remove(PR_FALSE);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    rv = pPreviousMapiFile->Exists(&bExist);
-    if (NS_SUCCEEDED(rv) && bExist)
-        rv = pPreviousMapiFile->MoveTo(nsnull, "Mapi32.dll");
-    if (NS_SUCCEEDED(rv))
-        DeleteRegistryValue(HKEY_LOCAL_MACHINE,
-                            "Software\\Mozilla\\Desktop", 
-                            "Mapi_backup_dll");
-    return rv;
-}
-
-/** Sets Mozilla as default Mail Client
- */
-nsresult nsMapiRegistryUtils::setDefaultMailClient()
-{
-    nsresult rv;
-    nsresult mailKeySet=NS_ERROR_FAILURE;
-    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
-    if (!isSmartDll()) {
-        if (NS_FAILED(CopyMozMapiToWinSysDir())) return NS_ERROR_FAILURE;
-    }
-    rv = saveDefaultMailClient();
-    if (NS_FAILED(saveUserDefaultMailClient()) ||
-        NS_FAILED(rv)) return NS_ERROR_FAILURE;
-    nsCAutoString keyName("Software\\Clients\\Mail\\");
-
-    nsCAutoString appName (NS_ConvertUCS2toUTF8(brandName()).get());
-    if (!appName.IsEmpty()) {
-        keyName.Append(appName.get());
-
- nsCOMPtr<nsIStringBundle> bundle;
- rv = MakeMapiStringBundle (getter_AddRefs (bundle)) ;
- if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
- nsXPIDLString defaultMailTitle;
- const PRUnichar *keyValuePrefixStr[] = { brandName(), versionNo() };
- NS_NAMED_LITERAL_STRING(defaultMailTitleTag, "defaultMailDisplayTitle");
- rv = bundle->FormatStringFromName(defaultMailTitleTag.get(),
- keyValuePrefixStr, 2,
- getter_Copies(defaultMailTitle));
- if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                        keyName.get(), 
- "", NS_CONST_CAST(char *, NS_ConvertUCS2toUTF8(defaultMailTitle).get()) ) ; 
-    }
-    else
-        rv = NS_ERROR_FAILURE;
-    if (NS_SUCCEEDED(rv)) {
-        nsCAutoString thisApp (thisApplication()) ;
-        if (NS_FAILED(rv)) return rv ;
-
-        nsCAutoString dllPath (thisApp) ;
-        PRInt32 index = dllPath.RFind("\\");
-        if (index != kNotFound)
-            dllPath.Truncate(index + 1);
-        dllPath += "mozMapi32.dll";
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            keyName.get(), "DLLPath", 
-                            (char *)dllPath.get());
-        if (NS_SUCCEEDED(rv)) {
-            keyName.Append("\\protocols\\mailto");
-            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                keyName.get(), 
-                                "", "URL:MailTo Protocol");
-            if (NS_SUCCEEDED(rv)) {
-                nsCAutoString appPath (thisApp);
-                appPath += " \"%1\"";
-                keyName.Append("\\shell\\open\\command");
-                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                       keyName.get(), 
-                       "", (char *)appPath.get());
-                if (NS_SUCCEEDED(rv)) {
-                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                        "Software\\Clients\\Mail", 
-                                        "", (char *)appName.get());
-                }
-                if (NS_SUCCEEDED(rv)) {
-                    nsCAutoString mailAppPath(thisApp);
-                    mailAppPath += " -mail";
-                    nsCAutoString appKeyName ("Software\\Clients\\Mail\\");
-                    appKeyName.Append(appName.get());
-                    appKeyName.Append("\\shell\\open\\command");
-                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE,
-                                        appKeyName.get(),
-                                        "", (char *)mailAppPath.get());
-                }
-                if (NS_SUCCEEDED(rv)) {
-                    nsCAutoString iconPath(thisApp);
-                    iconPath += ",0";
-                    nsCAutoString iconKeyName ("Software\\Clients\\Mail\\");
-                    iconKeyName.Append(appName.get());
-                    iconKeyName.Append("\\DefaultIcon");
-                    mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE,
-                                        iconKeyName.get(),
-                                        "", (char *)iconPath.get());
-                }
-            }            
-        }
-    }
-
-    if (NS_SUCCEEDED(mailKeySet)) {
-        nsresult desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
-                                                "Software\\Clients\\Mail",
-                                                "", (char *)appName.get());
-        if (NS_SUCCEEDED(desktopKeySet)) {
-            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                           "Software\\Mozilla\\Desktop", 
-                                           "defaultMailHasBeenSet", "1");
-        }
-        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
-                     (LPARAM)"Software\\Clients\\Mail");
-        RegisterServer(CLSID_CMapiImp, "Mozilla MAPI", "mozMapi", "mozMapi.1");
-        return desktopKeySet;
-    }
-    
-    return mailKeySet;
-}
-
-/** Removes Mozilla as the default Mail client and restores the previous setting
- */
-nsresult nsMapiRegistryUtils::unsetDefaultMailClient() {
-    nsresult result = NS_OK;
-    nsresult mailKeySet = NS_ERROR_FAILURE;
-    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
-    if (!isSmartDll()) {
-        if (NS_FAILED(RestoreBackedUpMapiDll())) return NS_ERROR_FAILURE;
-    }
-    nsCAutoString name ;
-    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
-                                      "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", name);
-    nsCAutoString appName (NS_ConvertUCS2toUTF8(brandName()).get());
-
-    if (!name.IsEmpty() && !appName.IsEmpty() && name.Equals(appName)) {
-        nsCAutoString keyName("HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\");
-        keyName.Append(appName.get());
-        keyName.Append("\\protocols\\mailto\\shell\\open\\command");
-        nsCAutoString appPath ;
-        GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
-                        keyName.get(), appPath);
-        if (!appPath.IsEmpty()) {
-            keyName.Assign("Software\\Clients\\Mail\\");
-            keyName.Append(appName.get());
-            keyName.Append("\\protocols\\mailto\\shell\\open\\command");
-            result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                       keyName.get(), 
-                       "", (char *)appPath.get());
-            if (NS_SUCCEEDED(result)) {
-                PRInt32 index = appPath.RFind("\\");
-                if (index != kNotFound)
-                    appPath.Truncate(index + 1);
-                appPath += "mozMapi32.dll";
-                keyName.Assign("Software\\Clients\\Mail\\");
-                keyName.Append(appName.get());
-                result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                        keyName.get(), 
-                                        "DLLPath", (char *) appPath.get());
-            }
-        }
-    }
-    if (!name.IsEmpty()) {
-        if (NS_SUCCEEDED(result)) {
-            mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                "Software\\Clients\\Mail", 
-                                "", (char *)name.get());
-        }
-    }
-    else
-        mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                "Software\\Clients\\Mail", 
-                                "", "");
-
-    if (NS_SUCCEEDED(mailKeySet)) {
-        nsCAutoString userAppName ;
-        GetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                  "Software\\Mozilla\\Desktop", 
-                                  "HKEY_CURRENT_USER\\Software\\Clients\\Mail", userAppName);
-        nsresult desktopKeySet = NS_OK;
-        if (!userAppName.IsEmpty()) {
-            desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
-                                           "Software\\Clients\\Mail", 
-                                           "", (char *)userAppName.get());
-        }
-        else {
-            DeleteRegistryValue(HKEY_CURRENT_USER, "Software\\Clients\\Mail", "");
-        }
-        if (NS_SUCCEEDED(desktopKeySet)) {
-            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                           "Software\\Mozilla\\Desktop", 
-                                           "defaultMailHasBeenSet", "0");
-        }
-        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
-                     (LPARAM)"Software\\Clients\\Mail");
-        UnregisterServer(CLSID_CMapiImp, "mozMapi", "mozMapi.1");
-        return desktopKeySet;
-    }
-    return mailKeySet;
-}
-
-/** Returns FALSE if showMapiDialog is set to 0.
- *  Returns TRUE otherwise
- *  Also returns TRUE if the Mozilla has been set as the default mail client
- *  and some other application has changed that setting.
- *  This function gets called only if the current app is not the default mail
- *  client
- */
-PRBool nsMapiRegistryUtils::getShowDialog() {
-    PRBool rv = PR_FALSE;
-    nsCAutoString showDialog ;
-    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
-                                        "showMapiDialog", showDialog);
-    // if the user has not selected the checkbox, show dialog 
-    if (showDialog.IsEmpty() || showDialog.Equals("1"))
-            rv = PR_TRUE;
-
-    if (!rv) {
-        // even if the user has selected the checkbox
-        // show it if some other application has changed the 
-        // default setting.
-        nsCAutoString setMailDefault ;
-        GetRegistryKey(HKEY_LOCAL_MACHINE,"Software\\Mozilla\\Desktop", 
-                                       "defaultMailHasBeenSet", setMailDefault);
-        if (setMailDefault.Equals("1")) {
-            // need to reset the defaultMailHasBeenSet to "0"
-            // so that after the dialog is displayed once,
-            // we do not keep displaying this dialog after the user has
-            // selected the checkbox
-            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                "Software\\Mozilla\\Desktop", 
-                                "defaultMailHasBeenSet", "0");
-            rv = PR_TRUE;
-        }
-    }
-    return rv;
-}
-
-nsresult nsMapiRegistryUtils::MakeMapiStringBundle(nsIStringBundle ** aMapiStringBundle)
-{
-    nsresult rv = NS_OK ;
-
-    if (m_mapiStringBundle)
-    {
-        *aMapiStringBundle = m_mapiStringBundle ;
-        NS_ADDREF(*aMapiStringBundle);
-        return rv ;
-    }
-
-    nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
-                                     kStringBundleServiceCID, &rv));
-    if (NS_FAILED(rv) || !bundleService) return NS_ERROR_FAILURE;
-
-    rv = bundleService->CreateBundle(
- MAPI_PROPERTIES_CHROME,
-                    getter_AddRefs(m_mapiStringBundle));
-    if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
- NS_ADDREF(*aMapiStringBundle = m_mapiStringBundle) ;
-
-    return rv ;
-}
-
-nsresult nsMapiRegistryUtils::ShowMapiErrorDialog() 
-{
-    nsresult rv;
-    nsCOMPtr<nsIPromptService> promptService(do_GetService(
-                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
-    if (NS_SUCCEEDED(rv) && promptService)
-    {
-        nsCOMPtr<nsIStringBundle> bundle;
-        rv = MakeMapiStringBundle (getter_AddRefs (bundle)) ;
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        nsXPIDLString dialogTitle;
-        const PRUnichar *brandStrings[] = { brandName() };
-        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "errorMessageTitle");
-        rv = bundle->FormatStringFromName(dialogTitlePropertyTag.get(),
-                                          brandStrings, 1,
-                                          getter_Copies(dialogTitle));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        nsXPIDLString dialogText;
-        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "errorMessage");
-        rv = bundle->FormatStringFromName(dialogTextPropertyTag.get(),
-                                          brandStrings, 1,
-                                          getter_Copies(dialogText));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        rv = promptService->Alert(nsnull, dialogTitle,
-                                  dialogText);
-    }
-    return rv;
-}
-

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.h

@@ -1,112 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Srilatha Moturi <srilatha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsmapiregistryutils_h____
-#define nsmapiregistryutils_h____
-
-#include <windows.h>
-#include <string.h>
-#include <winreg.h>
-
-#include "Registry.h"
-#include "nsString.h"
-#include "nsIStringBundle.h"
-
-class nsMapiRegistryUtils
-{
-private :
-    nsCAutoString m_thisApp ;
-    nsAutoString m_brand ;
- nsAutoString m_versionNo ;
-
-    nsCOMPtr<nsIStringBundle> m_mapiStringBundle ;
-public :
-    nsMapiRegistryUtils() ;
-
-    // returns TRUE if the Mapi32.dll is smart dll.
-    PRBool isSmartDll();
-    // returns TRUE if the Mapi32.dll is a Mozilla dll.
-    PRBool isMozDll();
-
-    // Returns the (fully-qualified) name of this executable.
-    const char * thisApplication() ; 
-    // This returns the brand name for this application
-    const PRUnichar * brandName() ;
- // This returns the version no for this application
- const PRUnichar * versionNo() ;
-    // verifyRestrictedAccess - Returns PR_TRUE if this user only has restricted access
-    // to the registry keys we need to modify.
-    PRBool verifyRestrictedAccess() ;
-
-    // set the Windows registry key
-nsresult SetRegistryKey(HKEY baseKey, const char * keyName, 
-                        const char * valueName, char * value);
-    // delete a registry key
-nsresult DeleteRegistryValue(HKEY baseKey, const char * keyName, 
-                        const char * valueName);
-    // get a Windows registry key
-    void GetRegistryKey(HKEY baseKey, const char * keyName, 
-                         const char * valueName, nsCAutoString & value) ;
-
-    // Returns TRUE if the current application is default mail client.
-PRBool IsDefaultMailClient();
-    // Sets Mozilla as default Mail Client
-    nsresult setDefaultMailClient() ;
-    // Removes Mozilla as the default Mail client and restores the previous setting
-    nsresult unsetDefaultMailClient() ;
-
-    // Saves the current setting of the default Mail Client in 
-    // HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
-nsresult saveDefaultMailClient();
-    // Saves the current user setting of the default Mail Client in 
-    // HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
-nsresult saveUserDefaultMailClient();
-
-nsresult CopyMozMapiToWinSysDir();
-nsresult RestoreBackedUpMapiDll();
-
-    // Returns FALSE if showMapiDialog is set to 0.
-    PRBool getShowDialog() ;
-
-    // create a string bundle for MAPI messages
-    nsresult MakeMapiStringBundle(nsIStringBundle ** aMapiStringBundle) ;
-    // display an error dialog for MAPI messages
-    nsresult ShowMapiErrorDialog() ;
-
-} ;
-
-#endif

mozilla/mailnews/mapi/resources/content/contents.rdf

@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger-mapi"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger-mapi"
-        chrome:displayName="Messenger"
-        chrome:author="mozilla.org"
-        chrome:name="messenger-mapi"
-        chrome:localeVersion="0.9.7"
-		chrome:skinVersion="0.9.4">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
-  </RDF:Seq>
-
-  <!-- mapi items for Mail And Newsgroups preferences pane -->
-  <RDF:Seq about="chrome://messenger/content/pref-mailnews.xul">
-    <RDF:li>chrome://messenger-mapi/content/pref-mailnewsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>

mozilla/mailnews/mapi/resources/content/jar.mn

@@ -1,3 +0,0 @@
-messenger.jar:
-     content/messenger-mapi/pref-mailnewsOverlay.xul
-     content/messenger-mapi/contents.rdf                                

mozilla/mailnews/mapi/resources/content/overlays.rdf

@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:chrome="http://www.mozilla.org/rdf/chrome#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-
-   <!-- mapi items for mailnews preferences -->
-   <RDF:Seq about="urn:mozilla:overlays">
-     <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
-   </RDF:Seq>
-
-   <RDF:Seq about="chrome://messenger/content/pref-mailnews.xul">
-     <RDF:li>chrome://messenger/content/pref-mailnewsOverlay.xul</RDF:li>
-   </RDF:Seq>
-
-</RDF:RDF>

mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.js

@@ -1,104 +0,0 @@
-/* 
- * 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): 
- * Srilatha Moturi <srilatha@netscape.com>
- */
-
-function mailnewsOverlayStartup() {
-    mailnewsOverlayInit();
-    parent.hPrefWindow.registerOKCallbackFunc(onOK);
-    if (!("mapiPref" in parent)) {
-        parent.mapiPref = new Object;
-        parent.mapiPref.isDefaultMailClient = 
-               document.getElementById("mailnewsEnableMapi").checked;
-    }
-    else { 
-        // when we switch between different panes
-        // set the checkbox based on the saved state
-        var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
-        if (parent.mapiPref.isDefaultMailClient)
-            mailnewsEnableMapi.setAttribute("checked", "true");
-        else
-            mailnewsEnableMapi.setAttribute("checked", "false");
-    }
-}
-
-function mailnewsOverlayInit() {
-    try {
-        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
-                   getService( Components.interfaces.nsIMapiRegistry );
-    }
-    catch(ex){
-        mapiRegistry = null;
-    }
-
-    const prefbase = "system.windows.lock_ui.";
-    var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
-    if (mapiRegistry) {
-    // initialise preference component.
-    // While the data is coming from the system registry, we use a set
-    // of parallel preferences to indicate if the ui should be locked.
-        try { 
-            var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                          .getService()
-                          .QueryInterface(Components.interfaces.nsIPrefService);
-            var prefBranch = prefService.getBranch(prefbase);
-            if (prefBranch && prefBranch.prefIsLocked("default_mail_client")) {
-                if (prefBranch.getBoolPref("default_mail_client"))
-                    mapiRegistry.setDefaultMailClient();
-                else
-                    mapiRegistry.unsetDefaultMailClient();
-                mailnewsEnableMapi.setAttribute("disabled", "true");
-           }
-        }
-        catch(ex) {}
-        if (mapiRegistry.isDefaultMailClient)
-            mailnewsEnableMapi.setAttribute("checked", "true");
-        else
-            mailnewsEnableMapi.setAttribute("checked", "false");
-    }
-    else
-        mailnewsEnableMapi.setAttribute("disabled", "true");
-}
-
-function onEnableMapi() {
-    // save the state of the checkbox
-    if ("mapiPref" in parent)
-        parent.mapiPref.isDefaultMailClient = 
-               document.getElementById("mailnewsEnableMapi").checked;
-}
-
-function onOK()
-{
-    try {
-        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
-                   getService( Components.interfaces.nsIMapiRegistry );
-    }
-    catch(ex){
-        mapiRegistry = null;
-    }
-    if (mapiRegistry &&
-        ("mapiPref" in parent) && 
-        (mapiRegistry.isDefaultMailClient != parent.mapiPref.isDefaultMailClient)) { 
-        if (parent.mapiPref.isDefaultMailClient)
-            mapiRegistry.setDefaultMailClient();
-        else
-            mapiRegistry.unsetDefaultMailClient();
-    }  
-}

mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.xul

@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-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/
-
-oftware 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): 
-  Srilatha Moturi <srilatha@netscape.com>
--->
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % prefMailnewsOverlayDTD SYSTEM "chrome://messenger-mapi/locale/pref-mailnewsOverlay.dtd" >
-%prefMailnewsOverlayDTD;
-]>
-<overlay id="prefMailnewsOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<script type="application/x-javascript">
-  <![CDATA[
-      _elementIDs.push("mailnewsEnableMapi");
-  ]]>
-</script>         
-<script type="application/x-javascript" src="chrome://messenger-mapi/content/pref-mailnewsOverlay.js"/>
-<hbox autostretch="never" id="mapi">
-  <checkbox id="mailnewsEnableMapi" label="&enableMapi.label;"
-            accesskey="&enableMapi.accesskey;"
-	        preftype="bool" prefstring="mailnews.default_mail_client" prefattribute="checked"/>
-
-</hbox>
-</overlay> 

mozilla/mailnews/mapi/resources/locale/en-US/contents.rdf

@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:messenger-mapi"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:messenger-mapi"
-	chrome:localeVersion="0.9.7"/>
-</RDF:RDF>

mozilla/mailnews/mapi/resources/locale/en-US/jar.mn

@@ -1,4 +0,0 @@
-en-US.jar:
-     locale/en-US/messenger-mapi/pref-mailnewsOverlay.dtd
-     locale/en-US/messenger-mapi/mapi.properties
-     locale/en-US/messenger-mapi/contents.rdf

mozilla/mailnews/mapi/resources/locale/en-US/makefile.win

@@ -1,40 +0,0 @@
-#!nmake
-# 
-# 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): 
-# Srilatha Moturi <srilatha@netscape.com>
-# 
-
-DEPTH=..\..\..\..\..
-
-
-CHROME_DIR=locales\en-US
-CHROME_L10N_DIR=messenger\locale
-
-CHROME_L10N = \
-    .\pref-mailnewsOverlay.dtd \
-    .\mapi.properties \
-    .\contents.rdf  \
-    $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-chrome::
-   $(REGCHROME) locale en-US/messenger-mapi en-US.jar
-

mozilla/mailnews/mapi/resources/locale/en-US/mapi.properties

@@ -1,23 +0,0 @@
-# Mail Integration Dialog
-dialogTitle=%S Mail
-dialogText=Do you want to use %S as the default mail application? 
-checkboxText=Do not display this dialog again
-
-# MAPI Messages
-loginText=Please enter your password for %S:
-loginTextwithName=Please enter your username and password 
-loginTitle=%S Mail
-PasswordTitle=%S Mail
-
-# MAPI Error Messages
-errorMessage=%S Mail could not be set as the default mail application because a registry key could not be updated. Verify with your system administrator that you have write access to your system registry, and then try again.
-errorMessageTitle=%S Mail
-
-# MAPI Security Messages
-mapiBlindSendWarning=Another application is attempting to send mail using your user profile. Are you sure you want to send mail?
-mapiBlindSendDontShowAgain=Warn me whenever other applications try to send mail from me
-
-#Default Mail Display String
-# localization note, $1%S is the app name, $2%S is the version 
-defaultMailDisplayTitle=%S %S Mail
-

mozilla/mailnews/mapi/resources/locale/en-US/pref-mailnewsOverlay.dtd

@@ -1,3 +0,0 @@
-<!ENTITY enableMapiTitle.label        "When sending mail from other applications">
-<!ENTITY enableMapi.label             "Use &vendorShortName; Mail as the default mail application.">
-<!ENTITY enableMapi.accesskey         "u">

mozilla/security/Makefile.in

@@ -1,28 +1,31 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
+#
+# The contents of this file are subject to the Netscape 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/
-# 
+# the License at http://www.mozilla.org/NPL/
+#
 # 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
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
-# 
+#
 # Contributor(s): 
-# Srilatha Moturi <srilatha@netscape.com>
 #
 
-DEPTH=..\..\..\..
+DEPTH		= ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
-DIRS=en-US
+include $(DEPTH)/config/autoconf.mk
 
-include <$(DEPTH)\config\rules.mak>
+DIRS		= psm
+
+include $(topsrcdir)/config/rules.mk

mozilla/security/psm/Makefile

@@ -0,0 +1,88 @@
+#! gmake
+#
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+
+psm_RelEng_srvr_bld:
+	cd ../coreconf; gmake
+	cd ../../nsprpub; $(MAKE) OBJDIR_NAME=$(OBJDIR_NAME)
+	cd ../nss; gmake import IMPORTS=dbm/DBM_1_54
+	cd ../nss; gmake 
+ifeq ($(OS_ARCH), WINNT)
+	gmake import IMPORTS=nlslayer/m16
+else
+	gmake import IMPORTS=nlslayer/PR3 RELEASE_TREE=/h/tortoise/export/share/builds/components
+endif
+	cd ui;gmake
+	gmake
+	cd server;gmake build_xpi
+

mozilla/security/psm/Makefile.in

@@ -0,0 +1,118 @@
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+
+CORE_DEPTH=$(topsrcdir)/security
+
+include $(CORE_DEPTH)/coreconf/arch.mk
+ifeq (,$(filter-out NetBSD,$(OS_TARGET)))
+include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
+else
+include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
+endif
+include $(CORE_DEPTH)/coreconf/prefix.mk
+CPU_TAG = _$(CPU_ARCH)
+LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+CORECONF_OBJDIR=$(OBJDIR_NAME)
+
+include $(DEPTH)/config/autoconf.mk
+
+ifndef MOZ_DEBUG
+OPT_GMAKE_FLAGS = BUILD_OPT=1
+BUILD_OPT=1
+OBJDIR_TAG=_OPT
+endif
+
+DEFAULT_GMAKE_FLAGS = -f Makefile $(OPT_GMAKE_FLAGS) 
+
+CORECONF_INSTALL     = $(DIST)/$(CORECONF_OBJDIR)
+CORECONF_DIST        = $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR)
+DEFAULT_GMAKE_FLAGS += DIST=$(CORECONF_DIST) 
+DEFAULT_GMAKE_FLAGS += SOURCE_LIB_DIR=$(CORECONF_DIST)/lib
+DEFAULT_GMAKE_FLAGS += SOURCE_BIN_DIR=$(CORECONF_DIST)/bin
+DEFAULT_GMAKE_FLAGS += SOURCE_XP_DIR=$(CORECONF_DIST)
+
+
+DIRS		= lib
+
+include $(topsrcdir)/config/rules.mk
+
+ABS_topsrcdir	:= $(shell cd $(topsrcdir); pwd)
+
+install::
+ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
+	if test ! -d $(MOZ_BUILD_ROOT)/security/nss; then                   \
+		cp -r $(topsrcdir)/security/nss $(MOZ_BUILD_ROOT)/security; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/coreconf; then              \
+		cp -r $(topsrcdir)/security/coreconf $(MOZ_BUILD_ROOT)/security; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/server; then            \
+		cp -r $(topsrcdir)/security/psm/server $(MOZ_BUILD_ROOT)/security/psm/server; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/ui; then        \
+		cp -r $(topsrcdir)/security/psm/ui $(MOZ_BUILD_ROOT)/security/psm/; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/doc; then       \
+		cp -r $(topsrcdir)/security/psm/doc $(MOZ_BUILD_ROOT)/security/psm/; \
+	fi;
+endif
+	cd $(MOZ_BUILD_ROOT)/security/coreconf; gmake $(DEFAULT_GMAKE_FLAGS)
+	cd $(MOZ_BUILD_ROOT)/security/nss; gmake $(DEFAULT_GMAKE_FLAGS) moz_import
+	cd $(MOZ_BUILD_ROOT)/security/nss/lib; gmake $(DEFAULT_GMAKE_FLAGS)
+	cd $(MOZ_BUILD_ROOT)/security/psm/ui; gmake $(DEFAULT_GMAKE_FLAGS)
+	cd $(MOZ_BUILD_ROOT)/security/psm/server; gmake $(DEFAULT_GMAKE_FLAGS)
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psm $(DIST)/bin/
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata $(DIST)/bin
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/start-psm $(DIST)/bin
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+
+clean clobber clobber_all realclean distclean::
+ifeq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
+	cd $(MOZ_BUILD_ROOT)/security/coreconf; gmake $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/nss; gmake $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/psm/ui; gmake $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/psm/server; gmake $(DEFAULT_GMAKE_FLAGS) clean
+else
+	if test -d $(MOZ_BUILD_ROOT)/security/nss; then \
+		rm -rf $(MOZ_BUILD_ROOT)/security/nss;  \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/coreconf; then    \
+		rm -rf $(MOZ_BUILD_ROOT)/security/coreconf;     \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/psm/server; then  \
+		rm -rf $(MOZ_BUILD_ROOT)/security/psm/server;   \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/psm/ui; then      \
+		rm -rf $(MOZ_BUILD_ROOT)/security/psm/ui;       \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/psm/doc; then     \
+		rm -rf $(MOZ_BUILD_ROOT)/security/psm/doc;      \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR); then      \
+		rm -rf $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR);       \
+	fi;
+endif

mozilla/security/psm/doc/cmcjavascriptapi.html

@@ -0,0 +1,494 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
+   <title>Javascript API for Client Certificate Management</title>
+</head>
+<body>
+<h2><font face="Arial,Helvetica">Netscape Personal Security Manager</font></h2>
+
+<h2><font face="Arial,Helvetica">JavaScript API for Client Certificate Management</font></h2>
+
+Version 0.3 - 10/27/1999
+<br>Comments to: <a href="mailto:psmfeedback@netscape.com?subject=JavaScript%20API%20Feedback">psmfeedback@netscape.com</a>
+<p>This document describes a new JavaScript API for performing user certificate
+management operations within a client. The JavaScript runs in the context
+of a web page operated by a Certificate Authority (CA) or Registration
+Authority (RA). The API allows the CA or RA to instruct the client to perform
+PKI operations such as key generation, certificate request generation,
+key escrow, import of user certificates, key recovery, and revocation requests.
+<p>These properties and methods reflect behavior currently implemented
+in Personal Security Manager 1.0.
+<p>The messages imported by or generated by these JavaScript methods are
+defined in the CRMF, CMMF, and CMC internet drafts.
+<h2>
+<font face="Arial,Helvetica">Overview of New Cert Issuing Process</font></h2>
+
+<ol>
+<li>
+User fills out enrollment form</li>
+
+<li>
+User action initiates script</li>
+
+<li>
+Script calls key generation method</li>
+
+<li>
+Signing and Encryption keys are generated</li>
+
+<li>
+Encryption Private Key is wrapped with public key of Key Recovery Authority
+(KRA) (passed in in the form of a certificate as part of the script, and
+checked against a pre-installed certificate copy in the local certificate
+database)</li>
+
+<li>
+The public keys, wrapped encryption private key, and text string from the
+script (possibly containing naming or enrollment info) are signed by the
+user</li>
+
+<li>
+Signed blob is returned to the script</li>
+
+<li>
+Script submits signed blob and any other necessary info to the CA/RA</li>
+
+<li>
+CA/RA verifies signature on signed blob</li>
+
+<li>
+CA/RA validates identity of user</li>
+
+<li>
+CA/RA sends wrapped encryption private key to KRA</li>
+
+<li>
+KRA sends escrow verification back to CA</li>
+
+<li>
+CA creates and signs certificates</li>
+
+<li>
+CA sends certificates back to Communicator</li>
+</ol>
+
+<h2>
+<font face="Arial,Helvetica">JavaScript API</font></h2>
+
+<h3>
+<font face="Arial,Helvetica">Properties</font></h3>
+<tt>crypto.algorithms.dh.keySizes</tt>
+<br><tt>crypto.algorithms.dsa.keySizes</tt>
+<br><tt>crypto.algorithms.rsa.signing.keySizes</tt>
+<br><tt>crypto.algorithms.rsa.keyEx.keySizes</tt>
+<p><tt>keySizes</tt> is an an array that describes the available key sizes
+for the particular algorithms and operations.
+<p>The table below describes the key sizes that will be supported in the
+US and Export versions of Communicator.
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Algorithm</b></td>
+
+<td ALIGN=CENTER><b>US Version Key Sizes</b></td>
+
+<td ALIGN=CENTER><b>Export Version Key Sizes</b></td>
+</tr>
+
+<tr>
+<td>DSA Signing Only</td>
+
+<td>1024, 2048</td>
+
+<td>1024, 2048</td>
+</tr>
+
+<tr>
+<td>RSA Signing Only</td>
+
+<td>1024, 2048</td>
+
+<td>1024, 2048</td>
+</tr>
+
+<tr>
+<td>RSA Encryption Only</td>
+
+<td>1024, 2048</td>
+
+<td>512,1024</td>
+</tr>
+
+<tr>
+<td>RSA Dual Use Signing And Encryption</td>
+
+<td>1024, 2048</td>
+
+<td>512,1024</td>
+</tr>
+
+<tr>
+<td>DH Key Exchange</td>
+
+<td>1024, 2048</td>
+
+<td>512,1024</td>
+</tr>
+</table>
+
+<h3>
+<font face="Arial,Helvetica">Methods</font></h3>
+
+<h4>
+<font face="Arial,Helvetica">generateCRMFRequest()</font></h4>
+<tt>crmfObject = crypto.generateCRMFRequest(<i>"requestedDN", "regToken",
+"authenticator","escrowAuthorityCert", "KeyGen Done Code",keySize1, "keyParams1",
+"keyGenAlg1",..., keySizeN, "keyParamsN", "keyGenAlgN");</i></tt>
+<p>This method will generate a sequence of CRMF requests that has N requests.&nbsp;
+One request for each key pair that is generated.&nbsp; The first three
+parameters will be applied to every request.&nbsp; the "escrowAuthorityCert"
+parameter will only be used for requests that pertain to a key that is
+being escrowed.&nbsp; After the "escrowAuthorityCert" parameter, the method
+takes some JavaScript code that&nbsp; is invoked when the CRMF request
+is ready. Finally, there are 1 or more sets of key generation arguments.&nbsp;
+Each key generation will be associated with its own request.&nbsp; All
+the requests will have the same DN.
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER VALIGN=TOP><b>Argument</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td><i><tt>"requestedDN"</tt></i></td>
+
+<td>An RFC1485 formatted DN to include in the certificate request.</td>
+</tr>
+
+<tr>
+<td><i><tt>"regToken"</tt></i></td>
+
+<td>A value used to authenticate the user to the RA/CA.</td>
+</tr>
+
+<tr>
+<td><i><tt>"authenticator"</tt></i></td>
+
+<td>A value that the user can authenticate with in the future when their
+private key is not available. Can be used for key recovery or revocation
+requests.</td>
+</tr>
+
+<tr>
+<td><i><tt>"escrowAuthorityCert"</tt></i></td>
+
+<td>If this value is NULL, then no key escrow will be performed. This value
+specifies which KRA certificate should be used to wrap the private key
+being escrowed. The user will be prompted for confirmation whenever a key
+will be escrowed.&nbsp; Only key exchange keys will be escrowed. If a dual
+use key is being generated, it will not be escrowed.&nbsp; The value of
+this argument is a base-64 encoded certificate.</td>
+</tr>
+
+<tr>
+<td><i><tt>"CRMF Generation Done Code"</tt></i></td>
+
+<td>This parameter is JavaScript to execute when the CRMF generation is
+complete.&nbsp;</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>keySizeN</tt></i></td>
+
+<td>The size in bits of the Nth key to generate</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"keyParamsN"</tt></i></td>
+
+<td>This string is an optional algorithm dependent parameter value. For
+Diffie-Hellman it is used to specify p and g parameters.&nbsp; For DSA,
+it will be used to specify pqg. If the key generation requires parameters
+and the value passed in is NULL, then the client will generate the parameters
+on its own. Currently, this value is ignored.</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"keyGenAlgN"</tt></i></td>
+
+<td>Which algorithm the generated key will support. Acceptable values are
+(the mentioned values for keyUsage pertain to the keyUsage value of the
+Certificate Extension that will ultimately be in the issued certificate):&nbsp;
+<ul>
+<li>
+"rsa-ex" - generate an RSA key for key exchange only (This will have keyEncipherment
+set for keyUsage.)</li>
+
+<li>
+"rsa-dual-use" - generate a single RSA key for both signing and encryption.&nbsp;
+(This will have digitalSignature, keyEncipherment, and nonRepudiation set
+for keyUsage.)</li>
+
+<li>
+"rsa-sign" - generate an RSA key for signing only. (This will have digitalSignature
+set for keyUsage.)</li>
+
+<li>
+"rsa-nonrepudiation" - generate a single RSA key for nonRepudiation only.
+(This will have non-repudiation set for keyUsage.)</li>
+
+<li>
+"rsa-sign-nonrepudiation" - generate a single RSA key use for both signing
+and nonRepudiation. (This will have both digitalSignature and nonRepudiation
+set for keyUsage.)</li>
+
+<li>
+"dsa-sign" - generate a single DSA key for signing only. (This will have
+digitalSignature set for keyUsage.)</li>
+
+<li>
+"dsa-nonrepudiation" - generate a single DSA key for nonRepudiation. (This
+will have nonRepudiation set for keyUsage.)</li>
+
+<li>
+"dsa-sign-nonrepudiation" - generate a single DSA key for signing and non-repudiation.
+(This will have digitalSignature and nonRepudiation set for keyUsage.)</li>
+</ul>
+</td>
+</tr>
+</table>
+
+<p>The <b>generateCRMFRequest()</b> method will cause the user to be presented
+with a key generation dialog. The dialog describes the key generation process
+and gives the user the opportunity to cancel the operation.
+<p>The method <b>generateCRMFRequest() </b>will return an instance of a
+CRMF object. The JavaScript passed in as the <i><tt>"CRMF Generation Done
+Code"</tt></i> parameter should look at the attribute <i>request </i>of
+the returned object to get the result of the CRMF generation.
+<p>The string found by accessing <i><tt>crmfObject.request</tt></i> is
+the base-64 encoded CRMF message to be sent to the CA/RA, or an error string.
+The possible error strings are:
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Error String</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td>"error:invalidParameter:XXX"</td>
+
+<td>The parameter XXX was an invalid value.</td>
+</tr>
+
+<tr>
+<td>"error:userCancel"</td>
+
+<td>the user has canceled the key generation operation</td>
+</tr>
+
+<tr>
+<td>"error:internalError"</td>
+
+<td>the software encountered some internal error, such as out of memory</td>
+</tr>
+</table>
+
+<h4>
+<font face="Arial,Helvetica">importUserCertificates()</font></h4>
+<tt><i>resultString</i> = crypto.importUserCertificates(<i>"nicknameString"</i>,
+<i>"certString"</i>,
+<i>allowBackup</i>)</tt>
+<br>&nbsp;
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Argument</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"nicknameString"</tt></i></td>
+
+<td>This is the nickname that will be used to describe the certificate
+in the client's certificate management UI.&nbsp; It should serve to uniquely
+identify the certificate to the user. For example, "John Smith's VeriSign
+Class 3 Digital ID" or "John Smith's Ford ID Certificate". However, if
+this certificate has the same DN as one or more certificates that already
+exist in the user's certificate store, the nickname associated with the
+certificate(s) of the same DN in the certificate store is used, and the
+<tt>"nicknameString"</tt> parameter is ignored. If the string is null and
+no certificate with the same DN exists in the user's certificate store,
+Personal Security Manager uses the following pattern to derive the nickname:
+<tt>&lt;Common Name>'s &lt;Issuer Name> ID</tt>.</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"certRepString"</tt></i></td>
+
+<td>This string is the CMMF Certification Response from the CA that contains
+the user's certificate(s). The response is base-64 encoded.</td>
+</tr>
+
+<tr>
+<td><i><tt>allowBackup</tt></i></td>
+
+<td>This is a Boolean argument. It allows the CA or RA to indicate to the
+client whether to force the user to back up a newly issued certificate
+(PKCS #12).</td>
+</tr>
+</table>
+
+<p>The <b>importUserCertificates()</b> method is used to import newly issued
+certificates for the user. The private key for the certificates must already
+reside in the user's personal private key database.
+<p>The request ID in the response being imported must match the request
+ID in the associated Certification Request or Recovery Request.
+<p>If the import operation succeeds, an empty string will be returned.&nbsp;
+If it fails, one of the following error strings will be returned:
+<br>&nbsp;
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Error String</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td>"error:userCancel"</td>
+
+<td>The user canceled the import operation</td>
+</tr>
+
+<tr>
+<td>"error:invalidCertificate"</td>
+
+<td>One of the certificate packages was incorrectly formatted</td>
+</tr>
+
+<tr>
+<td>"error:internalError"</td>
+
+<td>The software encountered some internal error, such as out of memory</td>
+</tr>
+
+<tr>
+<td>"error:invalidRequestID"</td>
+
+<td>The request ID in the response message does not match any outstanding
+request</td>
+</tr>
+</table>
+
+<h4>
+<font face="Arial,Helvetica">popChallengeResponse()</font></h4>
+<tt><i>resultString</i> = crypto.popChallengeResponse(<i>"challengeString"</i>);</tt>
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER VALIGN=TOP><b>Argument</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"challengeString"</tt></i></td>
+
+<td>A base-64 encoded CMMF POPODecKeyChallContent message. The current
+implementation does not conform to that defined in the CMMF draft, and
+we intend to change this implementation to that defined in the CMC RFC..
+See below for the current implementation.</td>
+</tr>
+</table>
+
+<p>The resultString will either be a base-64 encoded POPODecKeyRespContent
+message, or one of the following error strings:
+<br>&nbsp;
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Error String</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td>"error:invalidParameter:XXX"</td>
+
+<td>The parameter XXX was an invalid value.</td>
+</tr>
+
+<tr>
+<td>"error:internalError"</td>
+
+<td>the software encountered some internal error, such as out of memory</td>
+</tr>
+</table>
+
+<p><b>Challenge-Response Proof Of Possession</b>
+<p><tt>Expected Input:</tt>
+<p><tt>POPODecKeyChallContent ::= SEQUENCE OF Challenge</tt>
+<br><tt>&nbsp;&nbsp;&nbsp; -- One Challenge per encryption key certification
+request (in the</tt>
+<br><tt>&nbsp;&nbsp;&nbsp; -- same order as these requests appear in FullCertTemplates).</tt>
+<p><tt>Challenge ::= SEQUENCE {</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; owf&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+AlgorithmIdentifier&nbsp; OPTIONAL,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- MUST be present in the first
+Challenge; MAY be omitted in any</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- subsequent Challenge in POPODecKeyChallContent
+(if omitted,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- then the owf used in the immediately
+preceding Challenge is</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- to be used).</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; witness&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+OCTET STRING,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the result of applying the one-way
+function (owf) to a</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- randomly-generated INTEGER, A.&nbsp;
+[Note that a different</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- INTEGER MUST be used for each
+Challenge.]</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; sender&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+GeneralName,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the name of the sender.</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; key&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+OCTET STRING,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the public key used to encrypt
+the challenge.&nbsp; This will allow</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the client to find the appropriate
+key to do the decryption.</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; challenge&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+OCTET STRING</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the encryption (under the public
+key for which the cert.</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- request is being made) of Rand,
+where Rand is specified as</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp; Rand ::= SEQUENCE
+{</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; INTEGER,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+- the randomly-generated INTEGER A (above)</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+senderHash&nbsp; OCTET STRING</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+- the result of applying the one-way function (owf) to</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+- the sender's general name</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp; }</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the size of "int" must be small
+enough such that "Rand" can be</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- contained within a single PKCS
+#1 encryption block.</tt>
+<br><tt>&nbsp; }</tt>
+<p>&copy; Copyright 1999 Netscape Communications Corporation
+</body>
+</html>

mozilla/security/psm/doc/contents.htm

@@ -0,0 +1,171 @@
+<html><head>
+<title></title>
+
+</HEAD>
+
+
+<FONT FACE="arial, helvetica, sans-serif"  size="-1">
+<a name="TOP">
+<IMG SRC="cartbanner.gif" WIDTH="432" HEIGHT="36" HSPACE="0" VSPACE="0">
+<table bgcolor="#cccccc" width="100%">
+<tr><td><IMG SRC="w.gif" WIDTH=1 HEIGHT=3 BORDER=0></td></tr>
+</table>
+<BR><BR>
+
+
+
+<TABLE CELLPADDING=5 CELLSPACING=2 border=0>
+<TR>
+
+<TD> <a href="help.htm">Next<IMG SRC="next.gif" WIDTH=16 
+
+HEIGHT=14 ALIGN="texttop" BORDER=0></a></FONT></TD>   
+<TD BGCOLOR="#FFFFFF"><a href="contents.htm">Topics</a></FONT></TD>
+
+
+</TR>
+</TABLE>
+</TD></TR> 
+</TABLE>
+
+<BR> <BR>
+
+</a>
+</DIV>
+
+</P>
+<h1>Contents</h1>
+
+<B><a href="help.htm#1024926"> 	
+</B> </A> <p>
+<p><b>
+<a href="help.htm#1057187">
+ Introduction to Personal Security Manager 	
+</a></b><br><DD>
+
+<a href="help.htm#1044573">
+ About Personal Security Manager Help 	
+</a><br><DD>
+
+<a href="help.htm#1043598">
+ What You Can Do with Personal Security Manager 	
+</a><br><DD>
+
+<a href="help.htm#1026014">
+ Understanding Network Security 	
+</a><br>
+<p><b>
+<a href="help.htm#1045279">
+ Information Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1041627">
+ Information About Web Pages 	
+</a><br><DD>
+
+<a href="help.htm#1046060">
+ Information About Stored Email Messages 	
+</a><br><DD>
+
+<a href="help.htm#1046671">
+ Information About Email Messages You Are Composing 	
+</a><br>
+<p><b>
+<a href="help.htm#1030083">
+ Applications Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1030967">
+ Navigator 	
+</a><br><DD>
+
+<a href="help.htm#1031452">
+ Messenger 	
+</a><br><DD>
+
+<a href="help.htm#1031152">
+ Java/JavaScript 	
+</a><br>
+<p><b>
+<a href="help.htm#1030743">
+ Certificates Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1047547">
+ Certificates&#151;Mine 	
+</a><br><DD>
+
+<a href="help.htm#1031428">
+ Certificates&#151;Others 	
+</a><br><DD>
+
+<a href="help.htm#1031432">
+ Certificates&#151;Web Sites 	
+</a><br><DD>
+
+<a href="help.htm#1031434">
+ Certificates&#151;Authorities 	
+</a><br>
+<p><b>
+<a href="help.htm#1036138">
+ Advanced Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1036162">
+ Modules 	
+</a><br><DD>
+
+<a href="help.htm#1036164">
+ Options 	
+</a><br>
+<p><b>
+<a href="help.htm#1056728">
+ Other Personal Security Manager Windows 	
+</a></b><br><DD>
+
+<a href="help.htm#1055385">
+ Certificate Information 	
+</a><br><DD>
+
+<a href="help.htm#1035650">
+ Choose Security Device 	
+</a><br><DD>
+
+<a href="help.htm#1041171">
+ Enrollment Information 	
+</a><br><DD>
+
+<a href="help.htm#1055232">
+ Certificate Renewal 	
+</a><br><DD>
+
+<a href="help.htm#1041200">
+ Choosing a Certificate 	
+</a><br><DD>
+
+<a href="help.htm#1036401">
+ New Certificate Authority 	
+</a><br><DD>
+
+<a href="help.htm#1041248">
+ Web Site Certificates 	
+</a><br><DD>
+
+<a href="help.htm#1036488">
+ Request for Signature 	
+</a><br><FONT FACE="sans-Serif" SIZE=+1>&nbsp;<BR>
+<a href="glossary.htm#996904">
+Glossary 	
+</a>
+</A> </FONT>
+
+<BR><BR><BR>
+
+&copy; Copyright 2000 Netscape Communications Corporation
+</FONT> </CENTER>
+
+<BR>
+
+</BODY>
+
+</HTML>

mozilla/security/psm/doc/glossary.htm

@@ -0,0 +1,417 @@
+<html><head>
+<title></title>
+
+<script languag=javascript> 
+
+  <!-- 
+  if (typeof(crypto.disableRightClick) == "function") { 
+      crypto.disableRightClick(); 
+  } 
+  // --> 
+
+</script>
+</HEAD>
+
+<FONT FACE="arial, helvetica, sans-serif" size="-1">
+<a name="TOP">
+
+<IMG SRC="cartbanner.gif" WIDTH="432" HEIGHT="36" HSPACE="0" VSPACE="0">
+<table bgcolor="#cccccc" width="100%">
+<tr><td><IMG SRC="w.gif" WIDTH=1 HEIGHT=3 BORDER=0></td></tr>
+</table>
+
+<BR><BR>
+<TABLE CELLPADDING=5 CELLSPACING=2 border=0>
+<TR><TD BGCOLOR="#FFFFFF"><a href="help.htm"><IMG SRC="prev.gif" WIDTH=16 
+
+HEIGHT=14 ALIGN="texttop" BORDER=0>Previous</a>
+  </TD>
+
+ 
+<TD BGCOLOR="#FFFFFF"><a href="contents.htm">Topics</a></TD>
+
+
+</TR>
+</TABLE>
+
+<BR> <BR>
+
+</a>
+</DIV>
+
+</P>
+<h1><A NAME="
+"></A><A NAME="996904">
+Glossary 
+</A></h1><dl>
+<A NAME="authentication"></A><A NAME="998782">
+<B>authentication.</B>&nbsp;
+</A><A NAME="1013907">
+Assurance that a party to a computerized transaction is not an impostor. Authentication typically involves the use of a password, certificate, personal identification number (PIN), or other information that can be used to validate identity over a computer network. See also <a href="glossary.htm#1014123">password-based authentication</a>, <a href="glossary.htm#1018581">certificate-based authentication</a>, <a href="glossary.htm#1021054">client authentication</a>, <a href="glossary.htm#1031070">server authentication</a>.<P>
+</A>
+<A NAME="CA"></A><A NAME="1021395">
+<B>CA.</B>&nbsp;
+</A><A NAME="1021418">
+See <a href="glossary.htm#1020903"></a><a href="glossary.htm#1020903">certificate authority (CA)</a>.<P>
+</A>
+<A NAME="CA certificate"></A><A NAME="1017503">
+<B>CA certificate.</B>&nbsp;
+</A><A NAME="1017507">
+A certificate that identifies a certificate authority. See also <a href="glossary.htm#1020903">certificate authority (CA)</a>, <a href="glossary.htm#999541">subordinate CA</a>, <a href="glossary.htm#1015631">root CA</a>.<P>
+</A>
+<A NAME="certificate"></A><A NAME="1018895">
+<B>certificate.</B>&nbsp;
+</A><A NAME="1018896">
+The digital equivalent of an ID card. A certificate specifies the name of an individual, company, or other entity and certifies that a public key, which is included in the certificate, belongs to that entity. When you digitally sign a message or other data, the digital signature for that message is created with the aid of the private key that corresponds to the public key in your certificate. A certificate is issued and digitally signed by a <a href="glossary.htm#1020903">certificate authority (CA)</a>. A certificate's validity can be verified by checking the CA's <a href="glossary.htm#1013995">digital signature</a>. Also called digital ID, digital passport, public-key certificate X.509 certificate, and security certificate. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="certificate authority (CA)"></A><A NAME="1020903">
+<B>certificate authority (CA).</B>&nbsp;
+</A><A NAME="1020904">
+A service that issues a certificate after verifying the identity of the person or entity the certificate is intended to identify. A CA also renews and revokes certificates and generates a list of revoked certificates at regular intervals. CAs can be independent vendors (such as the CAs listed at <a href= "https://certs.netscape.com/client.html" TARGET="_blank">Certificate Authority Services</a>) or a person or organization using certificate-issuing server software (such as Netscape Certificate Management System). See also <a href="glossary.htm#1018895">certificate</a>, <a href="glossary.htm#1019940">certificate revocation list (CRL)</a>.<P>
+</A>
+<A NAME="certificate-based authentication"></A><A NAME="1018581">
+<B>certificate-based authentication.</B>&nbsp;
+</A><A NAME="1018582">
+Verification of identity based on certificates and public-key cryptography. See also <a href="glossary.htm#1014123">password-based authentication</a>.<P>
+</A>
+<A NAME="certificate chain"></A><A NAME="1018500">
+<B>certificate chain.</B>&nbsp;
+</A><A NAME="1019929">
+A hierarchical series of certificates signed by successive certificate authorities. A CA certificate identifies a <a href="glossary.htm#1020903">certificate authority (CA)</a> and is used to sign certificates issued by that authority. A CA certificate can in turn be signed by the CA certificate of a parent CA and so on up to a <a href="glossary.htm#1015631">root CA</a>. <P>
+</A>
+<A NAME="certificate fingerprint"></A><A NAME="1020297">
+<B>certificate fingerprint.</B>&nbsp;
+</A><A NAME="1020326">
+A unique number associated with a certificate. The number is not part of the certificate itself but is produced by applying a mathematical function to the contents of the certificate. If the contents of the certificate change, even by a single character, the function produces a different number. Certificate fingerprints can therefore be used to verify that certificates have not been tampered with.<P>
+</A>
+<A NAME="certificate renewal"></A><A NAME="1031319">
+<B>certificate renewal.</B>&nbsp;
+</A><A NAME="1031323">
+The process of renewing a <a href="glossary.htm#1018895">certificate</a> that is about to expire.<P>
+</A>
+<A NAME="certificate revocation list (CRL)"></A><A NAME="1019940">
+<B>certificate revocation list (CRL).</B>&nbsp;
+</A><A NAME="1021047">
+A list of revoked certificates that is generated and signed by a <a href="glossary.htm#1020903">certificate authority (CA)</a>. You can download the latest CRL to your browser or to a server, then check against it to make sure that certificates are still valid before permitting their use for authentication. <P>
+</A>
+<A NAME="certificate store"></A><A NAME="1023462">
+<B>certificate store.</B>&nbsp;
+</A><A NAME="1032978">
+The collection of certificates, or electronic IDs, maintained by Personal Security Manager on your behalf. These include your own certificates stored on one or more security devices, other people's certificates, web site certificates, and <a href="glossary.htm#1020903"></a>CA certificates. See also <a href="glossary.htm#1020903">certificate authority (CA)</a>, <a href="glossary.htm#1018895">certificate</a>, <a href="glossary.htm#1028962">security device</a>.<P>
+</A>
+<A NAME="certificate verification"></A><A NAME="1025527">
+<B>certificate verification.</B>&nbsp;
+</A><A NAME="1025531">
+When Personal Security Manager verifies a certificate, it confirms that the digital signature was created by a CA whose own CA certificate is both present in the certificate store and marked as trusted for issuing that kind of certificate. It also confirms that the certificate being verified has not been marked as untrusted in the certificate store. Finally, if the <a href="glossary.htm#1029304">Online Certificate Status Protocol (OCSP)</a> has been activated (from the Options panel under the Advanced tab), Personal Security Manager also performs an on-line check. It does so by looking up the certificate in a list of valid certificates maintained at a URL that is specified either in the certificate itself or in the OCSP Settings window. If any of these checks fail, Personal Security Manager marks the certificate as unverified and won't recognize the identity it certifies.<P>
+</A>
+<A NAME="cipher"></A><A NAME="1021048">
+<B>cipher.</B>&nbsp;
+</A><A NAME="1021052">
+See <a href="glossary.htm#1019976">cryptographic algorithm</a>.<P>
+</A>
+<A NAME="client"></A><A NAME="1029510">
+<B>client.</B>&nbsp;
+</A><A NAME="1029547">
+Software (such as browser software) that sends requests to and receives information from a <a href="glossary.htm#1029749">server</a>, which is usually running on a different computer. A computer on which client software runs is also described as a client.<P>
+</A>
+<A NAME="client authentication"></A><A NAME="1021054">
+<B>client authentication.</B>&nbsp;
+</A><A NAME="1014557">
+The process of identifying a <a href="glossary.htm#1029510">client</a> to a <a href="glossary.htm#1029749">server</a>, for example with a name and password or with a <a href="glossary.htm#1014561">client SSL certificate</a> and some digitally signed data. See also <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>, <a href="glossary.htm#1031070">server authentication</a>.<P>
+</A>
+<A NAME="client SSL certificate"></A><A NAME="1014561">
+<B>client SSL certificate.</B>&nbsp;
+</A><A NAME="1014562">
+A certificate that a <a href="glossary.htm#1029510">client</a> (for example, browser software such as Netscape Communicator) presents to a <a href="glossary.htm#1029749">server</a> to authenticate the identity of the client (or the identity of the person using the client) using the <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a> protocol. See also <a href="glossary.htm#1021054">client authentication</a>.<P>
+</A>
+<A NAME="cryptographic algorithm"></A><A NAME="1019976">
+<B>cryptographic algorithm.</B>&nbsp;
+</A><A NAME="1019985">
+A set of rules or directions used to perform cryptographic operations such as <a href="glossary.htm#999078">encryption</a> and <a href="glossary.htm#998999">decryption</a>. Sometimes called a <I>cipher.</I><P>
+</A>
+<A NAME="cryptography"></A><A NAME="1026002">
+<B>cryptography.</B>&nbsp;
+</A><A NAME="1026018">
+The art and practice of scrambling (encrypting) and unscrambling (decrypting) information. For example, cryptographic techniques are used to scramble an unscramble information flowing between commercial web sites and your browser. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="decryption"></A><A NAME="998999">
+<B>decryption.</B>&nbsp;
+</A><A NAME="999005">
+The process of unscrambling data that has been encrypted. See also <a href="glossary.htm#999078">encryption</a>.<P>
+</A>
+<A NAME="digital ID"></A><A NAME="999011">
+<B>digital ID.</B>&nbsp;
+</A><A NAME="999017">
+See <a href="glossary.htm#1018895">certificate</a>.<P>
+</A>
+<A NAME="digital signature"></A><A NAME="1013995">
+<B>digital signature.</B>&nbsp;
+</A><A NAME="1013996">
+A code created from both the data to be signed and the private key of the signer. This code is unique for each new piece of data. Even a single comma added to a message changes the digital signature for that message. Successful validation of your digital signature by appropriate software not only provides evidence that you approved the transaction or message, but also provides evidence that the data has not changed since you digitally signed it. A digital signature has nothing to do with a handwritten signature, although it can sometimes be used for similar legal purposes. See also <a href="glossary.htm#999248">nonrepudiation</a>, <a href="glossary.htm#999618">tamper detection</a>.<P>
+</A>
+<A NAME="distinguished name (DN)"></A><A NAME="1022191">
+<B>distinguished name (DN).</B>&nbsp;
+</A><A NAME="1022194">
+A specially formatted name that uniquely identifies the subject of a certificate.<P>
+</A>
+<A NAME="dual key pairs"></A><A NAME="1020489">
+<B>dual key pairs.</B>&nbsp;
+</A><A NAME="1020619">
+Two public-private key pairs--four keys altogether--corresponding to two separate certificates. The private key of one pair is used for signing operations, and the public and private keys of the other pair are used for encryption and decryption operations. Each pair corresponds to a separate <a href="glossary.htm#1018895">certificate</a>. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="eavesdropping"></A><A NAME="1020620">
+<B>eavesdropping.</B>&nbsp;
+</A><A NAME="1013975">
+Surreptitious interception of information sent over a network by an entity for which the information is not intended.<P>
+</A>
+<A NAME="encryption"></A><A NAME="999078">
+<B>encryption.</B>&nbsp;
+</A><A NAME="1024038">
+The process of scrambling information in a way that disguises its meaning. For example, encrypted connections between computers make it very difficult for third-parties to unscramble, or <I>decrypt,</I> information flowing over the connection. Encrypted information can be decrypted only by someone who possesses the appropriate key. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="encryption certificate"></A><A NAME="1024953">
+<B>encryption certificate.</B>&nbsp;
+</A><A NAME="1024978">
+A certificate whose public key corresponds to a private key used for encryption only. Encryption certificates are not used for signing operations. See also <a href="glossary.htm#1020489">dual key pairs</a>, <a href="glossary.htm#999493">signing certificate</a>.<P>
+</A>
+<A NAME="encryption key"></A><A NAME="1021254">
+<B>encryption key.</B>&nbsp;
+</A><A NAME="1021255">
+A private key used for encryption only. An encryption key and its equivalent public key, plus a <a href="glossary.htm#1021282">signing key</a> and its equivalent public key, constitute a <a href="glossary.htm#1020489">dual key pairs</a>.<P>
+</A>
+<A NAME="fingerprint"></A><A NAME="1020434">
+<B>fingerprint.</B>&nbsp;
+</A><A NAME="1020450">
+See <a href="glossary.htm#1020297">certificate fingerprint</a>.<P>
+</A>
+<A NAME="FIPS PUBS 140-1"></A><A NAME="1025742">
+<B>FIPS PUBS 140-1.</B>&nbsp;
+</A><A NAME="1025743">
+Federal Information Processing Standards Publications (FIPS PUBS) 140-1 is a US government standard for implementations of cryptographic modules--that is, hardware or software that encrypts and decrypts data or performs other cryptographic operations (such as creating or verifying digital signatures). Many products sold to the US government must comply with one or more of the FIPS standards.<P>
+</A>
+<A NAME="key"></A><A NAME="999203">
+<B>key.</B>&nbsp;
+</A><A NAME="999212">
+A large number used by a <a href="glossary.htm#1019976">cryptographic algorithm</a> to encrypt or decrypt data. A person's public key, for example, allows other people to encrypt messages to that person. The encrypted messages must be decrypted with the corresponding private key. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="Lightweight Directory Access Protocol (LDAP)"></A><A NAME="1022286">
+<B>Lightweight Directory Access Protocol (LDAP).</B>&nbsp;
+</A><A NAME="1022287">
+A protocol for accessing directory services across multiple platforms. LDAP is a simplified version of Directory Access Protocol (DAP), used to access X.500 directories. <P>
+</A>
+<A NAME="master key"></A><A NAME="1032598">
+<B>master key.</B>&nbsp;
+</A><A NAME="1032639">
+A symmetric key used by Personal Security Manager to encrypt information on behalf of other applications. For example, Netscape 6 uses Personal Security Manager and your master key to encrypt email passwords, web site passwords, and other stored sensitive information. See also <a href="glossary.htm#999604">symmetric encryption</a>.<P>
+</A>
+<A NAME="misrepresentation"></A><A NAME="1014057">
+<B>misrepresentation.</B>&nbsp;
+</A><A NAME="1014058">
+Presentation of an entity as a person or organization that it is not. For example, a web site might pretend to be a furniture store when it is really just a site that takes credit card payments but never sends any goods. See also <a href="glossary.htm#1014366">spoofing</a>.<P>
+</A>
+<A NAME="Netscape Certificate Management System"></A><A NAME="1018306">
+<B>Netscape Certificate Management System.</B>&nbsp;
+</A><A NAME="1018308">
+A highly configurable set of software components and tools for creating, deploying, and managing certificates. You enroll with the system to obtain certificates of all kinds; the system maintains information about the certificates it issues.<P>
+</A>
+<A NAME="nonrepudiation"></A><A NAME="999248">
+<B>nonrepudiation.</B>&nbsp;
+</A><A NAME="999254">
+The inability, of the sender of a message, to deny having sent the message. A regular hand-written signature provides one form of nonrepudiation. A <a href="glossary.htm#1013995">digital signature</a> provides another.<P>
+</A>
+<A NAME="object signing"></A><A NAME="1014095">
+<B>object signing.</B>&nbsp;
+</A><A NAME="1014096">
+A technology that allows software developers to sign Java code, JavaScript scripts, or any kind of file, and that allows users to identify the signers and control access by signed code to local system resources.<P>
+</A>
+<A NAME="object-signing certificate"></A><A NAME="1014097">
+<B>object-signing certificate.</B>&nbsp;
+</A><A NAME="1014098">
+A certificate whose corresponding private key is used to sign objects such as code files. See also <a href="glossary.htm#1014095">object signing</a>.<P>
+</A>
+<A NAME="Online Certificate Status Protocol (OCSP)"></A><A NAME="1029304">
+<B>Online Certificate Status Protocol (OCSP).</B>&nbsp;
+</A><A NAME="1029312">
+A set of rules that Personal Security Manager follows to perform an online check of an email certificate's validity each time the certificate is used. This process involves checking the certificate against a list of valid certificates maintained at a specified web site. Your computer must be online for OCSP to work.<P>
+</A>
+<A NAME="password-based authentication"></A><A NAME="1014123">
+<B>password-based authentication.</B>&nbsp;
+</A><A NAME="1014124">
+Confident identification by means of a name and password. See also <a href="glossary.htm#998782">authentication</a>.<P>
+</A>
+<A NAME="Personal Security Password"></A><A NAME="1032744">
+<B>Personal Security Password.</B>&nbsp;
+</A><A NAME="1032748">
+A password used by Personal Security Manager to protect the master key and/or private keys stored on a <a href="glossary.htm#1028962">security device</a>. Personal Security Manager needs to access your private keys, for example, when you sign email messages or use one of your own certificates to identify yourself to a web site. It needs to access your master key when it encrypts or decrypts information on behalf of another application&#151;for example, when Netscape 6 needs to store or access your email password. You can set or change your personal security password from the Certificates tab in Personal Security Manager. Each security device requires a separate Personal Security Password. See also <a href="glossary.htm#1015387">private key</a>, <a href="glossary.htm#1032598">master key</a>.<P>
+</A>
+<A NAME="PKCS #11"></A><A NAME="1025194">
+<B>PKCS #11.</B>&nbsp;
+</A><A NAME="1025195">
+The public-key cryptography standard that governs security devices such as smart cards. See also <a href="glossary.htm#1028962">security device</a>, <a href="glossary.htm#1027625">smart card</a>.<P>
+</A>
+<A NAME="PKCS #11 module"></A><A NAME="1025197">
+<B>PKCS #11 module.</B>&nbsp;
+</A><A NAME="1025271">
+A program on your computer that manages cryptographic services such as encryption and decryption using the PKCS #11 standard. PKCS #11 modules (also called <I>cryptographic modules</I>, <I>cryptographic service providers,</I> or <I>security modules</I>) can be thought of as drivers for cryptographic devices that can be implemented in either hardware or software. A PKCS #11 module always controls one or more slots<B>,</B> which may be implemented as physical hardware slots in some form of physical reader (for example, for smart cards) or as conceptual slots in software. Each slot for a PKCS #11 module can in turn contain a <a href="glossary.htm#1028962">security device</a> (also called <I>token</I>)<B>,</B> which is the hardware or software device that actually provides cryptographic services and optionally stores certificates and keys. Personal Security Manager provides a built-in PKCS #11 module. You may install additional modules on your computer to control smart card readers or other hardware devices.<P>
+</A>
+<A NAME="portable security password"></A><A NAME="1024655">
+<B>portable security password.</B>&nbsp;
+</A><A NAME="1024670">
+A password that protects a certificate that you are backing up or have previously backed up. Personal Security Manager asks you to set this password when you back up a certificate, and requests it when you attempt to restore a certificate that has previously been backed up. <P>
+</A>
+<A NAME="private key"></A><A NAME="1015387">
+<B>private key.</B>&nbsp;
+</A><A NAME="1015391">
+One of a pair of keys used in public-key cryptography. The private key is kept secret and is used to decrypt data that has been encrypted with the corresponding public key.<P>
+</A>
+<A NAME="PSM Private Keys security device"></A><A NAME="1032045">
+<B>PSM Private Keys security device.</B>&nbsp;
+</A><A NAME="1032110">
+The default <a href="glossary.htm#1028962">security device</a> used by Personal Security Manager to store private keys associated with your certificates. In addition to private keys, the PSM Private Keys security device stores the master key used by Netscape 6 to encrypt email passwords, web site passwords, and other sensitive information. See also <a href="glossary.htm#1015387">private key</a>, <a href="glossary.htm#1032598">master key</a>.<P>
+</A>
+<A NAME="public key"></A><A NAME="1019172">
+<B>public key.</B>&nbsp;
+</A><A NAME="1019173">
+One of a pair of keys used in public-key cryptography. The public key is distributed freely and published as part of a <a href="glossary.htm#1018895">certificate</a>. It is typically used to encrypt data sent to the public key's owner, who then decrypts the data with the corresponding private key.<P>
+</A>
+<A NAME="public-key cryptography"></A><A NAME="1019178">
+<B>public-key cryptography.</B>&nbsp;
+</A><A NAME="1023765">
+A set of well-established techniques and standards that allow an entity (such as a person, an organization, or hardware such as a router) to verify its identity electronically or to sign and encrypt electronic data. Two keys are involved: a <a href="glossary.htm#1019172">public key</a> and a <a href="glossary.htm#1015387">private key</a>. The public key is published as part of a <a href="glossary.htm#1018895">certificate</a>, which associates that key with a particular identity. The corresponding private key is kept secret. Data encrypted with the public key can be decrypted only with the private key. <P>
+</A>
+<A NAME="public-key infrastructure (PKI)"></A><A NAME="999412">
+<B>public-key infrastructure (PKI).</B>&nbsp;
+</A><A NAME="1014263">
+The standards and services that facilitate the use of public-key cryptography and certificates in a networked environment.<P>
+</A>
+<A NAME="root CA"></A><A NAME="1015631">
+<B>root CA.</B>&nbsp;
+</A><A NAME="1015635">
+The <a href="glossary.htm#1020903">certificate authority (CA)</a> with a self-signed certificate at the top of a <a href="glossary.htm#1018500">certificate chain</a>. See also <a href="glossary.htm#999541">subordinate CA</a>.<P>
+</A>
+<A NAME="Secure Sockets Layer (SSL)"></A><A NAME="999463">
+<B>Secure Sockets Layer (SSL).</B>&nbsp;
+</A><A NAME="999472">
+A protocol that allows mutual authentication between a <a href="glossary.htm#1029510">client</a> and a <a href="glossary.htm#1029749">server</a> for the purpose of establishing an authenticated and encrypted connection. SSL runs above TCP/IP and below HTTP, LDAP, IMAP, NNTP, and other high-level network protocols. The new Internet Engineering Task Force (IETF) standard called Transport Layer Security (TLS) is based on SSL. See also <a href="glossary.htm#998782">authentication</a>, <a href="glossary.htm#999078">encryption</a>.<P>
+</A>
+<A NAME="security certificate"></A><A NAME="1028900">
+<B>security certificate.</B>&nbsp;
+</A><A NAME="1028904">
+See <a href="glossary.htm#1018895">certificate</a>.<P>
+</A>
+<A NAME="security device"></A><A NAME="1028962">
+<B>security device.</B>&nbsp;
+</A><A NAME="1028963">
+A hardware or software device that provides cryptographic services such as encryption and decryption and can store certificates and keys. A smart card is one example of a hardware security device. Personal Security Manager contains its own internal security device, called the <a href="glossary.htm#1032045">PSM Private Keys security device</a>, that is implemented in software. Each security device is protected by its own <a href="glossary.htm#1032744">Personal Security Password</a>.<P>
+</A>
+<A NAME="security module"></A><A NAME="1029083">
+<B>security module.</B>&nbsp;
+</A><A NAME="1029097">
+See <a href="glossary.htm#1025197">PKCS #11 module</a>.<P>
+</A>
+<A NAME="security token"></A><A NAME="1028905">
+<B>security token.</B>&nbsp;
+</A><A NAME="1028909">
+See <a href="glossary.htm#1028962">security device</a>.<P>
+</A>
+<A NAME="server"></A><A NAME="1029749">
+<B>server.</B>&nbsp;
+</A><A NAME="1029869">
+Software (such as software that serves up web pages) that receives requests from and sends information to a <a href="glossary.htm#1029510">client</a>, which is usually running on a different computer. A computer on which server software runs is also described as a server.<P>
+</A>
+<A NAME="server authentication"></A><A NAME="1031070">
+<B>server authentication.</B>&nbsp;
+</A><A NAME="1031080">
+The process of identifying a <a href="glossary.htm#1029749">server</a> to a <a href="glossary.htm#1029510">client</a> by using a <a href="glossary.htm#1029874">server SSL certificate</a>. See also <a href="glossary.htm#1021054">client authentication</a>, <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>.<P>
+</A>
+<A NAME="server SSL certificate"></A><A NAME="1029874">
+<B>server SSL certificate.</B>&nbsp;
+</A><A NAME="999500">
+A certificate that a <a href="glossary.htm#1029749">server</a> presents to a <a href="glossary.htm#1029510">client</a> to authenticate the server's identity using the <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a> protocol.<P>
+</A>
+<A NAME="signing certificate"></A><A NAME="999493">
+<B>signing certificate.</B>&nbsp;
+</A><A NAME="999507">
+A certificate whose corresponding <a href="glossary.htm#1015387">private key</a> is used to sign transmitted data, so that the receiver can verify the identity of the sender. Certificate authorities (CAs) often issue a signing certificate that will be used to sign email messages at the same time as an <a href="glossary.htm#1024953">encryption certificate</a> that will be used to encrypt email messages. See also <a href="glossary.htm#1020489">dual key pairs</a>, <a href="glossary.htm#1013995">digital signature</a>.<P>
+</A>
+<A NAME="signing key"></A><A NAME="1021282">
+<B>signing key.</B>&nbsp;
+</A><A NAME="1021283">
+A private key used for signing only. A signing key and its equivalent public key, together with an <a href="glossary.htm#1021254">encryption key</a> and its equivalent public key, constitute <a href="glossary.htm#1020489">dual key pairs</a>.<P>
+</A>
+<A NAME="slot"></A><A NAME="1025218">
+<B>slot.</B>&nbsp;
+</A><A NAME="1025222">
+A piece of hardware, or its equivalent in software, that is controlled by a <a href="glossary.htm#1025197">PKCS #11 module</a> and designed to contain a <a href="glossary.htm#1028962">security device</a>. <P>
+</A>
+<A NAME="smart card"></A><A NAME="1027625">
+<B>smart card.</B>&nbsp;
+</A><A NAME="1027626">
+A small device, typically about the size of a credit card, that contains a microprocessor and is capable of storing cryptographic information (such as keys and certificates) and performing cryptographic operations. Smart cards use the <a href="glossary.htm#1025194">PKCS #11</a> standard. A smart card is one kind of <a href="glossary.htm#1028962">security device</a>. <P>
+</A>
+<A NAME="spoofing"></A><A NAME="1014366">
+<B>spoofing.</B>&nbsp;
+</A><A NAME="1014367">
+Pretending to be someone else. For example, a person can pretend to have the email address <FONT FACE="courier, courier new, monospace">jdoe@mozilla.com</FONT>, or a computer can identify itself as a site called <FONT FACE="courier, courier new, monospace">www.mozilla.com</FONT> when it is not. Spoofing is one form of <a href="glossary.htm#1014057">misrepresentation</a>.<P>
+</A>
+<A NAME="SSL"></A><A NAME="999533">
+<B>SSL.</B>&nbsp;
+</A><A NAME="999539">
+See <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>. <P>
+</A>
+<A NAME="subject"></A><A NAME="1013880">
+<B>subject.</B>&nbsp;
+</A><A NAME="1013881">
+The entity (such as a person, organization, or router) identified by a <a href="glossary.htm#1018895">certificate</a>. In particular, the subject field of a certificate contains the certified entity's <a href="glossary.htm#1021328">subject name</a> and other characteristics.<P>
+</A>
+<A NAME="subject name"></A><A NAME="1021328">
+<B>subject name.</B>&nbsp;
+</A><A NAME="1021338">
+A <a href="glossary.htm#1022191">distinguished name (DN)</a> that uniquely describes the <a href="glossary.htm#1013880">subject</a> of a <a href="glossary.htm#1018895">certificate</a>.<P>
+</A>
+<A NAME="subordinate CA"></A><A NAME="999541">
+<B>subordinate CA.</B>&nbsp;
+</A><A NAME="999591">
+A <a href="glossary.htm#1020903">certificate authority (CA)</a> whose certificate is signed by another subordinate CA or by the root CA. See also <a href="glossary.htm#1018500">certificate chain</a>, <a href="glossary.htm#1015631">root CA</a>.<P>
+</A>
+<A NAME="symmetric encryption"></A><A NAME="999604">
+<B>symmetric encryption.</B>&nbsp;
+</A><A NAME="999625">
+An encryption method that uses a single cryptographic key to both encrypt and decrypt a given message.<P>
+</A>
+<A NAME="tamper detection"></A><A NAME="999618">
+<B>tamper detection.</B>&nbsp;
+</A><A NAME="999631">
+A mechanism ensuring that data received in electronic form has not been tampered with; that is, that the data received corresponds entirely with the original version of the same data.<P>
+</A>
+<A NAME="TLS"></A><A NAME="1027427">
+<B>TLS.</B>&nbsp;
+</A><A NAME="1027428">
+See <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>.<P>
+</A>
+<A NAME="token"></A><A NAME="1024528">
+<B>token.</B>&nbsp;
+</A><A NAME="1024586">
+See <a href="glossary.htm#1028962">security device</a>.<P>
+</A>
+<A NAME="trust"></A><A NAME="1019748">
+<B>trust.</B>&nbsp;
+</A><A NAME="1020186">
+Confident reliance on a person or other entity. In the context of <a href="glossary.htm#999412">public-key infrastructure (PKI)</a>, trust usually refers to the relationship between the user of a certificate and the <a href="glossary.htm#1020903">certificate authority (CA)</a> that issued the certificate. If you use Personal Security Manager to specify that you trust a CA, Personal Security Manager trusts valid certificates issued by that CA unless you specify otherwise in the settings for individual certificates. You use the Authorities panel of the Certificates tab in Personal Security Manager to specify the kinds of certificates you trust or don't trust different CAs to issue. <P>
+</A>
+<A NAME="1028719">
+<B></B><a href="glossary.htm#1028962"></a><P>
+</A>
+</dl>
+
+
+<BR>
+
+&copy; Copyright 2000 Netscape Communications Corporation
+</FONT> </CENTER>
+
+<BR>
+
+</BODY>
+
+</HTML>

mozilla/security/psm/doc/license.txt

@@ -0,0 +1,343 @@
+
+NETSCAPE CLIENT PRODUCTS LICENSE AGREEMENT
+Redistribution Or Rental Not Permitted
+
+These terms apply to Personal Security Manager.
+
+BY CLICKING THE ACCEPTANCE BUTTON OR INSTALLING OR
+USING PERSONAL SECURITY MANAGER SOFTWARE (THE "PRODUCT"), 
+THE INDIVIDUAL OR ENTITY LICENSING THE PRODUCT
+("LICENSEE") IS CONSENTING TO BE BOUND BY AND IS
+BECOMING A PARTY TO THIS AGREEMENT.  IF LICENSEE DOES
+NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, THE
+BUTTON INDICATING NON-ACCEPTANCE MUST BE
+SELECTED, AND LICENSEE MUST NOT INSTALL OR USE
+THE SOFTWARE.
+
+1. LICENSE AGREEMENT.  As used in this Agreement, for
+residents of Europe, the Middle East or Africa,
+"Netscape" shall mean Netscape Communications Ireland
+Limited; for residents of Japan, "Netscape" shall
+mean Netscape Communications (Japan), Ltd.; for
+residents of all other countries, "Netscape" shall
+mean Netscape Communications Corporation.  In this
+Agreement "Licensor" shall mean Netscape except under
+the following circumstances: (i) if Licensee acquired
+the Product as a bundled component of a third party
+product or service, then such third party shall be
+Licensor; and (ii) if any third party software is
+included as part of the default installation and no
+license is presented for acceptance the first time
+that third party software is invoked, then the use of
+that third party software shall be governed by this
+Agreement, but the term "Licensor," with respect to
+such third party software, shall mean the
+manufacturer of that software and not Netscape.  With
+the exception of the situation described in (ii)
+above, the use of any included third party software
+product shall be governed by the third party's
+license agreement and not by this Agreement, whether
+that license agreement is presented for acceptance
+the first time that the third party software is
+invoked, is included in a file in electronic form, or
+is included in the package in printed form.  If more
+than one license agreement was provided for the
+Product, and the terms vary, the order of precedence
+of those license agreements is as follows: a signed
+agreement, a license agreement available for review
+on the Netscape website, a printed or electronic
+agreement that states clearly that it supersedes
+other agreements, a printed agreement provided with
+the Product, an electronic agreement provided with
+the Product.
+
+2. LICENSE GRANT.  Licensor grants Licensee a
+non-exclusive and non-transferable license to
+reproduce and use for personal or internal business
+purposes the executable code version of the Product,
+provided any copy must contain all of the original
+proprietary notices.  This license does not entitle
+Licensee to receive from Netscape hard-copy
+documentation, technical support, telephone
+assistance, or enhancements or updates to the
+Product.  Licensee may not customize the Product
+unless Licensee has also licensed the Netscape
+Client Customization Kit ("CCK"), and then only to
+the extent permitted in the license agreement for CCK,
+as applicable.  Licensee may not redistribute the
+Product unless Licensee has separately entered into a
+distribution agreement with Netscape such as the
+Unlimited Distribution Program Agreement.
+
+3. RESTRICTIONS.  Except as otherwise expressly
+permitted in this Agreement, or in another Netscape
+agreement to which Licensee is a party such as the
+CCK license agreement or a distribution agreement,
+Licensee may not: (i) modify or create any derivative
+works of the Product or documentation, including translation
+or localization; (ii) decompile, disassemble, reverse engineer,
+or otherwise attempt to derive the source code for the
+Product (except to the extent applicable laws
+specifically prohibit such restriction or as provided by the
+Netscape Public License or Mozilla Public License
+for portions of the product governed by those licenses);
+(iii) redistribute, encumber, sell, rent, lease,
+sublicense, or otherwise transfer rights to the
+Product; (iv) remove or alter any trademark, logo,
+copyright or other proprietary notices, legends,
+symbols or labels in the Product; or (v) publish any
+results of benchmark tests run on the Product to a
+third party without Netscape's prior written
+consent.
+
+4. FEES.  There is no license fee for the Product.
+If Licensee wishes to receive the Product on media,
+there may be a small charge for the media and for
+shipping and handling.  Licensee is responsible for
+any and all taxes.
+
+5. TERMINATION.  Without prejudice to any other
+rights, Licensor may terminate this Agreement if
+Licensee breaches any of its terms and conditions.
+Upon termination, Licensee shall destroy all copies
+of the Product.
+
+6. PROPRIETARY RIGHTS.  Title, ownership rights, and
+intellectual property rights in the Product shall
+remain in Netscape and/or its suppliers.  Licensee
+acknowledges such ownership and intellectual property
+rights and will not take any action to jeopardize,
+limit or interfere in any manner with Netscape's or
+its suppliers' ownership of or rights with respect to
+the Product.  The Product is protected by copyright
+and other intellectual property laws and by
+international treaties.  Title and related rights in
+the content accessed through the Product is the
+property of the applicable content owner and is
+protected by applicable law.  The license granted
+under this Agreement gives Licensee no rights to such
+content.
+
+7. USE AND AVAILABILITY OF OPEN SOURCE
+CODE. Portions of Personal Security Manager were created using source
+code governed by the Netscape Public License (NPL) and
+the Mozilla Public License (MPL).  The source code for
+the portions of Personal Security Manager governed by the NPL and MPL
+is available from http://www.mozilla.org under those licenses.
+
+8. DISCLAIMER OF WARRANTY.  THE PRODUCT IS PROVIDED
+FREE OF CHARGE, AND, THEREFORE, ON AN "AS IS" BASIS,
+WITHOUT WARRANTY OF ANY KIND, INCLUDING WITHOUT
+LIMITATION THE WARRANTIES THAT IT IS FREE OF DEFECTS,
+MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
+NON-INFRINGING.  THE ENTIRE RISK AS TO THE QUALITY
+AND PERFORMANCE OF THE PRODUCT IS BORNE BY LICENSEE.
+SHOULD THE PRODUCT PROVE DEFECTIVE IN ANY RESPECT,
+LICENSEE AND NOT LICENSOR OR ITS SUPPLIERS OR
+RESELLERS OR ANY CONTRIBUTORS TO THE SOURCE CODE
+OF THE PORTIONS OF PERSONAL SECURITY MANAGER AVAILABLE FROM
+HTTP://WWW.MOZILLA.ORG ASSUMES THE ENTIRE COST
+OF ANY SERVICE AND REPAIR.  IN ADDITION, THE SECURITY
+MECHANISMS IMPLEMENTED BY THE PRODUCT HAVE
+INHERENT LIMITATIONS, AND LICENSEE MUST DETERMINE
+THAT THE PRODUCT SUFFICIENTLY MEETS ITS REQUIREMENTS.
+THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
+PART OF THIS AGREEMENT.  NO USE OF THE PRODUCT IS
+AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+9. LIMITATION OF LIABILITY.  TO THE MAXIMUM EXTENT
+PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL
+LICENSOR OR ITS SUPPLIERS OR RESELLERS OR ANY
+CONTRIBUTORS TO THE SOURCE CODE OF THE PORTIONS OF 
+PERSONAL SECURITY MANAGER AVAILABLE FROM
+HTTP://WWW.MOZILLA.ORG BE LIABLE FOR
+ANY INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+DAMAGES ARISING OUT OF THE USE OF OR INABILITY TO USE
+THE PRODUCT, INCLUDING, WITHOUT LIMITATION, DAMAGES
+FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE
+OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+DAMAGES OR LOSSES, EVEN IF ADVISED OF THE POSSIBILITY
+THEREOF, AND REGARDLESS OF THE LEGAL OR EQUITABLE
+THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE
+CLAIM IS BASED.  IN ANY CASE, LICENSOR'S ENTIRE
+LIABILITY UNDER ANY PROVISION OF THIS AGREEMENT SHALL
+NOT EXCEED IN THE AGGREGATE THE SUM OF THE FEES
+LICENSEE PAID FOR THIS LICENSE (IF ANY) AND FEES FOR
+SUPPORT OF THE PRODUCT RECEIVED BY NETSCAPE UNDER A
+SEPARATE SUPPORT AGREEMENT (IF ANY), WITH THE
+EXCEPTION OF DEATH OR PERSONAL INJURY CAUSED BY THE
+NEGLIGENCE OF LICENSOR TO THE EXTENT APPLICABLE LAW
+PROHIBITS THE LIMITATION OF DAMAGES IN SUCH CASES.
+SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
+LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+THIS EXCLUSION AND LIMITATION MAY NOT BE APPLICABLE.
+NETSCAPE IS NOT RESPONSIBLE FOR ANY LIABILITY ARISING
+OUT OF CONTENT PROVIDED BY LICENSEE OR A THIRD PARTY
+THAT IS ACCESSED THROUGH THE PRODUCT AND/OR ANY
+MATERIAL LINKED THROUGH SUCH CONTENT.
+
+10. ENCRYPTION.  If Licensee wishes to use the
+cryptographic features of the Product, then Licensee
+may need to obtain and install a signed digital
+certificate from a certificate authority or a
+certificate server.  Licensee may be charged
+additional fees for certification services.  Licensee
+is responsible for maintaining the security of the
+environment in which the Product is used and the
+integrity of the private key file used with the
+Product.  In addition, the use of digital
+certificates is subject to the terms specified by the
+certificate provider, and there are inherent
+limitations in the capabilities of digital
+certificates.  If Licensee is sending or receiving
+digital certificates, Licensee is responsible for
+familiarizing itself with and evaluating such terms
+and limitations.  If the Product is a version with
+FORTEZZA, Licensee will need to obtain PC Card
+Readers and FORTEZZA Crypto Cards from another vendor
+to enable the FORTEZZA features.
+
+11. EXPORT CONTROL.  Licensee agrees to comply with
+all export laws and restrictions and regulations of
+the United States or foreign agencies or authorities,
+and not to export or re-export the Product or any
+direct product thereof in violation of any such
+restrictions, laws or regulations, or without all
+necessary approvals.  As applicable, each party shall
+obtain and bear all expenses relating to any
+necessary licenses and/or exemptions with respect to
+its own export of the Product from the U.S.  Neither
+the Product nor the underlying information or
+technology may be downloaded or otherwise exported or
+re-exported (i) into Cuba, Iran, Iraq, Libya, North
+Korea, Sudan, Syria or any other country subject to
+U.S. trade sanctions covering the Product, to
+individuals or entities controlled by such countries,
+or to nationals or residents of such countries other
+than nationals who are lawfully admitted permanent
+residents of countries not subject to such sanctions;
+or (ii) to anyone on the U.S. Treasury Department's
+list of Specially Designated Nationals and Blocked
+Persons or the U.S. Commerce Department's Table of
+Denial Orders.  By downloading or using the Product,
+Licensee agrees to the foregoing and represents and
+warrants that it complies with these conditions.
+
+12. HIGH RISK ACTIVITIES.  The Product is not
+fault-tolerant and is not designed, manufactured or
+intended for use or resale as on-line control
+equipment in hazardous environments requiring
+fail-safe performance, such as in the operation of
+nuclear facilities, aircraft navigation or
+communication systems, air traffic control, direct
+life support machines, or weapons systems, in which
+the failure of the Product could lead directly to
+death, personal injury, or severe physical or
+environmental damage ("High Risk Activities").
+Accordingly, Licensor and its suppliers specifically
+disclaim any express or implied warranty of fitness
+for High Risk Activities.  Licensee agrees that
+Licensor and its suppliers will not be liable for any
+claims or damages arising from the use of the Product
+in such applications.
+
+13. U.S. GOVERNMENT END USERS.  The Product is a
+"commercial item," as that term is defined in 48
+C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+computer software" and "commercial computer software
+documentation," as such terms are used in 48 C.F.R.
+12.212 (Sept.  1995).  Consistent with 48 C.F.R.
+12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
+(June 1995), all U.S. Government End Users acquire
+the Product with only those rights set forth herein.
+
+13. MISCELLANEOUS.  (a) This Agreement constitutes
+the entire agreement between the parties concerning
+the subject matter hereof.  (b) This Agreement may be
+amended only by a writing signed by both parties.
+(c) Except to the extent applicable law, if any,
+provides otherwise, this Agreement shall be governed
+by the laws of the State of California, U.S.A.,
+excluding its conflict of law provisions.  (d) Unless
+otherwise agreed in writing, all disputes relating to
+this Agreement (excepting any dispute relating to
+intellectual property rights) shall be subject to
+final and binding arbitration in Santa Clara County,
+California, under the auspices of JAMS/EndDispute,
+with the losing party paying all costs of
+arbitration.  (e) This Agreement shall not be
+governed by the United Nations Convention on
+Contracts for the International Sale of Goods.  (f)
+If any provision in this Agreement should be held
+illegal or unenforceable by a court having
+jurisdiction, such provision shall be modified to the
+extent necessary to render it enforceable without
+losing its intent, or severed from this Agreement if
+no such modification is possible, and other
+provisions of this Agreement shall remain in full
+force and effect.  (g) The controlling language of
+this Agreement is English.  If Licensee has received
+a translation into another language, it has been
+provided for Licensee's convenience only.  (h) A
+waiver by either party of any term or condition of
+this Agreement or any breach thereof, in any one
+instance, shall not waive such term or condition or
+any subsequent breach thereof.  (i) The provisions of
+this Agreement which require or contemplate
+performance after the expiration or termination of
+this Agreement shall be enforceable notwithstanding
+said expiration or termination.  (j) Licensee may not
+assign or otherwise transfer by operation of law or
+otherwise this Agreement or any rights or obligations
+herein except in the case of a merger or the sale of
+all or substantially all of Licensee's assets to
+another entity.  (k) This Agreement shall be binding
+upon and shall inure to the benefit of the parties,
+their successors and permitted assigns.  (l) Neither
+party shall be in default or be liable for any delay,
+failure in performance (excepting the obligation to
+pay) or interruption of service resulting directly or
+indirectly from any cause beyond its reasonable
+control.  (m) The relationship between Licensor and
+Licensee is that of independent contractors and
+neither Licensee nor its agents shall have any
+authority to bind Licensor in any way.  (n) If any
+dispute arises under this Agreement, the prevailing
+party shall be reimbursed by the other party for any
+and all legal fees and costs associated therewith.
+(o) If any Netscape professional services are being
+provided, then such professional services are
+provided pursuant to the terms of a separate
+Professional Services Agreement between Netscape and
+Licensee.  The parties acknowledge that such services
+are acquired independently of the Product licensed
+hereunder, and that provision of such services is not
+essential to the functionality of such Product.  (p)
+The headings to the sections of this Agreement are
+used for convenience only and shall have no
+substantive meaning.  (q) Licensor may use Licensee's
+name in any customer reference list or in any press
+release issued by Licensor regarding the licensing of
+the Product and/or provide Licensee's name and the
+names of the Product licensed by Licensee to third
+parties.
+
+14. LICENSEE OUTSIDE THE U.S.  If Licensee is located
+outside the U.S., then the provisions of this Section
+shall apply.  (i) Les parties aux presentes
+confirment leur volonte que cette convention de meme
+que tous les documents y compris tout avis qui s'y
+rattache, soient rediges en langue anglaise.
+(translation: "The parties confirm that this
+Agreement and all related documentation is and will
+be in the English language.")  (ii) Licensee is
+responsible for complying with any local laws in its
+jurisdiction which might impact its right to import,
+export or use the Product, and Licensee represents
+that it has complied with any regulations or
+registration procedures required by applicable law to
+make this license enforceable.
+
+
+Netscape Client Software EULA           Rev. [022500]
+

mozilla/security/psm/doc/psmtest.html

@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<head>
+  <title>Personal Security Manager Detection Page</title>
+  <script language=javascript>
+
+    function init_title()
+    {
+      with(window.frames.the_frame) {
+        document.write('<BODY><H1>Personal Security Manager Detection Page</H1><P><P>');
+        if (typeof(crypto.version) == "undefined") {
+          document.write('<FONT color="#ff0000">Personal Security Manager not loaded</FONT>');
+        } else {
+          document.write('<FONT color="#007700">Personal Security Manager&nbsp;Running&nbsp;(version ', crypto.version); 
+          document.write(')</FONT>'); 
+        }
+        document.write('</BODY>');
+        document.close();
+      }
+    }
+  
+
+
+</script>
+</head>
+
+<frameset rows="*,1" border=0 onload="init_title()">
+  <frame src="about:blank" name="the_frame">
+  <frame src="about:blank">
+</frameset>

mozilla/security/psm/doc/release_notes.html

@@ -0,0 +1,297 @@
+<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   
+  <meta name="GENERATOR" content="Mozilla/4.75 [en] (WinNT; U) [Netscape]">
+   
+  <meta name="Author" content="Sean Cotter">
+  <title>Personal Security Manager Release Notes</title>
+</head>
+<body>
+<center>
+<h1><img src="bannerrn.gif" height="32" width="468" align="Center"></h1>
+</center>
+<center>
+<h2>Netscape Personal Security Manager</h2>
+</center>
+<center>
+<h2>Release 1.4</h2>
+</center>
+<center>
+<h2>12/18/2000</h2>
+</center>
+<center>
+<hr width="100%"></center>
+These release notes contain the most recent information about this release
+of Netscape Personal Security Manager. Please read these notes before using
+the software.
+<p>These notes include information for IS professionals who are thoroughly
+familiar with security and public-key infrastructure (PKI) issues.</p>
+<p>Use of this product is subject to the terms detailed in the license agreement
+at <a href="http://docs.iplanet.com/docs/manuals/psm/14/license.txt.">http://docs.iplanet.com/docs/manuals/psm/14/license.txt.</a></p>
+<p></p>
+<hr width="100%">
+<h2>Contents</h2>
+<a href="#Documentation">Documentation</a><br>
+<a href="#Changes Since PSM 1.3">Changes Since Personal Security Manager 1.3</a>
+<br>
+<a href="#Software/Hardware Requirements">Software/Hardware Requirements</a>
+<br>
+<a href="#unpacking">Installing Personal Security Manager</a><br>
+<a href="#Using the Test Bed">Using Personal Security Manager</a><br>
+<a href="#Known Bugs/Issues for 14 Release">Known Bugs/Issues for Personal
+Security Manager 1.4</a><br>
+<a href="#Feedback">Feedback</a>
+<p></p>
+<hr width="100%">
+<h2><a name="Documentation"></a>Documentation</h2>
+The following documentation is available with Personal Security Manager:
+<ul>
+  <li><a href="contents.htm">Personal Security Manager Help</a> -- This online
+help system can also be accessed by clicking the Help button in any personal
+Security Manager window.</li>
+  <li><a href="cmcjavascriptapi.html">JavaScript API for Client Certificate
+Management</a> -- This reference describes a new Javascript API for performing
+user certificate management operations with Personal Security Manager, including
+one-click issuance, forced certificate backup by end users, and automatic
+archival of encryption private keys.</li>
+</ul>
+For the latest release notes, deployment guide, and other information,see
+<a href="http://docs.iPlanet.com/docs/manuals/psm.html">http://docs.iPlanet.com/docs/manuals/psm.html</a><a href="http://developer.iPlanet.com/docs/manuals/psm.html">
+.</a>
+<p></p>
+<hr width="100%">
+<h2><a name="Changes Since PSM 1.3"></a>Changes Since Personal Security Manager
+1.3</h2>
+The <a href="http://www.ietf.org/rfc/rfc2246.txt">Transport Layer Security
+(TLS)</a> protocol is turned on by default in Personal Security Manager1.4.
+To turn TLS off, open Personal Security Manager, click the Advanced tab, click
+Options in the left frame, then deselect the checkbox labeled "Enable TLS."
+<p>TLS is an IETF standard based on the Secure Sockets Layer (SSL) protocol.
+It can be thought of as SSL version 3.1. Some servers that do not implement
+SSL correctly cannot negotiate the SSL handshake with client software (such
+as Personal Security Manager) that supports TLS. To allow Personal Security
+Manager to use SSL with such TLS-intolerant servers, you must disable TLS
+as described above.</p>
+<p>Most other changes since Personal Security Manager 1.3 involve minor bug
+fixes and optimizations.</p>
+<p>This version of Netscape Personal Security Manager ships with Netscape
+6 and also works with Mozilla and Communicator 4.7x. </p>
+<p></p>
+<hr width="100%">
+<h4><a name="Software/Hardware Requirements"></a><font size="+2">Software/Hardware
+Requirements</font></h4>
+<b>Operating systems supported:</b> Windows NT, Windows 95, Windows 98, Windows
+2000; Solaris 2.6, 2.7, 2.8; and Red Hat Linux 6.1.
+<p></p>
+<hr width="100%">
+<h2><a name="unpacking"></a>Installing Personal Security Manager</h2>
+Netscape Personal Security Manager 1.4 is installed with Netscape 6 and recent versions
+of Mozilla. 
+
+<p>When you install Netscape 6 on Windows, Personal Security Manager is installed
+in the directory <tt>C:\Program Files\Common Files\Netscape Shared\Security\</tt>.
+
+<p>When you install Netscape 6 on Unix, Personal Security Manager is installed
+in a directory called <tt>psm</tt> in the same directory where the <tt>netscape</tt>
+executable resides.<br>
+
+<p>The sections that follow describe how to install the Personal Security Manager 
+files for use with Communicator 4.7x.</p>
+<h3>Installing on Windows 95/98/2000/NT for Use With Communicator 4.7x</h3>
+
+To install Netscape Personal Security Manager on Windows 95/98/2000/NT for use with
+Communicator 4.7 or later, save the file in a convenient location with the
+specified filename, then drag the file's icon into a Navigator window (that
+is, a browser window displayed by Communicator). Dropping the file's icon
+over the browser window initiates SmartUpdate, which automatically installs
+Personal Security Manager. Afterinstallation is complete, exit Communicator
+and relaunch it. If your copy of Communicator is installed in the default
+location, SmartUpdate installs the Personal Security Manager files in the
+directory<tt>C:\Program Files\CommonFiles\Netscape Shared\Security\</tt>
+and adds the file <tt>cmnav.dll</tt>in the directory <tt>C:\Program Files\Netscape\Communicator\Program</tt>.<br>
+<h3>Installing on Unix for Use With Communicator 4.7x</h3>
+
+To install Personal Security Manager for use with Communicator 4.7 or later on Unix, you
+must be logged in as the same Unix user you will be logged in as when you
+run Communicator. For the Unix installation to succeed, you must have write
+privileges for both the directory where the Netscape executable resides and
+the directory where the installation script creates the directory containing
+the Personal Security Manager files. To install Personal Security Manager for
+use with Communicator 4.7x, download the tar file for the version of the product
+that you want to install and follow these steps:<br>
+<ol>
+  <li>Exit Communicator, if it is running.</li>
+  <li>Decompress the downloaded file to some convenient location.</li>
+  <li>Run the psm-install program.</li>
+</ol>
+The psm-install program allows you to specify the directory in which Personal
+Security Manager will be installed. In this release, you must install Personal
+Security Manager locally. To do so, you can either install it in the default
+location (<tt>/opt/netscape/security</tt>) or in some other local location. However,
+if you install Personal Security Manager anywhere other than the default
+location, Communicator must also be installed locally. To run Personal Security
+Manager on Unix, you must be logged in as the same Unix user you were logged
+in as when you installed it.<br>
+<h3>Disabling Personal Security Manager</h3>
+To <b>disable</b> Personal Security Manager temporarily, exit the browser,
+then:
+<ul>
+  <li>on Unix, remove the directory<tt>psm</tt> from the directory where
+the<tt>netscape</tt>executable resides.</li>
+  <li>on Windows, rename the directory <tt>C:\Program Files\Common Files\Netscape
+Shared\Security</tt> to something else.</li>
+</ul>
+<hr width="100%">
+<h2><a name="Using the Test Bed"></a>Using Personal Security Manager</h2>
+The sections that follow describe how to test some of the features of Personal
+Security Manager that are available with this release:
+<ul>
+  <li><a href="#Start Up Personal Security Manager with">Start Up Personal
+SecurityManager with Netscape 6</a></li>
+  <li><a href="#Use SSL with Server Authentication">Test Basic SSL</a></li>
+  <li><a href="#Get a Certificate">Get an SSL Client Certificate</a></li>
+  <li><a href="#View Your Personal Certificate">View Your Certificate</a></li>
+  <li><a href="#Using Your Personal Certificate for Client">Test Client Authentication</a></li>
+  <li><a href="#Validate Certificates Using OSCP">Validate Certificates Using
+OCSP</a></li>
+</ul>
+The sections that follow briefly describe how to test some of the features
+listed above.
+<p>For information on the JavaScript API supported by Personal SecurityManager,
+see <a href="cmcjavascriptapi.html">JavaScript API for ClientCertificate
+Management</a> and the Personal Security Manager DeploymentGuide. For the
+latest versions of these documents, see <a href="http://docs.iPlanet.com/docs/manuals/psm.html">
+http://docs.iPlanet.com/docs/manuals/psm.html</a>.</p>
+<h3><a name="Start Up Personal Security Manager with"></a>Use Personal Security
+Manager with Netscape 6</h3>
+Personal Security Manager starts automatically the first time Netscape 6
+needs to perform some action involving security, such as handling anSSL session.
+<p>Follow these steps to view your security settings and confirm that&nbsp;
+Personal Security Manager is running:</p>
+<ol>
+  <li>Launch Netscape 6.</li>
+  <li>Choose Security &amp; Privacy from the Tasks menu, then choose Security
+Manager to view your Personal Security Manager settings.</li>
+  <li>Close the Personal Security Manager window.</li>
+  <li>Go to the page <a href="psmtest.html">psmtest.html</a> (in the same
+directoryas these release notes), then choose Page Source from the View menu
+tosee the JavaScript code that a web programmer can use to detect Personal
+Security Manager and its version number.</li>
+</ol>
+Note that the version number has two parts. The first is the version ofthe
+PSM client library, and the second is the version of the PSM serverlibrary.
+<br>
+&nbsp;
+<h3><a name="Use SSL with Server Authentication"></a>Test Basic SSL</h3>
+Go to any online store, banking service, brokerage account, or other website
+that supports SSL. Verify that the lock in the lower-left corner ofthe browser
+window is closed when you reach the pages for which SSL shouldbe enabled,
+for example a page where you are asked to give your creditcard number.
+<h3><a name="Get a Certificate"></a>Get an SSL Client Certificate</h3>
+Go to any public or private CA and apply for an SSL client certificate.
+<p>To test one-click certificate issuance, dual key-pair certificates,and
+other Personal Security Manager features, system administrators shoulddownload,
+install, and configure Netscape Certificate Management System.For complete
+CMS documentation and other information, see <a href="http://docs.iPlanet.com/docs/manuals/cms.html">
+http://docs.iPlanet.com/docs/manuals/cms.html</a>.To download the latest
+version of CMS, see <a href="http://www.iplanet.com/downloads/download/">
+http://www.iplanet.com/downloads/download/</a>.</p>
+<h3><a name="View Your Personal Certificate"></a>View Your Certificate</h3>
+After you have obtained a certificate, follow these steps to view it:
+<ol>
+  <li>Click the Security icon in the Navigator toolbar.</li>
+  <li>Click the Certificates tab.</li>
+  <li>Click to select your certificate.</li>
+  <li>Click View.</li>
+</ol>
+You should see information about your new certificate.
+<h3><a name="Using Your Personal Certificate for Client"></a><font size="+1">
+TestClient Authentication</font></h3>
+Personal Security Manager allows the SSL server and client to negotiatewhich
+certificate to use, and in most cases they can agree on a singlecorrect certificate
+for the client to present. When this happens, the usercan access an SSL site
+that requires client authentication with zero additionalclicks.
+<p>To test client authentication with Netscape Enterprise Server, systemadministrators
+should follow these steps:</p>
+<ul>
+  <li>Install an Enterprise Server and configure it for client authentication
+as described in <a href="http://docs.iplanet.com/docs/manuals/cms/41/dep_gide/entsrv.htm">
+AppendixD, Using SSL with Enterprise Server 3.x</a>, of <i>Netscape Certificate
+Management System Installation and Deployment Guide</i>.</li>
+  <li>Test the Enterprise Server installation as described at the end of
+AppendixD using Personal Security Manager.</li>
+</ul>
+<h3><a name="Validate Certificates Using OSCP"></a>Validate Certificates
+UsingOSCP</h3>
+Personal Security Manager supports the use of the On-Line Certificate Status
+Protocol (OSCP) to check the validity of certificates in real time. Information
+about this protocol and how configure Personal Security Manager 1.3 andNetscape
+Certificate Management System 4.2 to support it is available from<a href="http://docs.iPlanet.com/docs/manuals/psm/12/psmdply.htm">
+http://docs.iPlanet.com/docs/manuals/psm/12/psmdply.htm</a>
+<p>It's important to note that Personal Security Manager will accept signatures
+from responders only under the following conditions:</p>
+<ul>
+  <li>The response was signed by a delegated responder--that is, the responder's
+certificate was signed by the same CA as the certificate&nbsp; you're trying
+to verify and has the <tt>extendedKeyUsage</tt> bit set indicating thatthe
+certificate is an OCSP response signer. The certificate should be thesame
+as a CA certificate with the addition of the <tt>extendedKeyUsage</tt>bit.</li>
+  <li>The user has designated a default responder in the OCSP Settings dialog
+box (available from the Advanced tab under Options).</li>
+</ul>
+Common problems include the following:
+<ul>
+  <li>Time drift between the client and server machine. Personal Security
+Managerexpects the time of the response to be within the past 24 hours. If
+thereis a difference in the clocks between the machine used to sign the response,
+so the response looks to Personal Security Manager like it was signed inthe
+future, Personal Security Manager interprets this as an error. Runntp on
+both machines to fix this problem.</li>
+  <li>The response doesn't include the certificates required to complete
+thechain needed to verify the signer's certificate. The client frequently
+doesn't have all the certificates in the database that are needed to verify
+the signer's certificate, in which case Personal Security Manager can'tverify
+the signer's certificate and OCSP fails. Make sure the entire chainis included
+with every response. This is the safest way to avoid this problem.</li>
+  <li>If you are using ValiCert, misconfiguration may cause the Validation
+Authoritynot to send the certificate chain (including the CA root certificate
+andthe OCSP responder's certificate) correctly.</li>
+</ul>
+<hr width="100%">
+<h2><a name="Known Bugs/Issues for 14 Release"></a>Known Bugs/Issues for
+Personal Security Manager 1.4</h2>
+<ul>
+  <li>To run Personal Security Manager on Unix with Netscape 6 or Communicator,
+you must be logged in as thesame Unix user you were logged in as when the
+browser was installed.</li>
+  <li>FORTEZZA is not guaranteed to work with this release. [# 94220]</li>
+  <li>In some unusual circumstances you may encounter problems such as valid
+certificates not being verified or the browser freezing up. If you encounter
+a problem that doesn't appear to have a logical explanation, try the following
+as a last resort:</li>
+  <ol>
+    <li>Exit the browser, then relaunch it. If necessary, use Control-Alt-Delete
+on Windows 95/98/2000/NT to bring up the Task Manager and click End Process
+for both <tt>psm.exe</tt> and <tt>netscp6.exe</tt>.</li>
+    <li><b>Warning:</b> <b>Before taking this step, back up your own certificates
+stored internally by Personal Security Manager.</b> If exiting and relaunching
+the browser doesn't take care of the problem, in some rare cases it maywork
+to exit the browser, then delete or rename your <tt>cert7.db</tt> and<tt>
+key3.db</tt>files (located in your user profile directory on Windows 95/98/2000/NT,
+or in the directory in which the Netscape or Mozilla executable resideson
+Unix) and relaunch the browser. You should also look for all otherfiles in
+the same directory that begin with <tt>cert</tt> or<tt>key</tt>and end in
+      <tt>.db</tt> and delete those files as well before relaunchingthe browser.</li>
+  </ol>
+</ul>
+<hr width="100%">
+<h2><a name="Feedback"></a>Feedback</h2>
+To send feedback to the Personal Security Manager development team, send email
+to <a href="mailto:psmfeedback@netscape.com">psmfeedback@netscape.com</a>. 
+Feedback back sent to this address will be read by the team, but you will
+not receive a personal response.
+</body>
+</html>

mozilla/security/psm/lib/Makefile

@@ -0,0 +1,74 @@
+#! gmake
+#
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+

mozilla/security/psm/lib/Makefile.in

@@ -1,27 +1,32 @@
-# 
-# The contents of this file are subject to the Mozilla Public
+#
+# The contents of this file are subject to the Netscape 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/
-# 
+# the License at http://www.mozilla.org/NPL/
+#
 # 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
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
-# 
+#
 # Contributor(s): 
-# Srilatha Moturi <srilatha@netscape.com>
 #
 
-DEPTH=..\..\..
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
-DIRS=content locale
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= protocol client nlslayer
+
+include $(topsrcdir)/config/rules.mk
 
-include <$(DEPTH)\config\rules.mak>

mozilla/security/psm/lib/client/MANIFEST

@@ -0,0 +1,3 @@
+cmtclist.h
+cmtcmn.h
+cmtjs.h

mozilla/security/psm/lib/client/Makefile

@@ -0,0 +1,74 @@
+#! gmake
+#
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+include config.mk
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+

mozilla/security/psm/lib/client/Makefile.in

@@ -0,0 +1,74 @@
+#! gmake
+# 
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+# 
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= cmt
+
+EXPORTS = \
+	cmtcmn.h \
+	cmtjs.h  \
+	cmtclist.h \
+	$(NULL)
+
+MODULE = security
+
+CSRCS = cmtinit.c  \
+	cmtssl.c   \
+	cmtutils.c \
+	cmtcert.c  \
+	cmthash.c  \
+	cmtpkcs7.c \
+	cmtres.c   \
+	cmtjs.c    \
+	cmtevent.c \
+        cmtpasswd.c \
+	cmtadvisor.c \
+	cmtrng.c \
+	cmtsdr.c \
+	$(NULL)
+
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+EXTRA_DSO_LDOPTS	+= $(DIST)/lib/protocol.$(LIB_SUFFIX)
+else
+EXTRA_DSO_LDOPTS	+= -L$(DIST)/lib -lprotocol
+endif
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/security/psm/lib/client/cmtadvisor.c

@@ -0,0 +1,99 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#ifdef XP_MAC
+#include "cmtmac.h"
+#endif
+
+CMTStatus CMT_SecurityAdvisor(PCMT_CONTROL control, CMTSecurityAdvisorData* data, CMUint32 *resID)
+{
+    CMTItem message = {0, NULL, 0};
+    SecurityAdvisorRequest request;
+    SingleNumMessage reply;
+
+    if (!control) {
+        return CMTFailure;
+    }
+
+    if (!data) {
+        return CMTFailure;
+    }
+
+    request.infoContext = data->infoContext;
+    request.resID = data->resID;
+    request.hostname = data->hostname;
+	request.senderAddr = data->senderAddr;
+	request.encryptedP7CInfo = data->encryptedP7CInfo;
+	request.signedP7CInfo = data->signedP7CInfo;
+	request.decodeError = data->decodeError;
+	request.verifyError = data->verifyError;
+	request.encryptthis = data->encryptthis;
+	request.signthis = data->signthis;
+	request.numRecipients = data->numRecipients;
+	request.recipients = data->recipients;
+    message.type = SSM_REQUEST_MESSAGE | SSM_SECURITY_ADVISOR;
+
+    if (CMT_EncodeMessage(SecurityAdvisorRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Send the message and get the response */
+	if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+	}
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_SECURITY_ADVISOR)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *resID = reply.value;
+
+    return CMTSuccess;
+loser:
+
+    if (message.data) {
+        free(message.data);
+    }
+    return CMTFailure;
+}
+
+
+
+

mozilla/security/psm/lib/client/cmtclist.h

@@ -0,0 +1,111 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#ifndef cmtclist_h___
+#define cmtclist_h___
+
+typedef struct CMTCListStr CMTCList;
+/*
+** Circular linked list
+*/
+struct CMTCListStr {
+    CMTCList	*next;
+    CMTCList	*prev;
+};
+
+/*
+** Insert element "_e" into the list, before "_l".
+*/
+#define CMT_INSERT_BEFORE(_e,_l)	 \
+	(_e)->next = (_l);	 \
+	(_e)->prev = (_l)->prev; \
+	(_l)->prev->next = (_e); \
+	(_l)->prev = (_e);	 \
+
+/*
+** Insert element "_e" into the list, after "_l".
+*/
+#define CMT_INSERT_AFTER(_e,_l)	 \
+	(_e)->next = (_l)->next; \
+	(_e)->prev = (_l);	 \
+	(_l)->next->prev = (_e); \
+	(_l)->next = (_e);	 \
+
+/*
+** Append an element "_e" to the end of the list "_l"
+*/
+#define CMT_APPEND_LINK(_e,_l) CMT_INSERT_BEFORE(_e,_l)
+
+/*
+** Insert an element "_e" at the head of the list "_l"
+*/
+#define CMT_INSERT_LINK(_e,_l) CMT_INSERT_AFTER(_e,_l)
+
+/* Return the head/tail of the list */
+#define CMT_LIST_HEAD(_l) (_l)->next
+#define CMT_LIST_TAIL(_l) (_l)->prev
+
+/*
+** Remove the element "_e" from it's circular list.
+*/
+#define CMT_REMOVE_LINK(_e)	       \
+	(_e)->prev->next = (_e)->next; \
+	(_e)->next->prev = (_e)->prev; \
+
+/*
+** Remove the element "_e" from it's circular list. Also initializes the
+** linkage.
+*/
+#define CMT_REMOVE_AND_INIT_LINK(_e)    \
+	(_e)->prev->next = (_e)->next; \
+	(_e)->next->prev = (_e)->prev; \
+	(_e)->next = (_e);	       \
+	(_e)->prev = (_e);	       \
+
+/*
+** Return non-zero if the given circular list "_l" is empty, zero if the
+** circular list is not empty
+*/
+#define CMT_CLIST_IS_EMPTY(_l) \
+    ((_l)->next == (_l))
+
+/*
+** Initialize a circular list
+*/
+#define CMT_INIT_CLIST(_l)  \
+	(_l)->next = (_l); \
+	(_l)->prev = (_l); \
+
+#define CMT_INIT_STATIC_CLIST(_l) \
+    {(_l), (_l)}
+
+#endif /* cmtclist_h___ */

mozilla/security/psm/lib/client/cmtevent.c

@@ -0,0 +1,480 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include <string.h>
+#ifdef XP_UNIX
+#include <sys/time.h>
+#endif
+
+/* Typedefs */
+typedef void (*taskcompleted_handler_fn)(CMUint32 resourceID, CMUint32 numReqProcessed, CMUint32 resultCode, void* data);
+
+CMTStatus CMT_SetUIHandlerCallback(PCMT_CONTROL control, 
+                                   uiHandlerCallback_fn f, void *data)
+{
+    return CMT_RegisterEventHandler(control, SSM_UI_EVENT, 0,
+                                    (void_fun)f, data);
+}
+
+void CMT_SetFilePathPromptCallback(PCMT_CONTROL control,
+                                   filePathPromptCallback_fn f, void* arg)
+{
+    control->userFuncs.promptFilePath = f;
+    control->userFuncs.filePromptArg  = arg;
+}
+
+void CMT_SetPromptCallback(PCMT_CONTROL control, 
+                           promptCallback_fn f, void *arg)
+{
+    control->userFuncs.promptCallback = f;
+    control->userFuncs.promptArg      = arg;
+}
+
+void CMT_SetSavePrefsCallback(PCMT_CONTROL control, savePrefsCallback_fn f)
+{
+    control->userFuncs.savePrefs = f;
+}
+
+CMTStatus CMT_RegisterEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                                   CMUint32 resourceID, void_fun handler, 
+                                   void* data)
+{
+    PCMT_EVENT ptr;
+
+    /* This is the first connection */
+    if (control->cmtEventHandlers == NULL) {
+        control->cmtEventHandlers = ptr = 
+            (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+        if (!ptr) {
+            goto loser;
+        }
+    } else {
+        /* Look for another event handler of the same type.  Make sure the
+           event handler with a rsrcid of 0 is farther down the list so
+	   that it doesn't get chosen when there's an event handler for
+	   a specific rsrcid.
+	 */
+	for (ptr=control->cmtEventHandlers; ptr != NULL; ptr = ptr->next) {
+            if (ptr->type == type && resourceID != 0) {
+                /* So we've got an event handler that wants to over-ride
+                   an existing event handler.  We'll put it before the one
+                   that's already here.
+                 */
+                if (ptr->previous == NULL) {
+                    /* We're going to insert at the front of the list*/
+                    control->cmtEventHandlers = ptr->previous = 
+                        (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+                    if (ptr->previous == NULL) {
+                        goto loser;
+		    }
+		    ptr->previous->next = ptr;
+		    ptr = control->cmtEventHandlers;
+		} else {
+		    /* We want to insert in the middle of the list */
+		    PCMT_EVENT tmpEvent;
+		    
+		    tmpEvent = (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+		    if (tmpEvent == NULL) {
+		        goto loser;
+		    }
+		    tmpEvent->previous  = ptr->previous;
+		    ptr->previous->next = tmpEvent;
+		    tmpEvent->next      = ptr;
+		    ptr->previous       = tmpEvent;
+		    ptr = tmpEvent;
+		}
+		break;
+	    }
+	    if (ptr->next == NULL) break;
+	}
+	if (ptr == NULL) {
+	    goto loser;	
+	}
+	if (ptr->next == NULL) {
+	    /* We're adding the event handler at the end of the list. */
+	    ptr->next = (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+	    if (!ptr->next) {
+	        goto loser;
+	    } 
+	    /* Fix up the pointers */
+	    ptr->next->previous = ptr;
+	    ptr = ptr->next;
+	}
+    }
+
+    /* Fill in the data */
+    ptr->type = type;
+    ptr->resourceID = resourceID;
+    ptr->handler = handler;
+    ptr->data = data;
+    
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_UnregisterEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                                     CMUint32 resourceID) 
+{
+    PCMT_EVENT ptr, pptr = NULL;
+    
+    for (ptr = control->cmtEventHandlers; ptr != NULL;
+	 pptr = ptr, ptr = ptr->next) {
+        if ((ptr->type == type) && (ptr->resourceID == resourceID)) {
+	    if (pptr == NULL) {
+	        /* node is at head */
+	        control->cmtEventHandlers = ptr->next;
+            if (control->cmtEventHandlers != NULL) {
+                control->cmtEventHandlers->previous = NULL;
+            }
+            free(ptr);
+            return CMTSuccess;
+	    }
+	    /* node is elsewhere */
+	    pptr->next = ptr->next;
+        if (ptr->next != NULL) {
+            ptr->next->previous = pptr;
+        }
+	    free(ptr);
+	    return CMTSuccess;
+        }
+    }
+    return CMTFailure;
+}
+
+PCMT_EVENT CMT_GetEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                               CMUint32 resourceID)
+{
+    PCMT_EVENT ptr;
+    
+    for (ptr = control->cmtEventHandlers; ptr != NULL; ptr = ptr->next) {
+        if ((ptr->type == type) && ((ptr->resourceID == resourceID) || 
+                                    !ptr->resourceID)) {
+            return ptr;
+        }
+    }
+    return NULL;
+}
+
+PCMT_EVENT CMT_GetFirstEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                                    CMUint32 resourceID)
+{
+    PCMT_EVENT ptr;
+
+    for (ptr = control->cmtEventHandlers; ptr != NULL; ptr = ptr->next) {
+        if ((ptr->type == type) && ((ptr->resourceID == resourceID) || 
+                                    !ptr->resourceID)) {
+            return ptr;
+        }
+    }
+    return NULL;
+}
+
+PCMT_EVENT CMT_GetNextEventHandler(PCMT_CONTROL control, PCMT_EVENT e)
+{
+    PCMT_EVENT ptr;
+
+    for (ptr = control->cmtEventHandlers; ptr != NULL || ptr == e; 
+         ptr = ptr->next) {
+    }
+
+    for (; ptr != NULL; ptr = ptr->next) {
+        if ((ptr->type == e->type) && ((ptr->resourceID == e->resourceID) || 
+                                       !ptr->resourceID)) {
+            return ptr;
+        }
+    }
+    return NULL;
+}
+
+void CMT_ProcessEvent(PCMT_CONTROL cm_control)
+{
+    CMTSocket sock; 
+    CMTItem eventData={ 0, NULL, 0 };
+
+    /* Get the control socket */
+    sock = cm_control->sock;
+
+    /* Acquire a lock on the control connection */
+    CMT_LOCK(cm_control->mutex);
+    /* Do another select here to be sure 
+       that the socket is readable */
+    if (cm_control->sockFuncs.select(&sock, 1, 1) != sock) {
+        /* There's no event. */
+        goto done;
+    }
+
+    /* Read the event */
+    if (CMT_ReceiveMessage(cm_control, &eventData) == CMTFailure) {
+        goto done;
+    }
+    CMT_UNLOCK(cm_control->mutex);
+    /* Dispatch the event */
+    CMT_DispatchEvent(cm_control, &eventData);
+    return;
+done:
+    /* Release the lock on the control connection */
+    CMT_UNLOCK(cm_control->mutex);
+}
+
+void CMT_EventLoop(PCMT_CONTROL cm_control)
+{
+    CMTSocket sock;
+
+    /* Get the control socket */
+    sock = cm_control->sock;
+    CMT_ReferenceControlConnection(cm_control);
+    /* Select on the control socket to see if it's readable */
+    while(cm_control->sockFuncs.select(&sock, 1, 0)) {
+      CMT_ProcessEvent(cm_control);
+    }
+    CMT_CloseControlConnection(cm_control);
+    return;
+}
+
+void
+CMT_PromptUser(PCMT_CONTROL cm_control, CMTItem *eventData)
+{
+    char *promptReply  = NULL;
+    CMTItem   response={ 0, NULL, 0 };
+    PromptRequest request;
+    PromptReply reply;
+    void * clientContext;
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(PromptRequestTemplate, &request, eventData) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Copy the client context to a pointer */
+    clientContext = CMT_CopyItemToPtr(request.clientContext);
+
+    if (cm_control->userFuncs.promptCallback == NULL) {
+        goto loser;
+    }
+    promptReply = 
+        cm_control->userFuncs.promptCallback(cm_control->userFuncs.promptArg, 
+                                             request.prompt, clientContext, 1);
+
+    response.type = SSM_EVENT_MESSAGE | SSM_PROMPT_EVENT;
+    if (!promptReply) {
+        /* the user canceled the prompt or other errors occurred */
+        reply.cancel = CM_TRUE;
+    }
+    else {
+        /* note that this includes an empty string (zero length) password */
+        reply.cancel = CM_FALSE;
+    }
+    reply.resID = request.resID;
+    reply.promptReply = promptReply;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(PromptReplyTemplate, &response, &reply) != CMTSuccess) {
+        goto loser;
+    }
+
+    CMT_TransmitMessage(cm_control, &response);
+ loser:
+    if (promptReply != NULL) {
+      cm_control->userFuncs.userFree(promptReply);
+    }
+    return;
+}
+
+void CMT_GetFilePath(PCMT_CONTROL cm_control, CMTItem * eventData)
+{
+    char *fileName=NULL;
+    CMTItem response = { 0, NULL, 0 };
+    FilePathRequest request;
+    FilePathReply reply;
+
+    /* Decode the request */
+    if (CMT_DecodeMessage(FilePathRequestTemplate, &request, eventData) != CMTSuccess) {
+        goto loser;
+    }
+
+    if (cm_control->userFuncs.promptFilePath == NULL) {
+        goto loser;
+    }
+    fileName = 
+     cm_control->userFuncs.promptFilePath(cm_control->userFuncs.filePromptArg,
+                                          request.prompt, request.fileRegEx, 
+                                          request.getExistingFile);
+
+    response.type = SSM_EVENT_MESSAGE | SSM_FILE_PATH_EVENT;
+    reply.resID = request.resID;
+    reply.filePath = fileName;
+
+    /* Encode the reply */
+    if (CMT_EncodeMessage(FilePathReplyTemplate, &response, &reply) != CMTSuccess) {
+        goto loser;
+    }
+
+    CMT_TransmitMessage(cm_control, &response);
+    cm_control->userFuncs.userFree(fileName); 
+loser:
+   return;
+}
+
+void CMT_SavePrefs(PCMT_CONTROL cm_control, CMTItem* eventData)
+{
+    SetPrefListMessage request;
+    int i;
+
+    /* decode the request */
+    if (CMT_DecodeMessage(SetPrefListMessageTemplate, &request, eventData) !=
+        CMTSuccess) {
+        return;
+    }
+
+    if (cm_control->userFuncs.savePrefs == NULL) {
+        /* callback was not registered: bail */
+        return;
+    }
+    cm_control->userFuncs.savePrefs(request.length, 
+                                    (CMTSetPrefElement*)request.list);
+
+    for (i = 0; i < request.length; i++) {
+        if (request.list[i].key != NULL) {
+            free(request.list[i].key);
+        }
+        if (request.list[i].value != NULL) {
+            free(request.list[i].value);
+        }
+    }
+    return;
+}
+
+void CMT_DispatchEvent(PCMT_CONTROL cm_control, CMTItem * eventData)
+{
+    CMUint32 eventType;
+    CMTItem msgCopy;
+
+    /* Init the msgCopy */
+    msgCopy.data = 0;    
+
+    /* Get the event type */
+    if ((eventData->type & SSM_CATEGORY_MASK) != SSM_EVENT_MESSAGE) {
+        /* Somehow there was a message on the socket that was not 
+         * an event message.  Dropping it on the floor.
+         */
+        goto loser;
+    }
+    eventType = (eventData->type & SSM_TYPE_MASK);
+
+    /* We must now dispatch the event based on it's type */
+    switch (eventType) {
+        case SSM_UI_EVENT:
+        {
+            PCMT_EVENT p;
+            UIEvent event;
+            void * clientContext = NULL;
+
+	    /* Copy the message to allow a second try with the old format */
+	    msgCopy.len = eventData->len;
+	    msgCopy.data = calloc(msgCopy.len, 1);
+	    if (msgCopy.data) {
+              memcpy(msgCopy.data, eventData->data, eventData->len);
+	    }
+
+            /* Get the event data first */
+            if (CMT_DecodeMessage(UIEventTemplate, &event, eventData) != CMTSuccess) {
+		/* Attempt to decode using the old format.  Modal is True */
+		if (!msgCopy.data || 
+		    CMT_DecodeMessage(OldUIEventTemplate, &event, &msgCopy) != CMTSuccess) {
+                  goto loser;
+                }
+
+                /* Set default modal value */
+                event.isModal = CM_TRUE;
+            }
+
+            /* Convert the client context to a pointer */
+            clientContext = CMT_CopyItemToPtr(event.clientContext);
+
+            /* Call any handlers for this event */
+            p = CMT_GetEventHandler(cm_control, eventType, event.resourceID);
+            if (!p) {
+                goto loser;
+            }
+            (*(uiHandlerCallback_fn)(p->handler))(event.resourceID, 
+                                                  clientContext, event.width,
+                                                  event.height, event.isModal, event.url, 
+                                                  p->data);
+            break;
+        }
+
+        case SSM_TASK_COMPLETED_EVENT:
+        {
+           PCMT_EVENT p;
+           TaskCompletedEvent event;
+
+            /* Get the event data */
+            if (CMT_DecodeMessage(TaskCompletedEventTemplate, &event, eventData) != CMTSuccess) {
+                goto loser;
+            }
+
+            /* Call handler for this event */
+            p = CMT_GetEventHandler(cm_control, eventType, event.resourceID);
+            if (!p) {
+                goto loser;
+            }
+            (*(taskcompleted_handler_fn)(p->handler))(event.resourceID, 
+                                                      event.numTasks, 
+                                                      event.result, p->data);
+            break;
+        }
+        case SSM_AUTH_EVENT: 
+             CMT_ServicePasswordRequest(cm_control, eventData);
+             break;
+        case SSM_FILE_PATH_EVENT:
+    	     CMT_GetFilePath(cm_control, eventData);
+             break;
+        case SSM_PROMPT_EVENT:
+	         CMT_PromptUser(cm_control, eventData);
+	         break;
+        case SSM_SAVE_PREF_EVENT:
+            CMT_SavePrefs(cm_control, eventData);
+            break;
+        default:
+            break;
+    }
+loser:
+    free(eventData->data);
+    free(msgCopy.data);
+    return;
+}
+

mozilla/security/psm/lib/client/cmthash.c

@@ -0,0 +1,216 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#else
+#ifdef XP_MAC
+#include "macsocket.h"
+#include "string.h"
+#else
+#include <windows.h>
+#include <winsock.h>
+#endif
+#endif
+#include <errno.h>
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include "rsrcids.h"
+
+CMTStatus CMT_HashCreate(PCMT_CONTROL control, CMUint32 algID, 
+                         CMUint32 * connID)
+{
+    CMTItem message;
+    SingleNumMessage request;
+    DataConnectionReply reply;
+
+    /* Check passed in parameters */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.value = algID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_DATA_CONNECTION | SSM_HASH_STREAM;
+
+    /* Send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the response */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_DATA_CONNECTION | SSM_HASH_STREAM)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(DataConnectionReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        CMTSocket sock;
+
+        sock = control->sockFuncs.socket(0);
+        if(sock == NULL) {
+            goto loser;
+        }
+        
+        if (control->sockFuncs.connect(sock, reply.port, NULL) != CMTSuccess) {
+            goto loser;
+        }
+        /* Send the hello message */
+		control->sockFuncs.send(sock, control->nonce.data, control->nonce.len);
+
+        /* Save connection info */
+        if (CMT_AddDataConnection(control, sock, reply.connID)
+		    != CMTSuccess) {
+            goto loser;
+        }
+
+        /* Set the connection ID */
+        *connID = reply.connID;
+        return CMTSuccess;
+	} 
+loser:
+    *connID = 0;
+	return CMTFailure;
+}
+
+CMTStatus CMT_HASH_Destroy(PCMT_CONTROL control, CMUint32 connectionID)
+{
+    if (!control) {
+        goto loser;
+    }
+
+    /* Get the cotext implementation data */
+    if (CMT_CloseDataConnection(control, connectionID) == CMTFailure) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+
+loser:
+
+    return CMTFailure;
+}
+
+CMTStatus CMT_HASH_Begin(PCMT_CONTROL control, CMUint32 connectionID)
+{
+    return CMTSuccess;
+}
+
+CMTStatus CMT_HASH_Update(PCMT_CONTROL control, CMUint32 connectionID, const unsigned char * buf, CMUint32 len)
+{
+    CMTSocket sock;
+    CMUint32 sent;
+
+    /* Do some parameter checking */
+    if (!control || !buf) {
+        goto loser;
+    }
+
+    /* Get the data socket */
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Write the data to the socket */
+    sent = CMT_WriteThisMany(control, sock, (void*)buf, len);
+    if (sent != len) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+
+loser:
+
+    return CMTFailure;
+}
+
+CMTStatus CMT_HASH_End(PCMT_CONTROL control, CMUint32 connectionID, 
+                       unsigned char * result, CMUint32 * resultlen, 
+                       CMUint32 maxLen)
+{
+    CMTItem hash = { 0, NULL, 0 };
+
+    /* Do some parameter checking */
+    if (!control || !result || !resultlen) {
+        goto loser;
+    }
+
+    /* Close the connection */
+    if (CMT_CloseDataConnection(control, connectionID) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Get the context info */
+    if (CMT_GetStringAttribute(control, connectionID, SSM_FID_HASHCONN_RESULT,
+                               &hash) == CMTFailure) {
+        goto loser;
+    }
+    if (!hash.data) {
+        goto loser;
+    }
+
+    *resultlen = hash.len;
+    if (hash.len > maxLen) {
+        memcpy(result, hash.data, maxLen);
+    } else {
+        memcpy(result, hash.data, hash.len);
+    }   
+
+    if (hash.data) {
+        free(hash.data);
+    }
+
+    return CMTSuccess;
+
+loser:
+    if (hash.data) {
+        free(hash.data);
+    }
+
+    return CMTFailure;
+}

mozilla/security/psm/lib/client/cmtimpl.h

@@ -0,0 +1,56 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#ifndef __CMTIMPL_H_
+#define __CMTIMPL_H_
+
+typedef unsigned long CMT_HANDLE;
+
+struct _CMTControl {
+  CMT_HANDLE channelID;
+  int socketID;
+  CMTStatus (* cmtEventCallback)(struct _CMTControl * control, 
+				 CMTItem * event,  void * arg);
+  void * cmtEventCallbackArg;
+  struct _CMTData * cmtDataConnection;
+} _CMTControl;
+
+
+
+struct _CMTData {
+  CMT_HANDLE channelID;
+  int socketID;
+  struct _CMTData * next;
+  struct _CMTData * previous;
+};
+
+#endif /*__CMTIMPL_H_*/

mozilla/security/psm/lib/client/cmtinit.c

@@ -0,0 +1,490 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/stat.h>
+#ifndef XP_BEOS
+#include <netinet/tcp.h>
+#endif
+#else
+#ifdef XP_MAC
+#include <Events.h> // for WaitNextEvent
+#else /* Windows */
+#include <windows.h>
+#include <winsock.h>
+#include <direct.h>
+#include <sys/stat.h>
+#endif
+#endif
+
+#include "messages.h"
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include <string.h>
+
+#if defined(XP_UNIX) || defined(XP_BEOS)
+#define DIRECTORY_SEPARATOR '/'
+#elif defined(WIN32) || defined(XP_OS2)
+#define DIRECTORY_SEPARATOR '\\'
+#elif defined XP_MAC
+#define DIRECTORY_SEPARATOR ':'
+#endif
+
+/* Local defines */
+#define CARTMAN_PORT	11111
+#define MAX_PATH_LEN    256
+
+/* write to the cmnav.log */
+#if 0
+#define LOG(x); do { FILE *f; f=fopen("cmnav.log","a+"); if (f) { \
+   fprintf(f, x); fclose(f); } } while(0);
+#define LOG_S(x); do { FILE *f; f=fopen("cmnav.log","a+"); if (f) { \
+   fprintf(f, "%s", x); fclose(f); } } while(0);
+#define ASSERT(x); if (!(x)) { LOG("ASSERT:"); LOG(#x); LOG("\n"); exit(-1); }
+#else
+#define LOG(x); ;
+#define LOG_S(x); ;
+#define ASSERT(x); ;
+#endif
+
+static char*
+getCurrWorkDir(char *buf, int maxLen)
+{
+#if defined WIN32
+    return _getcwd(buf, maxLen);
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    return getcwd(buf, maxLen);
+#else
+    return NULL;
+#endif
+}
+
+static void
+setWorkingDir(char *path)
+{
+#if defined WIN32
+    _chdir(path);
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    chdir(path);
+#else
+    return;
+#endif
+}
+
+static CMTStatus
+launch_psm(char *executable)
+{
+#ifndef XP_MAC
+    char command[MAX_PATH_LEN];
+#endif
+#ifdef WIN32
+    STARTUPINFO sui;
+    PROCESS_INFORMATION pi;
+    UNALIGNED long *posfhnd;
+    int i;
+    char *posfile;
+
+    sprintf(command,"%s > psmlog", executable);
+    ZeroMemory( &sui, sizeof(sui) );
+    sui.cb = sizeof(sui);
+    sui.cbReserved2 = (WORD)(sizeof( int ) + (3 * (sizeof( char ) + 
+                                                   sizeof( long ))));
+    sui.lpReserved2 = calloc( sui.cbReserved2, 1 );
+    *((UNALIGNED int *)(sui.lpReserved2)) = 3;
+    posfile = (char *)(sui.lpReserved2 + sizeof( int ));
+    posfhnd = (UNALIGNED long *)(sui.lpReserved2 + sizeof( int ) + 
+                                 (3 * sizeof( char )));
+    
+    for ( i = 0, posfile = (char *)(sui.lpReserved2 + sizeof( int )),
+              posfhnd = (UNALIGNED long *)(sui.lpReserved2 + sizeof( int ) + (3 * sizeof( char ))) ;
+          i < 3 ; i++, posfile++, posfhnd++ ) {
+        
+        *posfile = 0;
+        *posfhnd = (long)INVALID_HANDLE_VALUE;
+    }
+    /* Now, fire up PSM */
+    if (!CreateProcess(NULL, command, NULL, NULL, TRUE, DETACHED_PROCESS, 
+                       NULL, NULL, &sui, &pi)) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    sprintf(command,"./%s &", executable);
+    if (system(command) == -1) {
+        goto loser;
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+#else
+    return CMTFailure;
+#endif
+}
+
+PCMT_CONTROL CMT_EstablishControlConnection(char            *inPath, 
+                                            CMT_SocketFuncs *sockFuncs,
+                                            CMT_MUTEX       *mutex)
+{
+    PCMT_CONTROL control;
+#ifndef XP_MAC
+    char *executable;
+    char *newWorkingDir;
+    char oldWorkingDir[MAX_PATH_LEN];
+    size_t stringLen;
+#endif    
+    int i;
+    char *path = NULL;
+
+    /*	On the Mac, we do special magic in the Seamonkey PSM component, so
+    	if PSM isn't launched by the time we reach this point, we're not doing well. */
+#ifndef XP_MAC
+
+    struct stat stbuf;
+    
+    /*
+     * Create our own copy of path.
+     * I'd like to do a straight strdup here, but that caused problems
+     * for https.
+     */
+    stringLen = strlen(inPath);
+
+    path = (char*) malloc(stringLen+1);
+    memcpy(path, inPath, stringLen);
+    path[stringLen] = '\0';
+
+    control = CMT_ControlConnect(mutex, sockFuncs);
+    if (control != NULL) {
+        return control;
+    }
+    /*
+     * We have to try to launch it now, so it better be a valid 
+     * path.
+     */
+    if (stat(path, &stbuf) == -1) {
+        goto loser;
+    }
+    /*
+     * Now we have to parse the path and launch the psm server.
+     */
+    executable = strrchr(path, DIRECTORY_SEPARATOR);
+    if (executable != NULL) {
+        *executable = '\0';
+        executable ++;
+        newWorkingDir = path;
+    } else {
+        executable = path;
+        newWorkingDir = NULL;
+    }
+    if (getCurrWorkDir(oldWorkingDir, MAX_PATH_LEN) == NULL) {
+        goto loser;
+    }
+    setWorkingDir(newWorkingDir);
+    if (launch_psm(executable) != CMTSuccess) {
+        goto loser;
+    }
+    setWorkingDir(oldWorkingDir);
+#endif
+
+    /*
+     * Now try to connect to the psm server.  We will try to connect
+     * a maximum of 30 times and then give up.
+     */
+#ifdef WIN32
+    for (i=0; i<30; i++) {
+        Sleep(1000);
+        control = CMT_ControlConnect(mutex, sockFuncs);
+        if (control != NULL) {
+            break;
+        }
+    }
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    i = 0;
+    while (i<1000) {
+        i += sleep(10);
+	control = CMT_ControlConnect(mutex, sockFuncs);
+	if (control != NULL) {
+	  break;
+	}
+    }
+#elif defined(XP_MAC)
+	for (i=0; i<30; i++) 
+	{
+		EventRecord theEvent;
+		WaitNextEvent(0, &theEvent, 30, NULL);
+		control = CMT_ControlConnect(mutex, sockFuncs);
+		if (control != NULL) 
+			break;
+	}
+
+#else
+    /*
+     * Figure out how to sleep for a while first
+     */
+    for (i=0; i<30; i++) {
+      control = CMT_ControlConnect(mutex, sockFuncs);
+      if (control!= NULL) {
+	break;
+      }
+    }
+#endif
+    if (control == NULL) {
+        goto loser;
+    }
+    if (path) {
+        free (path);
+    }
+    return control;
+ loser:
+    if (control != NULL) {
+        CMT_CloseControlConnection(control);
+    }
+    if (path) {
+        free(path);
+    }
+    return NULL;
+}
+
+
+PCMT_CONTROL CMT_ControlConnect(CMT_MUTEX *mutex, CMT_SocketFuncs *sockFuncs)
+{
+    PCMT_CONTROL control = NULL; 
+    CMTSocket sock=NULL;
+#ifdef XP_UNIX
+    int unixSock = 1;
+    char path[20];
+#else
+    int unixSock = 0;
+    char *path=NULL;
+#endif
+
+    if (sockFuncs == NULL) {
+        return NULL;
+    }
+#ifdef XP_UNIX
+    sprintf(path, "/tmp/.nsmc-%d", (int)geteuid());
+#endif    
+
+    sock = sockFuncs->socket(unixSock);
+    if (sock == NULL) {
+        LOG("Could not create a socket to connect to Control Connection.\n");
+        goto loser;
+    }
+    /* Connect to the psm process */
+    if (sockFuncs->connect(sock, CARTMAN_PORT, path)) {
+	  LOG("Could not connect to Cartman\n");
+	  goto loser;
+    }
+
+#ifdef XP_UNIX
+    if (sockFuncs->verify(sock) != CMTSuccess) {
+        goto loser;
+    }
+#endif
+
+	LOG("Connected to Cartman\n");
+	
+	/* fill in the CMTControl struct */
+	control = (PCMT_CONTROL)calloc(sizeof(CMT_CONTROL), 1);
+	if (control == NULL ) {
+		goto loser;
+	}
+	control->sock = sock;
+    if (mutex != NULL) {
+        control->mutex = (CMT_MUTEX*)calloc(sizeof(CMT_MUTEX),1);
+        if (control->mutex == NULL) {
+            goto loser;
+        }
+        *control->mutex = *mutex;
+    }
+    memcpy(&control->sockFuncs, sockFuncs, sizeof(CMT_SocketFuncs));
+    control->refCount = 1;
+	goto done;
+    
+ loser:
+	if (control != NULL) {
+		free(control);
+    }
+    if (sock != NULL) {
+        sockFuncs->close(sock);
+    }
+	control = NULL;
+    
+ done:
+	return control;
+}
+
+CMTStatus CMT_CloseControlConnection(PCMT_CONTROL control)
+{
+	/* XXX Don't know what to do here yet */
+    if (control != NULL) {
+        CMInt32 refCount;
+        CMT_LOCK(control->mutex);
+        control->refCount--;
+        refCount = control->refCount;
+        CMT_UNLOCK(control->mutex);
+        if (refCount <= 0) {
+            if (control->mutex != NULL) {
+                free (control->mutex);
+            }
+            control->sockFuncs.close(control->sock);
+            free(control);
+        }
+    }
+    
+	return CMTSuccess;
+}
+
+CMTStatus CMT_Hello(PCMT_CONTROL control, CMUint32 version, char* profile, 
+                    char* profileDir)
+{
+	CMTItem message;
+    PCMT_EVENT eventHandler;
+    CMBool doesUI;
+    HelloRequest request;
+    HelloReply reply;
+
+	/* Check the passed parameters */
+	if (!control) {
+		return CMTFailure;
+	}
+	if (!profile) {
+		return CMTFailure;
+	}
+    if (!profileDir) {
+        return CMTFailure;
+    }
+    
+	/* Create the hello message */
+    eventHandler = CMT_GetEventHandler(control, SSM_UI_EVENT, 0);
+    doesUI = (eventHandler == NULL) ? CM_FALSE : CM_TRUE;
+
+    /* Setup the request struct */
+    request.version = version;
+    request.policy = 0; /* no more policy */
+    request.doesUI = doesUI;
+    request.profile = profile;
+    request.profileDir = profileDir;
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_HELLO_MESSAGE;
+
+    if (CMT_EncodeMessage(HelloRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+	/* Send the message and get the response */
+	if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+	}
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_HELLO_MESSAGE)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(HelloReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+	/* Successful response */
+	if (reply.result == 0) {
+            /* Save the nonce value */
+            control->sessionID = reply.sessionID;
+            control->protocolVersion = reply.version;
+            control->port = reply.httpPort;
+            control->nonce = reply.nonce;
+            control->policy = reply.policy;
+            control->serverStringVersion = reply.stringVersion;
+
+            /* XXX Free the messages */
+            return CMTSuccess;
+	}
+loser:
+	/* XXX Free the messages */
+	return CMTFailure;
+}
+
+CMTStatus CMT_PassAllPrefs(PCMT_CONTROL control, int num,
+                           CMTSetPrefElement* list)
+{
+    SetPrefListMessage request;
+    SingleNumMessage reply;
+    CMTItem message;
+
+    if ((control == NULL) || (list == NULL)) {
+        return CMTFailure;
+    }
+
+    /* pack the request */
+    request.length = num;
+    request.list = (SetPrefElement*)list;
+
+    if (CMT_EncodeMessage(SetPrefListMessageTemplate, &message, &request) !=
+        CMTSuccess) {
+        goto loser;
+    }
+    message.type = SSM_REQUEST_MESSAGE | SSM_PREF_ACTION;
+
+    /* send the message */
+    if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PREF_ACTION)) {
+        goto loser;
+    }
+
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) !=
+        CMTSuccess) {
+        goto loser;
+    }
+
+    /* don't really need to check the return value */
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+char* CMT_GetServerStringVersion(PCMT_CONTROL control)
+{
+    if (control == NULL) {
+        return NULL;
+    }
+    return control->serverStringVersion;
+}

mozilla/security/psm/lib/client/cmtjs.c

@@ -0,0 +1,556 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#include "cmtutils.h"
+#include "cmtjs.h"
+#include "messages.h"
+
+CMTStatus
+CMT_GenerateKeyPair(PCMT_CONTROL control, CMUint32 keyGenContext, 
+		    CMUint32 mechType, CMTItem *param, CMUint32 keySize, 
+		    CMUint32 *keyPairId)
+{
+    CMTItem message;
+    CMTStatus rv;
+    KeyPairGenRequest request = {0, 0, 0, {0, NULL, 0}};
+    SingleNumMessage reply;
+
+    if (!control) {
+        return CMTFailure;
+    }
+
+    request.keyGenCtxtID = keyGenContext;
+    request.genMechanism = mechType;
+    if (param) {
+        request.params = *param;
+    }
+    request.keySize = keySize;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(KeyPairGenRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_CREATE_KEY_PAIR;
+
+    /* Send the message and get the response */
+    rv = CMT_SendMessage(control, &message); 
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_CREATE_KEY_PAIR)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+    *keyPairId = reply.value;
+    return CMTSuccess;
+    
+loser:
+    *keyPairId = 0;
+    return CMTFailure;
+}
+
+
+CMTStatus
+CMT_CreateNewCRMFRequest(PCMT_CONTROL control, CMUint32 keyPairID, 
+			 SSMKeyGenType keyGenType, CMUint32 *reqID)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleNumMessage request;
+    SingleNumMessage reply;
+    
+    if (!control) {
+        return CMTFailure;
+    }
+
+    request.value = keyPairID;
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | 
+                    SSM_CREATE_CRMF_REQ;
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+  
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_CREATE_CRMF_REQ)) {
+        goto loser;
+    }
+
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *reqID = reply.value;
+
+    rv = CMT_SetNumericAttribute(control, *reqID, SSM_FID_CRMFREQ_KEY_TYPE,
+				 keyGenType);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_EncodeCRMFRequest(PCMT_CONTROL control, CMUint32 *crmfReqID, 
+		      CMUint32 numRequests, char ** der)
+{
+    CMTItem   message;
+    CMTStatus  rv;
+    EncodeCRMFReqRequest request;
+    SingleItemMessage reply;
+
+    if (!control) {
+        return CMTFailure;
+    }
+
+    request.numRequests = numRequests;
+    request.reqIDs = (long *) crmfReqID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(EncodeCRMFReqRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | SSM_DER_ENCODE_REQ;
+
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_DER_ENCODE_REQ)) {
+        goto loser;
+    }
+
+    /* XXX Should this be a string? Decode the message */
+    if (CMT_DecodeMessage(SingleItemMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *der = (char *) reply.item.data;
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_ProcessCMMFResponse(PCMT_CONTROL control, char *nickname,
+			char *certRepString, CMBool doBackup,
+			void *clientContext)
+{
+    CMTItem   message;
+    CMTStatus  rv;
+    CMMFCertResponseRequest request;
+
+    if(!control) {
+        return CMTFailure;
+    }
+
+    request.nickname = nickname;
+    request.base64Der = certRepString;
+    request.doBackup = doBackup;
+    request.clientContext = CMT_CopyPtrToItem(clientContext);
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(CMMFCertResponseRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type =  SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | SSM_PROCESS_CMMF_RESP;
+
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_PROCESS_CMMF_RESP)) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_CreateResource(PCMT_CONTROL control, SSMResourceType resType,
+		   CMTItem *params, CMUint32 *rsrcId, CMUint32 *errorCode)
+{
+    CMTItem message;
+    CMTStatus rv;
+    CreateResourceRequest request = {0, {0, NULL, 0}};
+    CreateResourceReply reply;
+
+    request.type = resType;
+    if (params) {
+        request.params = *params;
+    } 
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(CreateResourceRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_CREATE_RESOURCE;
+    
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_CREATE_RESOURCE)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(CreateResourceReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *rsrcId = reply.resID;
+    *errorCode = reply.result;
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_SignText(PCMT_CONTROL control, CMUint32 resID, char* stringToSign, char* hostName, char* caOption, CMInt32 numCAs, char** caNames)
+{
+    CMTItem message;
+    SignTextRequest request;
+
+    
+    /* So some basic parameter checking */
+    if (!control || !stringToSign) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = resID;
+    request.stringToSign = stringToSign;
+    request.hostName = hostName;
+    request.caOption = caOption;
+    request.numCAs = numCAs;
+    request.caNames = caNames;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(SignTextRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_FORMSIGN_ACTION | SSM_SIGN_TEXT;
+
+    /* Send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_FORMSIGN_ACTION | SSM_SIGN_TEXT)) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_ProcessChallengeResponse(PCMT_CONTROL control, char *challengeString,
+			     char **responseString)
+{
+    CMTItem   message;
+    CMTStatus  rv;
+    SingleStringMessage request;
+    SingleStringMessage reply;
+
+    /* Set the request */
+    request.string = challengeString;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleStringMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | SSM_CHALLENGE;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+    
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_CHALLENGE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(SingleStringMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *responseString = reply.string;
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_FinishGeneratingKeys(PCMT_CONTROL control, CMUint32 keyGenContext)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleNumMessage request;
+
+    /* Set up the request */
+    request.value = keyGenContext;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_FINISH_KEY_GEN;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the reply */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_FINISH_KEY_GEN)) {
+        goto loser;
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_GetLocalizedString(PCMT_CONTROL        control,
+                       SSMLocalizedString  whichString,
+                       char              **localizedString)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleNumMessage request;
+    GetLocalizedTextReply reply;
+
+    /* Set up the request */
+    request.value = whichString;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_LOCALIZED_TEXT;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_LOCALIZED_TEXT)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(GetLocalizedTextReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    if (reply.whichString != whichString) {
+        goto loser;
+    }
+    *localizedString = reply.localizedString;
+    return CMTSuccess;
+ loser:
+    *localizedString = NULL;
+    return rv; 
+}
+
+CMTStatus
+CMT_AddNewModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 char         *libraryPath,
+                 unsigned long pubMechFlags,
+                 unsigned long pubCipherFlags)
+{
+    CMTItem message;
+    CMTStatus rv;
+    AddNewSecurityModuleRequest request;
+    SingleNumMessage reply;
+
+    /* Set up the request */
+    request.moduleName = moduleName;
+    request.libraryPath = libraryPath;
+    request.pubMechFlags = pubMechFlags;
+    request.pubCipherFlags = pubCipherFlags;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(AddNewSecurityModuleRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_ADD_NEW_MODULE;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_ADD_NEW_MODULE)) {
+        goto loser;
+    }
+
+    /* Decode the response */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    return (CMTStatus) reply.value;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_DeleteModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 int          *moduleType)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleStringMessage request;
+    SingleNumMessage reply;
+
+    /* Set up the request */
+    request.string = moduleName;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleStringMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_DEL_MODULE;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_DEL_MODULE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *moduleType = reply.value;
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_LogoutAllTokens(PCMT_CONTROL control)
+{
+  CMTItem message;
+  CMTStatus rv;
+
+  message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_LOGOUT_ALL;
+  message.data = NULL;
+  message.len  = 0;
+
+  rv = CMT_SendMessage(control, &message);
+  if (rv != CMTSuccess) {
+    return rv;
+  }
+  if (message.type !=  (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | 
+			SSM_LOGOUT_ALL)) {
+    return CMTFailure;
+  }
+  return CMTSuccess;
+}
+
+CMTStatus CMT_GetSSLCapabilities(PCMT_CONTROL control, CMInt32 *capabilites)
+{
+    SingleNumMessage reply;
+    CMTItem message;
+    CMTStatus rv;
+
+    message.type = (SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | 
+                    SSM_ENABLED_CIPHERS);
+    message.data = NULL;
+    message.len  = 0;
+
+    rv = CMT_SendMessage(control, &message);
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION |
+			 SSM_ENABLED_CIPHERS)) {
+        goto loser;
+    }
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, 
+                          &message) != CMTSuccess) {
+        goto loser;
+    }
+    *capabilites = reply.value;
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}

mozilla/security/psm/lib/client/cmtjs.h

@@ -0,0 +1,555 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#ifndef _CMTJS_H_
+#define _CMTJS_H_
+#include "cmtcmn.h"
+#include "ssmdefs.h"
+#include "rsrcids.h"
+/*
+ * Define some constants.
+ */
+
+/*
+ * These defines are used in conjuction with the function
+ * CMT_AddNewModule.
+ */
+#define PUBLIC_MECH_RSA_FLAG         0x00000001ul
+#define PUBLIC_MECH_DSA_FLAG         0x00000002ul
+#define PUBLIC_MECH_RC2_FLAG         0x00000004ul
+#define PUBLIC_MECH_RC4_FLAG         0x00000008ul
+#define PUBLIC_MECH_DES_FLAG         0x00000010ul
+#define PUBLIC_MECH_DH_FLAG          0x00000020ul
+#define PUBLIC_MECH_FORTEZZA_FLAG    0x00000040ul
+#define PUBLIC_MECH_RC5_FLAG         0x00000080ul
+#define PUBLIC_MECH_SHA1_FLAG        0x00000100ul
+#define PUBLIC_MECH_MD5_FLAG         0x00000200ul
+#define PUBLIC_MECH_MD2_FLAG         0x00000400ul
+ 
+#define PUBLIC_MECH_RANDOM_FLAG      0x08000000ul
+#define PUBLIC_MECH_FRIENDLY_FLAG    0x10000000ul
+#define PUBLIC_OWN_PW_DEFAULTS       0X20000000ul
+#define PUBLIC_DISABLE_FLAG          0x40000000ul
+
+
+/*
+ * This is the lone supported constant for the Cipher flag
+ * for CMT_AddNewModule
+ */
+#define PUBLIC_CIPHER_FORTEZZA_FLAG  0x00000001ul
+
+CMT_BEGIN_EXTERN_C
+
+/*
+ * FUNCTION: CMT_GenerateKeyPair
+ * -----------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    keyGenContext
+ *        The Resource ID of a key gen context to use for creating the
+ *        key pair.
+ *    mechType
+ *        A PKCS11 mechanism used to generate the key pair. Valid values are:
+ *          CKM_RSA_PKCS_KEY_PAIR_GEN    0x00000000
+ *          CKM_DSA_KEY_PAIR_GEN         0x00000010
+ *        The definition of these values can be found at 
+ *        http://www.rsa.com/rsalabs/pubs/pkcs11.html
+ *        The psm module currently supports v2.01 of PKCS11
+ *    params
+ *        This parameter will be used to pass parameters to the Key Pair
+ *        generation process.  Currently this feature is not supported, so 
+ *        pass in NULL for this parameter.
+ *    keySize
+ *        The size (in bits) of the key to generate.
+ *    keyPairId
+ *        A pointer to pre-allocated memory where the function can place
+ *        the value of the resource ID of the key pair that gets created.
+ *
+ * NOTES:
+ * This function will send a message to the psm server requesting that 
+ * a public/private key pair be generated. The key gen context will queue
+ * the request. You can send as many key gen requests as you want with a
+ * given key gen context. After sending all the key gen requests, the user
+ * must call CMT_FinishGeneratingKeys so that the key gen context actually
+ * generates the keys.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates the request for key generation
+ * was queued successfully and the corresponding resource ID can be found
+ * at *keyPairId.  Any other return value indicates an error and the value
+ * at *keyPairId should be ignored.
+ */
+CMTStatus
+CMT_GenerateKeyPair(PCMT_CONTROL control, CMUint32 keyGenContext, 
+		    CMUint32 mechType, CMTItem *params, CMUint32 keySize, 
+		    CMUint32 *keyPairId);
+
+/*
+ * FUNCTION: CMT_FinishGeneratingKeys
+ * ----------------------------------
+ * INPUTS
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    keyGenContext
+ *        The resource ID of the key gen context which should finish 
+ *        generating its key pairs.
+ * NOTES
+ * This function will send a message to the psm server notifying the key 
+ * gen context with the resource ID of keyGenContext to finish generating
+ * all of the key gen requests it has queued up. After each key gen has 
+ * finished, the psm server will send a SSM_TASK_COMPLETED_EVENT. So in order
+ * to detect when all of the key gens are done, the user should register 
+ * an event handler.  See comments for CMT_RegisterEventHandler for information
+ * on how to successfully register event handler callbacks. You must register
+ * the event handler with keyGenContext as the target resource ID for this
+ * to work correctly.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates the key gen context has started to
+ * generate the key pairs in its queue. Any other return value indicates an
+ * error and the key pairs will not be generated.
+ */
+CMTStatus
+CMT_FinishGeneratingKeys(PCMT_CONTROL control, CMUint32 keyGenContext);
+
+/*
+ * FUNCTION: CMT_CreateNewCRMFRequest
+ * ----------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    keyPairID
+ *        The resource ID of the key pair that should be associated with
+ *        the CRMF request created. At the time this function is called,
+ *        key pair should have already been created. 
+ *    keyGenType
+ *        An enumeration that explains how the key pair will be used.
+ *        Look at the definition of SSMKeyGenType in ssmdefs.h for valid
+ *        values and their affects on the request.
+ *    reqID
+ *        A pointer to a pre-allocatd chunk of memory where the library 
+ *        can place the resource ID of the new CRMF request.
+ * NOTES:
+ * This function sends a message to the psm server requesting that a new 
+ * CRMF resource object be created. Each CRMF request must be associated with 
+ * a public/private key pair, that is why the keyPairID parameter exists.
+ * The keyGenType parameter is used to initialize the request, eg set the
+ * correct keyUsage extension.
+ * 
+ * Before encoding a CRMF request, the user will want to set the appropriate
+ * attributes to build up the request. The supported attributes are:
+ *
+ * Attribute Enumeration          Attribute Type       What value means
+ * ---------------------          --------------       ----------------
+ * SSM_FID_CRMFREQ_REGTOKEN       String               The value to encode as 
+ *                                                     the registration token
+ *                                                     value for the request.
+ *
+ * SSM_FID_CRMFREQ_AUTHENTICATOR String                The value to encode as
+ *                                                     authenticator control
+ *                                                     in the request.
+ * 
+ * SSM_FID_DN                    String                The RFC1485 formatted
+ *                                                     DN to include in the
+ *                                                     CRMF request.
+ *
+ * For information on how to properly set the attribute of a resource, refer
+ * to the comments for the functions CMT_SetNumericAttribute and 
+ * CMT_SetStringAttribute.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates a new CRMF resource was created by
+ * the psm server and has the resource ID placed at *reqID. Any other return
+ * value indicates an error and the value at *reqID should be ignored.
+ */
+CMTStatus
+CMT_CreateNewCRMFRequest(PCMT_CONTROL control, CMUint32 keyPairID, 
+			 SSMKeyGenType keyGenType, CMUint32 *reqID);
+
+/*
+ * FUNCTION: CMT_EncodeCRMFRequest
+ * ------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    crmfReqID
+ *        An array of resource ID's for CRMF objects to be encoded.
+ *    numRequests
+ *        The length of the array crmfReqID that is passed in.
+ *    der
+ *        A pointer to a pre-allocated pointer for a char* where the library
+ *        can place the final DER-encoding of the requests.
+ * NOTES
+ * This function will send a message to the psm server requesting that 
+ * a number of CRMF requests be encoded into their appropriate DER 
+ * representation. The DER that is sent back will be of the type 
+ * CertReqMessages as define in the internet draft for CRMF. To look at the
+ * draft, visit the following URL: 
+ * http://search.ietf.org/internet-drafts/internet-draft-ietf-pkix-crmf-01.txt
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates psm successfully encoded the requests
+ * and placed the base64 DER encoded request at *der. Any other return value
+ * indicates an error and the value at *der should be ignored.
+ */
+CMTStatus
+CMT_EncodeCRMFRequest(PCMT_CONTROL control, CMUint32 *crmfReqID, 
+		      CMUint32 numRequests, char ** der);
+
+/*
+ * FUNCTION: CMT_ProcessCMMFResponse
+ * ---------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    nickname
+ *        The nickname that should be associated with the certificate 
+ *        contained in the CMMF Response.
+ *    certRepString
+ *        This is the base 64 encoded CertRepContent that issues a certificate.
+ *        The psm server will decode the base 64 data and then parse the
+ *        CertRepContent.
+ *    doBackup
+ *        A boolean value indicating whether or not psm should initiate the
+ *        process of backing up the newly issued certificate into a PKCS-12
+ *        file.
+ *    clientContext
+ *         Client supplied data pointer that is returned to the client during
+ *         a UI event.
+ * NOTES:
+ * This function takes a CertRepContent as defined in the CMMF internet draft
+ * (http://search.ietf.org/internet-drafts/draft-ietf-pkix-cmmf-02.txt) and
+ * imports the certificate into the user's database. The certificate will have
+ * the string value of nickanme as it's nickname when added to the database
+ * unless another certificate with that same Distinguished Name (DN) already
+ * exists in the database, in which case the nickname of the certificate that
+ * already exists will be used. If the value passed in for doBackup is 
+ * non-zero, then the psm server will initiate the process of backing up the
+ * certificate(s) that were just imported.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates the certificate(s) were successfully
+ * added to the database. Any other return value means the certificate(s) could
+ * not be successfully added to the database.
+ */
+CMTStatus
+CMT_ProcessCMMFResponse(PCMT_CONTROL control, char *nickname, 
+			char *certRepString, CMBool doBackup,
+			void *clientContext);
+
+/*
+ * FUNCTION: CMT_CreateResource
+ * ----------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    resType
+ *        The enumeration representing the resource type to create.
+ *    params
+ *        A resource dependent binary string that will be sent to the psm 
+ *        server. Each resource will expect a binary string it defines.
+ *    rsrcId
+ *        A pointer to a pre-allocated chunk of memory where the library
+ *        can place the resource ID of the newly created resource.
+ *    errorCode
+ *        A pointer to a pre-allocated chunk of memory where the library
+ *        can place the errorCode returned by the psm server after creating
+ *        the resource.
+ * NOTES:
+ * This function sends a message to the psm server requesting that a new 
+ * resource be created.  The params parameter depends on the type of resource
+ * being created.  Below is a table detailing the format of the params for 
+ * a given resource type. Only the resource types listed below can be created
+ * by calling this function.
+ *
+ * Resource Type constant                  Value for params
+ * ------------------------------          ----------------
+ * SSM_RESTYPE_KEYGEN_CONTEXT              NULL
+ * SSM_RESTYPE_SECADVISOR_CONTEXT          NULL
+ * SSM_RESTYPE_SIGNTEXT                    NULL
+ *
+ * RETURN
+ * A return value of CMTSuccess means the psm server received the request and
+ * processed the create resource create. If the value at *errorCode is zero,
+ * then the value at *rsrcId is the resource ID of the newly created resource.
+ * Otherwise, creating the new resource failed and *errorCode contains the
+ * error code returned by the psm server. ???What are the return values and
+ * what do they mean. Any other return value indicates there was an error 
+ * in the communication with the psm server and the values at *rsrcId and 
+ * *errorCode should be ignored.
+ */
+CMTStatus
+CMT_CreateResource(PCMT_CONTROL control, SSMResourceType resType,
+		   CMTItem *params, CMUint32 *rsrcId, CMUint32 *errorCode);
+
+/*
+ * FUNCTION: CMT_SignText
+ * ----------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    resID
+ *        The resource ID of an SSMSignTextResource.
+ *    stringToSign
+ *        The string that the psm server should sign.
+ *    hostName
+ *        The host name of the site that is requesting a string to be
+ *        signed.  This is used for displaying the UI that tells the user
+ *        a web site has requested the use sign some text.
+ *    caOption
+ *        If the value is "auto" then psm will select the certificate
+ *        to use for signing automatically.
+ *        If the value is "ask" then psm will display a list of 
+ *        certificates for signing.
+ *    numCAs
+ *        The number of CA names included in the array caNames passed in as
+ *        the last parameter to this function.
+ *    caNames
+ *        An array of CA Names to use for filtering the user certs to use
+ *        for signing the text.
+ * NOTES
+ * This function will sign the text passed via the parameter stringToSign.
+ * The function will also cause the psm server to send some UI notifying the
+ * user that a site has requested the user sign some text.  The hostName 
+ * parameter is used in the UI to inform the user which site is requesting
+ * the signed text.  The caOption is used to determine if the psm server 
+ * should automatically select which personal cert to use in signing the
+ * text.  The caNames array is ussed to narrow down the field of personal
+ * certs to use when signing the text. In other words, only personal certs 
+ * trusted by the CA's passed in will be used.
+ *
+ * RETURN
+ * If the function returns CMTSuccess, that indicates the psm server 
+ * successfully signed the text.  The signed text can be retrieved by 
+ * calling CMT_GetStringResource and passing in SSM_FID_SIGNTEXT_RESULT
+ * as the field ID. Any other return value indicates an error meaning the
+ * string was not signed successfully.
+ */
+CMTStatus
+CMT_SignText(PCMT_CONTROL control, CMUint32 resID, char* stringToSign,
+             char* hostName, char *caOption, CMInt32 numCAs, char** caNames);
+
+/*
+ * FUNCTION: CMT_ProcessChallengeResponse
+ * --------------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    challengeString
+ *        The base64 encoded Challenge string received as the 
+ *        Proof-Of-Possession Challenge in response to CRMF request that
+ *        specified Challenge-Reponse as the method for Proof-Of-Possession.
+ *    responseString
+ *        A pointer to pre-allocated char* where the library can place a
+ *        copy of the bas64 encoded response to the challenge presented.
+ * NOTES
+ * This function takes the a challenge--that is encrypted with the public key
+ * of a certificate we created--and decrypts it with the private key we 
+ * generated.  The format of the challenge is as follows:
+ *
+ * Challenge ::= SEQUENCE { 
+ *      owf                 AlgorithmIdentifier  OPTIONAL, 
+ *      -- MUST be present in the first Challenge; MAY be omitted in any 
+ *      -- subsequent Challenge in POPODecKeyChallContent (if omitted, 
+ *      -- then the owf used in the immediately preceding Challenge is 
+ *      -- to be used). 
+ *      witness             OCTET STRING, 
+ *      -- the result of applying the one-way function (owf) to a 
+ *      -- randomly-generated INTEGER, A.  [Note that a different 
+ *      -- INTEGER MUST be used for each Challenge.] 
+ *      sender              GeneralName, 
+ *      -- the name of the sender. 
+ *      key                 OCTET STRING, 
+ *      -- the public key used to encrypt the challenge.  This will allow 
+ *      -- the client to find the appropriate key to do the decryption. 
+ *      challenge           OCTET STRING 
+ *      -- the encryption (under the public key for which the cert. 
+ *      -- request is being made) of Rand, where Rand is specified as 
+ *      --   Rand ::= SEQUENCE { 
+ *      --      int      INTEGER, 
+ *      --       - the randomly-generated INTEGER A (above) 
+ *      --      senderHash  OCTET STRING 
+ *      --       - the result of applying the one-way function (owf) to 
+ *      --       - the sender's general name 
+ *      --   } 
+ *      -- the size of "int" must be small enough such that "Rand" can be 
+ *      -- contained within a single PKCS #1 encryption block. 
+ *  } 
+ * This challenge is based on the Challenge initially defined in the CMMF
+ * internet draft, but differs in that this structure includes the sender
+ * as part of the challenge along with the public key and includes a has
+ * of the sender in the encrypted Rand structure.  The reason for including
+ * the key is to facilitate looking up the key that should be used to 
+ * decipher the challenge.  Including the hash of the sender in the encrypted
+ * Rand structure makes the challenge smaller and allows it to fit in 
+ * one RSA block. 
+ *
+ * The response is of the type POPODecKeyRespContent as defined in the CMMF
+ * internet draft.
+ *
+ * RETURN
+ * A return value of CMTSuccess indicates psm successfully parsed and processed
+ * the challenge and created a response.  The base64 encoded response to the
+ * challenge is placed at *responseString.  Any other return value indicates
+ * an error and the value at *responseString should be ignored.
+ */
+CMTStatus
+CMT_ProcessChallengeResponse(PCMT_CONTROL control, char *challengeString,
+			     char **responseString);
+
+/*
+ * FUNCTION: CMT_GetLocalizedString
+ * --------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    whichString
+ *        The enumerated value corresponding to the localized string to 
+ *        retrieve from the psm server
+ *    localizedString
+ *        A pointer to a pre-allocated char* where the library can place 
+ *        copy of the localized string retrieved from the psm server.
+ * NOTES
+ * This function retrieves a localized string from the psm server.  These 
+ * strings are useful for strings that aren't localized in the client 
+ * making use of the psm server, but need to be displayed by the user. Look
+ * in protocol.h for the enumerations of the localized strings that can 
+ * be fetched from psm via this method.
+ *
+ * RETURN
+ * A return value of CMTSuccess indicates the localized string was retrieved
+ * successfully and the localized value is located at *localizedString.  Any
+ * other return value indicates an error and the value at *localizedString
+ * should be ignored.
+ */
+CMTStatus 
+CMT_GetLocalizedString(PCMT_CONTROL        control, 
+                       SSMLocalizedString  whichString,
+                       char              **localizedString); 
+
+/*
+ * FUNCTION: CMT_DeleteModule
+ * --------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    moduleName
+ *        The name of the PKCS11 module to delete.
+ *    moduleType
+ *        A pointer to a pre-allocated integer where the library can place
+ *        a value that tells what the type of module was deleted.
+ * NOTES
+ * This function will send a message to the psm server requesting the server 
+ * delete a PKCS-11 module stored in psm's security module database. moduleName
+ * is the value passed in as moduleName when the module was added to the 
+ * security module database of psm.
+ * The values that may be returned by psm for moduleType are:
+ *
+ *    0      The module was an external module developped by a third party
+ *           that was added to the psm security module.
+ *
+ *    1      The module deleted was the internal PKCS-11 module that comes
+ *           built in with the psm server.
+ *
+ *    2      The module that was deleted was the FIPS  internal module.
+ *
+ * RETURN
+ * A return value of CMTSuccess indicates the security module was successfully
+ * delete from the psm security module database and the value at *moduleType
+ * will tell what type of module was deleted.
+ * Any other return value indicates an error and the value at *moduleType 
+ * should be ignored.
+ */
+CMTStatus
+CMT_DeleteModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 int          *moduleType);
+
+
+/*
+ * FUNCTION: CMT_AddNewModule
+ * --------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    moduleName
+ *        The name to be associated with the module once it is added to 
+ *        the psm security module database.
+ *    libraryPath
+ *        The path to the library to be  loaded.  The library should be 
+ *        loadable at run-time.
+ *    pubMechFlags
+ *        A bit vector indicating all cryptographic mechanisms that should
+ *        be turned on by default.  This module will become the default 
+ *        handler for the mechanisms that are set by this bit vector.
+ *    pubCipherFlags
+ *        A bit vector indicating all SSL or S/MIME cipher functions
+ *        supported by the module. Most modules will pas in 0x0 for this
+ *        parameter.
+ * NOTES:
+ * This function sends a message to the psm server and requests the .so
+ * file on UNIX or .dll file on Windows be loaded as a PKCS11 module and 
+ * be stored in the psm security module database.  The module will be stored
+ * with the name moduleName that is passed in and will always expect the 
+ * library to live at the path passed in via the parameter libraryPath.
+ * The pubMechFlags tell the psm server how this module should be used.
+ * Valid values are the #define constants defined at the beginning of
+ * this file.
+ * 
+ * RETURN
+ * A return value of CMTSuccess indicates the module was successfully loaded
+ * and placed in the security module database of psm.  Any other return value
+ * indicates an error and means the module was not loaded successfully and
+ * not stored in the psm server's security module database.
+ */
+CMTStatus
+CMT_AddNewModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 char         *libraryPath,
+                 unsigned long pubMechFlags,
+                 unsigned long pubCipherFlags);
+
+CMT_END_EXTERN_C
+
+#endif /*_CMTJS_H_*/

mozilla/security/psm/lib/client/cmtmac.c

@@ -0,0 +1,75 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#include "cmtmac.h"
+#include "macsocket.h"
+#include "stdlib.h"
+
+#ifndef XP_MAC
+#error Link with the builtin strdup() on your platform.
+#endif
+
+
+static void 
+my_strcpy(char *dest, const char *source)
+{
+	char *i = dest;
+	const char *j = source;
+	while(*j)
+		*i++ = *j++;
+	*i = '\0';
+}
+
+static int
+my_strlen(const char *str)
+{
+	const char *c = str;
+	int i = 0;
+	
+	while(*c++ != '\0')
+		i++;
+	return i;
+}
+
+char * strdup(const char *oldstr)
+{
+	/* used to keep the mac client library from referring to strdup elsewhere */
+	char *newstr;
+	
+	newstr = (char *) malloc(my_strlen(oldstr)+1);
+	if (newstr)
+		my_strcpy(newstr, oldstr);
+	return newstr;
+}
+

mozilla/security/psm/lib/client/cmtmac.h

@@ -0,0 +1,40 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#ifndef __CMTMAC_H__
+#define __CMTMAC_H__
+
+char * strdup(const char *str);
+
+#endif

mozilla/security/psm/lib/client/cmtpasswd.c

@@ -0,0 +1,119 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+/************************************************************************
+ * Code to handle password requests from the the PSM module.
+ * 
+ ************************************************************************
+ */
+
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+
+void CMT_SetAppFreeCallback(PCMT_CONTROL control, 
+			    applicationFreeCallback_fn f)
+{
+  control->userFuncs.userFree = f;
+}
+    
+void CMT_ServicePasswordRequest(PCMT_CONTROL cm_control, CMTItem * requestData)
+{ 
+  CMTItem response = {0, NULL, 0};
+  PasswordRequest request;
+  PasswordReply reply;
+  void * clientContext;
+
+  /********************************************
+   *  What we trying to do here: 
+   *  1) Throw up a dialog box and request a password.
+   *  2) Create a message and send it to the PSM module.
+   ********************************************
+   */
+  
+  /* Decode the request */
+  if (CMT_DecodeMessage(PasswordRequestTemplate, &request, requestData) != CMTSuccess) {
+      goto loser;
+  }
+
+  /* Copy the client context to a pointer */
+  clientContext = CMT_CopyItemToPtr(request.clientContext);
+
+  if (cm_control->userFuncs.promptCallback == NULL) {
+      goto loser;
+  }
+  reply.passwd = 
+    cm_control->userFuncs.promptCallback(cm_control->userFuncs.promptArg, 
+					 request.prompt, clientContext, 1);
+  reply.tokenID = request.tokenKey;
+  if (!reply.passwd) {
+      /* the user cancelled the prompt or other errors occurred */
+      reply.result = -1;
+  }
+  else {
+      /* note that this includes an empty string (zero length password) */
+      reply.result = 0;
+  }
+
+  /* Encode the reply */
+  if (CMT_EncodeMessage(PasswordReplyTemplate, &response, &reply) != CMTSuccess) {
+      goto loser;
+  }
+
+  /* Set the message response type */
+  response.type = SSM_EVENT_MESSAGE | SSM_AUTH_EVENT;
+  CMT_TransmitMessage(cm_control, &response);
+  goto done;
+loser:
+  /* something has gone wrong */
+
+done:
+  /*clean up anyway */
+  /* We can't just free up memory allocated by the host
+     application because the versions of free may not match up.
+     When you run the plug-in with an optimized older browser,
+     you'll see tons of Asserts (why they still have asserts in an
+     optimized build is a different question, but without them 
+     I wouldn't have figured out this problem) about a pointer not
+     being a valid heap pointer and eventually crash.  This was 
+     the offending free line.
+     So we need to call a function within the browser that 
+     calls the free linked in with it.  js_free is
+     such a function.  But this is extremely ugly.
+   */
+  if (reply.passwd) 
+    cm_control->userFuncs.userFree(reply.passwd);
+  if (request.prompt) 
+    free(request.prompt);
+  return;
+}
+

mozilla/security/psm/lib/client/cmtpkcs7.c

@@ -0,0 +1,664 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/time.h>
+#else
+#ifdef XP_MAC
+#include "macsocket.h"
+#else /* Windows */
+#include <windows.h>
+#include <winsock.h>
+#endif
+#endif
+#include <errno.h>
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include "rsrcids.h"
+
+typedef struct _CMTP7Private {
+    CMTPrivate priv;
+    CMTP7ContentCallback cb;
+    void *cb_arg;
+} CMTP7Private;
+
+CMTStatus CMT_PKCS7DecoderStart(PCMT_CONTROL control, void* clientContext, CMUint32 * connectionID, CMInt32 * result,
+                                CMTP7ContentCallback cb, void *cb_arg)
+{
+    CMTItem message;
+    CMTStatus rv;
+    CMTP7Private *priv=NULL;
+    SingleItemMessage request;
+    DataConnectionReply reply;
+
+    /* Check passed in parameters */
+    if (!control) {
+        goto loser;
+    }
+
+    request.item = CMT_CopyPtrToItem(clientContext);
+
+    /* Encode message */
+    if (CMT_EncodeMessage(SingleItemMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_DATA_CONNECTION | SSM_PKCS7DECODE_STREAM;
+
+    /* Send the message. */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_DATA_CONNECTION | SSM_PKCS7DECODE_STREAM)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(DataConnectionReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        CMTSocket sock;
+
+        priv = (CMTP7Private *)malloc(sizeof(CMTP7Private));
+        if (priv == NULL)
+            goto loser;
+        priv->priv.dest = (CMTReclaimFunc) free;
+        priv->cb = cb;
+        priv->cb_arg = cb_arg;
+        sock = control->sockFuncs.socket(0);
+        if (sock == NULL) {
+            goto loser;
+        }
+ 
+       if (control->sockFuncs.connect(sock, (short)reply.port, 
+                                      NULL) != CMTSuccess) {
+            goto loser;
+        }
+ 
+        if (control->sockFuncs.send(sock, control->nonce.data, 
+                                    control->nonce.len) != control->nonce.len){
+            goto loser;
+        }
+
+        /* Save connection info */
+        if (CMT_AddDataConnection(control, sock, reply.connID)
+            != CMTSuccess) {
+            goto loser;
+        }
+        *connectionID = reply.connID;
+
+        rv = CMT_SetPrivate(control, reply.connID, &priv->priv);
+        if (rv != CMTSuccess)
+            goto loser;
+
+        return CMTSuccess;
+    } 
+
+loser:
+    if (priv) {
+        free(priv);
+    }
+
+	*result = reply.result;
+    return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7DecoderUpdate(PCMT_CONTROL control, CMUint32 connectionID, const char * buf, CMUint32 len)
+{
+    CMUint32 sent;
+    CMTP7Private *priv;
+    unsigned long nbytes;
+    char read_buf[128];
+    CMTSocket sock, ctrlsock, selSock, sockArr[2];
+
+    /* Do some parameter checking */
+    if (!control || !buf) {
+        goto loser;
+    }
+
+    /* Get the data socket */
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    priv = (CMTP7Private *)CMT_GetPrivate(control, connectionID);
+    if (priv == NULL)
+        goto loser;
+
+    /* Write the data to the socket */
+    sent = CMT_WriteThisMany(control, sock, (void*)buf, len);
+    if (sent != len) {
+        goto loser;
+    }
+
+	ctrlsock = control->sock;
+	sockArr[0] = ctrlsock;
+	sockArr[1] = sock;
+    while ((selSock = control->sockFuncs.select(sockArr,2,1))) 
+    {
+		if (selSock == ctrlsock) {
+			CMT_ProcessEvent(control);
+		} else {
+	        nbytes = control->sockFuncs.recv(sock, read_buf, sizeof(read_buf));
+		    if (nbytes == -1) {
+			    goto loser;
+			}
+			if (nbytes == 0) {
+	            break;
+		    }
+			priv->cb(priv->cb_arg, read_buf, nbytes);
+		}
+    }
+
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+                                                                                
+CMTStatus CMT_PKCS7DecoderFinish(PCMT_CONTROL control, CMUint32 connectionID, 
+                                 CMUint32 * resourceID)
+{
+    CMTP7Private *priv;
+    long nbytes;
+    char buf[128];
+    CMTSocket sock, ctrlsock, selSock, sockArr[2];
+#ifndef XP_MAC
+    int numTries = 0;
+#endif
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    priv = (CMTP7Private *)CMT_GetPrivate(control, connectionID);
+    if (priv == NULL)
+        goto loser;
+
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    ctrlsock = control->sock;
+    /* drain socket before we close it */
+    control->sockFuncs.shutdown(sock);
+    sockArr[0] = sock;
+    sockArr[1] = ctrlsock;
+    /* Let's see if doing a poll first gets rid of a weird bug where we
+     * lock up the client.
+     * There are some cases where the server doesn't put up data fast 
+     * enough, so we should loop on this poll instead of just trying it
+     * once.
+     */
+#ifndef XP_MAC
+ poll_sockets:
+    if (control->sockFuncs.select(sockArr,2,1) != NULL)
+#endif
+	{
+        while (1) {
+            selSock = control->sockFuncs.select(sockArr,2,0);
+            if (selSock == ctrlsock) {
+                CMT_ProcessEvent(control);
+            } else if (selSock == sock) {
+                nbytes = control->sockFuncs.recv(sock, buf, sizeof(buf));
+                if (nbytes < 0) {
+                    goto loser;
+                } else if (nbytes == 0) {
+                    break;
+                }
+                if (priv->cb)
+                    priv->cb(priv->cb_arg, buf, nbytes);
+            }
+        }
+    }
+#ifndef XP_MAC
+    else {
+#ifdef WIN32
+        if (numTries < 20) {
+            Sleep(100);
+            numTries++;
+            goto poll_sockets;
+        }
+#endif
+#ifdef XP_UNIX
+	if (numTries < 25) {
+	  numTries += sleep(1);
+	  goto poll_sockets;
+	}
+#endif
+    }
+#endif
+    
+    if (CMT_CloseDataConnection(control, connectionID) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Get the PKCS7 content info */
+    if (CMT_GetRIDAttribute(control, connectionID, SSM_FID_P7CONN_CONTENT_INFO,
+                            resourceID) == CMTFailure) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+
+loser:
+    if (control) {
+        CMT_CloseDataConnection(control, connectionID);
+    }
+    
+    return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7DestroyContentInfo(PCMT_CONTROL control, CMUint32 resourceID)
+{
+    if (!control) {
+        goto loser;
+    }
+
+    /* Delete the resource */
+    if (CMT_DestroyResource(control, resourceID, SSM_FID_P7CONN_CONTENT_INFO) == CMTFailure) {
+        goto loser;
+    }
+    return CMTSuccess;
+
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7VerifyDetachedSignature(PCMT_CONTROL control, CMUint32 resourceID, CMUint32 certUsage, CMUint32 hashAlgID, CMUint32 keepCerts, CMTItem* digest, CMInt32 * result)
+{
+    CMTItem message;
+    VerifyDetachedSigRequest request;
+    SingleNumMessage reply;
+
+    /* Do some parameter checking */
+    if (!control || !digest || !result) {
+        goto loser;
+    }
+
+    /* Set the request */
+    request.pkcs7ContentID = resourceID;
+    request.certUsage = certUsage;
+    request.hashAlgID = hashAlgID;
+    request.keepCert = (CMBool) keepCerts;
+    request.hash = *digest;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(VerifyDetachedSigRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_OBJECT_SIGNING | SSM_VERIFY_DETACHED_SIG;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_OBJECT_SIGNING |SSM_VERIFY_DETACHED_SIG)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *result = reply.value;
+    return CMTSuccess;
+loser:
+	*result = reply.value;
+	return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7VerifySignature(PCMT_CONTROL control, CMUint32 pubKeyAlgID,
+                                   CMTItem *pubKeyParams, CMTItem *signerPubKey,
+                                   CMTItem *computedHash, CMTItem *signature,
+                                   CMInt32 *result)
+{
+	return CMTFailure;
+}
+
+CMTStatus CMT_CreateSigned(PCMT_CONTROL control, CMUint32 scertRID,
+                           CMUint32 ecertRID, CMUint32 dig_alg,
+                           CMTItem *digest, CMUint32 *ciRID, CMInt32 *errCode)
+{
+    CMTItem message;
+    CreateSignedRequest request;
+    CreateContentInfoReply reply;
+    char checkMessageForError = 0;
+
+    /* Do some parameter checking */
+    if (!control || !scertRID || !digest || !ciRID) {
+        goto loser;
+    }
+
+    /* Set the request */
+    request.scertRID = scertRID;
+    request.ecertRID = ecertRID;
+    request.dig_alg = dig_alg;
+    request.digest = *digest;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(CreateSignedRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_OBJECT_SIGNING | SSM_CREATE_SIGNED;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+    checkMessageForError = 1;
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_OBJECT_SIGNING | SSM_CREATE_SIGNED)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(CreateContentInfoReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *ciRID = reply.ciRID;
+    if (reply.result == 0) {
+		return CMTSuccess;
+	} 
+
+loser:
+    if (checkMessageForError && 
+	CMT_DecodeMessage(SingleNumMessageTemplate, 
+			  &reply, &message) == CMTSuccess) {
+        *errCode = reply.errorCode;
+    } else {
+        *errCode = 0;
+    }
+	return CMTFailure;
+}
+
+CMTStatus CMT_CreateEncrypted(PCMT_CONTROL control, CMUint32 scertRID,
+                              CMUint32 *rcertRIDs, CMUint32 *ciRID)
+{
+    CMTItem message;
+    CMInt32 nrcerts;
+    CreateEncryptedRequest request;
+    CreateContentInfoReply reply;
+
+    /* Do some parameter checking */
+    if (!control || !scertRID || !rcertRIDs || !ciRID) {
+        goto loser;
+    }
+
+    /* Calculate the number of certs */
+    for (nrcerts =0; rcertRIDs[nrcerts] != 0; nrcerts++) {
+        /* Nothing */
+        ;
+    }
+
+    /* Set up the request */
+    request.scertRID = scertRID;
+    request.nrcerts = nrcerts;
+    request.rcertRIDs = (long *) rcertRIDs;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(CreateEncryptedRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_OBJECT_SIGNING | SSM_CREATE_ENCRYPTED;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message response type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_OBJECT_SIGNING | SSM_CREATE_ENCRYPTED)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(CreateContentInfoReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *ciRID = reply.ciRID;
+    if (reply.result == 0) {
+		return CMTSuccess;
+	} 
+loser:
+	return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7EncoderStart(PCMT_CONTROL control, CMUint32 ciRID,
+                                CMUint32 *connectionID, CMTP7ContentCallback cb,
+                                void *cb_arg)
+{
+    CMTItem message;
+    CMTStatus rv;
+    CMTP7Private *priv;
+    PKCS7DataConnectionRequest request;
+    DataConnectionReply reply;
+
+    /* Check passed in parameters */
+    if (!control || !ciRID) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = ciRID;
+    request.clientContext.len = 0;
+    request.clientContext.data = NULL;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(PKCS7DataConnectionRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_DATA_CONNECTION | SSM_PKCS7ENCODE_STREAM;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_DATA_CONNECTION | SSM_PKCS7ENCODE_STREAM)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(DataConnectionReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        CMTSocket sock;
+
+        priv = (CMTP7Private *)malloc(sizeof(CMTP7Private));
+        if (priv == NULL)
+            goto loser;
+        priv->priv.dest = (CMTReclaimFunc) free;
+        priv->cb = cb;
+        priv->cb_arg = cb_arg;
+
+        sock = control->sockFuncs.socket(0);
+        if (sock == NULL) {
+            goto loser;
+        }
+        if (control->sockFuncs.connect(sock, (short)reply.port, 
+                                       NULL) != CMTSuccess) {
+            goto loser;
+        }
+        if (control->sockFuncs.send(sock, control->nonce.data, 
+                                   control->nonce.len) != control->nonce.len) {
+            goto loser;
+        }
+        /* Save connection info */
+        if (CMT_AddDataConnection(control, sock, reply.connID)
+            != CMTSuccess) {
+            goto loser;
+        }
+        *connectionID = reply.connID;
+
+        rv = CMT_SetPrivate(control, reply.connID, &priv->priv);
+        if (rv != CMTSuccess)
+            goto loser;
+        return CMTSuccess;
+    } 
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7EncoderUpdate(PCMT_CONTROL control, CMUint32 connectionID,
+                                 const char *buf, CMUint32 len)
+{
+    CMUint32 sent;
+    CMTP7Private *priv;
+    unsigned long nbytes;
+    char read_buf[128];
+    CMTSocket sock, ctrlsock, sockArr[2], selSock;
+
+    /* Do some parameter checking */
+    if (!control || !connectionID || !buf) {
+        goto loser;
+    }
+
+    /* Get the data socket */
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    priv = (CMTP7Private *)CMT_GetPrivate(control, connectionID);
+    if (priv == NULL)
+        goto loser;
+
+    /* Write the data to the socket */
+    sent = CMT_WriteThisMany(control, sock, (void*)buf, len);
+    if (sent != len) {
+        goto loser;
+    }
+	ctrlsock = control->sock;
+	sockArr[0] = ctrlsock;
+	sockArr[1] = sock;
+    while ((selSock = control->sockFuncs.select(sockArr, 2, 1)) != NULL) 
+    {
+		if (selSock == ctrlsock) {
+			CMT_ProcessEvent(control);
+		} else {
+	        nbytes = control->sockFuncs.recv(sock, read_buf, sizeof(read_buf));
+		    if (nbytes == -1) {
+			    goto loser;
+			} else if (nbytes == 0) {
+	            break;
+		    } else {
+			    priv->cb(priv->cb_arg, read_buf, nbytes);
+			}
+		}
+    }
+    return CMTSuccess;
+
+loser:
+
+    return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7EncoderFinish(PCMT_CONTROL control, CMUint32 connectionID)
+{
+    CMTP7Private *priv;
+    CMInt32 nbytes;
+    char buf[128];
+    CMTSocket sock, ctrlsock, sockArr[2], selSock;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    priv = (CMTP7Private *)CMT_GetPrivate(control, connectionID);
+    if (priv == NULL)
+        goto loser;
+
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    ctrlsock = control->sock;
+    sockArr[0] = ctrlsock;
+    sockArr[1] = sock;
+    control->sockFuncs.shutdown(sock);
+    while (1) {
+        selSock = control->sockFuncs.select(sockArr, 2, 0);
+        if (selSock == ctrlsock) {
+            CMT_ProcessEvent(control);
+        } else if (selSock == sock) {
+            nbytes = control->sockFuncs.recv(sock, buf, sizeof(buf));
+            if (nbytes < 0) {
+                goto loser;
+            } else if (nbytes == 0) {
+                break;
+            } else {
+                priv->cb(priv->cb_arg, buf, nbytes);
+            }
+        }
+    }
+    if (CMT_CloseDataConnection(control, connectionID) == CMTFailure) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+
+loser:
+    if (control) {
+        CMT_CloseDataConnection(control, connectionID);
+    }
+    
+    return CMTFailure;
+}

mozilla/security/psm/lib/client/cmtres.c

@@ -0,0 +1,479 @@
+/* -*- mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#else
+#ifdef XP_MAC
+#include "macsocket.h"
+#else
+#include <windows.h>
+#include <winsock.h>
+#endif
+#endif
+#include <errno.h>
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include <string.h>
+
+CMTStatus CMT_GetNumericAttribute(PCMT_CONTROL control, CMUint32 resourceID, CMUint32 fieldID, CMInt32 *value)
+{
+    CMTItem message;
+    GetAttribRequest request;
+    GetAttribReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = resourceID;
+    request.fieldID = fieldID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(GetAttribRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_NUMERIC_ATTRIBUTE;
+
+    /* Send the mesage and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_NUMERIC_ATTRIBUTE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(GetAttribReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *value = reply.value.u.numeric;
+
+    /* Success */
+    if (reply.result == 0) {
+        return CMTSuccess;
+    } 
+
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_SetNumericAttribute(PCMT_CONTROL control, CMUint32 resourceID,
+				  CMUint32 fieldID, CMInt32 value)
+{
+    CMTItem message;
+    SetAttribRequest request;
+
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set the request */
+    request.resID = resourceID;
+    request.fieldID = fieldID;
+    request.value.type = SSM_NUMERIC_ATTRIBUTE;
+    request.value.u.numeric = value;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(SetAttribRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | 
+                   SSM_SET_ATTRIBUTE | SSM_NUMERIC_ATTRIBUTE;
+
+    if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | 
+                              SSM_SET_ATTRIBUTE    | SSM_NUMERIC_ATTRIBUTE)) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_PadStringValue(CMTItem *dest, CMTItem src)
+{
+    dest->data = NewArray(unsigned char, src.len+1);
+    if (dest->data == NULL) {
+        return CMTFailure;
+    }
+    memcpy(dest->data, src.data, src.len);
+    dest->data[src.len] = '\0';
+    dest->len = src.len;
+    free(src.data);
+    return CMTSuccess;
+}
+
+CMTStatus CMT_GetStringAttribute(PCMT_CONTROL control, CMUint32 resourceID, CMUint32 fieldID, CMTItem *value)
+{
+    CMTItem message;
+    GetAttribRequest request;
+    GetAttribReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = resourceID;
+    request.fieldID = fieldID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(GetAttribRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_STRING_ATTRIBUTE;
+    
+    /* Send the mesage and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_STRING_ATTRIBUTE)) {
+        goto loser;
+    }
+
+    /* Decode the response */
+    if (CMT_DecodeMessage(GetAttribReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        return CMT_PadStringValue(value, reply.value.u.string);
+    } 
+loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_SetStringAttribute(PCMT_CONTROL control, CMUint32 resourceID,
+		       CMUint32 fieldID, CMTItem *value)
+{
+    CMTItem message;
+    SetAttribRequest request;
+    
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = resourceID;
+    request.fieldID = fieldID;
+    request.value.type = SSM_STRING_ATTRIBUTE;
+    request.value.u.string = *value;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SetAttribRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | 
+                   SSM_SET_ATTRIBUTE | SSM_STRING_ATTRIBUTE;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message request type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | 
+                         SSM_SET_ATTRIBUTE    | SSM_STRING_ATTRIBUTE)) {
+        goto loser;
+    }
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_DuplicateResource(PCMT_CONTROL control, CMUint32 resourceID,
+				CMUint32 *newResID)
+{
+    CMTItem message;
+    SingleNumMessage request;
+    DupResourceReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.value = resourceID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_DUPLICATE_RESOURCE;
+
+    /* Send the mesage */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_DUPLICATE_RESOURCE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(DupResourceReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        *newResID = reply.resID;
+        return CMTSuccess;
+    } 
+
+loser:
+    *newResID = 0;
+    return CMTFailure;
+}
+
+CMTStatus CMT_DestroyResource(PCMT_CONTROL control, CMUint32 resourceID, CMUint32 resourceType)
+{
+    CMTItem message;
+    DestroyResourceRequest request;
+    SingleNumMessage reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = resourceID;
+    request.resType = resourceType;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(DestroyResourceRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_DESTROY_RESOURCE;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_DESTROY_RESOURCE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.value == 0) {
+        return CMTSuccess;
+    }
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_PickleResource(PCMT_CONTROL control, CMUint32 resourceID, CMTItem * pickledResource)
+{
+    CMTItem message;
+    SingleNumMessage request;
+    PickleResourceReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.value = resourceID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_CONSERVE_RESOURCE | SSM_PICKLE_RESOURCE;
+
+    /* Send the mesage and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_CONSERVE_RESOURCE | SSM_PICKLE_RESOURCE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(PickleResourceReplyTemplate, &reply,&message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        *pickledResource = reply.blob;
+        return CMTSuccess;
+    } 
+
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_UnpickleResource(PCMT_CONTROL control, CMUint32 resourceType, CMTItem pickledResource, CMUint32 * resourceID)
+{
+    CMTItem message;
+    UnpickleResourceRequest request;
+    UnpickleResourceReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resourceType = resourceType;
+    request.resourceData = pickledResource;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(UnpickleResourceRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_CONSERVE_RESOURCE | SSM_UNPICKLE_RESOURCE;
+    
+    /* Send the mesage and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_CONSERVE_RESOURCE | SSM_UNPICKLE_RESOURCE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(UnpickleResourceReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        *resourceID = reply.resID;
+        return CMTSuccess;
+    } 
+
+loser:
+    *resourceID = 0;
+    return CMTFailure;
+}
+
+CMTStatus CMT_GetRIDAttribute(PCMT_CONTROL control, CMUint32 resourceID, CMUint32 fieldID, CMUint32 *value)
+{
+    CMTItem message;
+    GetAttribRequest request;
+    GetAttribReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set the request */
+    request.resID = resourceID;
+    request.fieldID = fieldID;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(GetAttribRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_RID_ATTRIBUTE;
+
+    /* Send the mesage and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message response type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_RID_ATTRIBUTE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(GetAttribReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        *value = reply.value.u.rid;
+        return CMTSuccess;
+    } 
+loser:
+    return CMTFailure;
+}
+ 

mozilla/security/psm/lib/client/cmtrng.c

@@ -0,0 +1,270 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+/*
+  cmtrng.c -- Support for PSM random number generator and the seeding
+              thereof with data from the client.
+
+  Created by mwelch 1999 Oct 21
+ */
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include "rsrcids.h"
+#include <string.h>
+
+CMTStatus
+CMT_EnsureInitializedRNGBuf(PCMT_CONTROL control)
+{
+    if (control->rng.outBuf == NULL)
+    {
+        control->rng.outBuf = (char *) calloc(RNG_OUT_BUFFER_LEN, sizeof(char));
+        if (control->rng.outBuf == NULL)
+            goto loser;
+
+        control->rng.validOutBytes = 0;
+        control->rng.out_cur = control->rng.outBuf;
+        control->rng.out_end = control->rng.out_cur + RNG_OUT_BUFFER_LEN;
+        
+        control->rng.inBuf = (char *) calloc(RNG_IN_BUFFER_LEN, sizeof(char));
+        if (control->rng.outBuf == NULL)
+            goto loser;
+    }
+
+    return CMTSuccess;
+
+ loser:
+    if (control->rng.outBuf != NULL)
+    {
+        free(control->rng.outBuf);
+        control->rng.outBuf = NULL;
+    }
+    if (control->rng.inBuf != NULL)
+    {
+        free(control->rng.inBuf);
+        control->rng.inBuf = NULL;
+    }
+
+    return CMTFailure;
+}
+
+
+size_t 
+CMT_RequestPSMRandomData(PCMT_CONTROL control, 
+                         void *buf, CMUint32 maxbytes)
+{
+    SingleNumMessage req;
+    SingleItemMessage reply;
+    CMTItem message;
+    size_t rv = 0;
+    
+    /* Parameter checking */
+    if (!control || !buf || (maxbytes == 0))
+        goto loser;
+
+    /* Initialization. */
+    memset(&reply, 0, sizeof(SingleItemMessage));
+
+    /* Ask PSM for the data. */
+    req.value = maxbytes;
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &req) != CMTSuccess)
+        goto loser;
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_MISC_ACTION | SSM_MISC_GET_RNG_DATA;
+    
+    /* Send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure)
+        goto loser;
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_MISC_ACTION | SSM_MISC_GET_RNG_DATA))
+        goto loser;
+
+    /* Decode message */
+    if (CMT_DecodeMessage(SingleItemMessageTemplate, &reply, &message) != CMTSuccess)
+        goto loser;
+
+    /* Success - fill the return buf with what we got */
+    if (reply.item.len > maxbytes)
+        reply.item.len = maxbytes;
+
+    memcpy(buf, reply.item.data, reply.item.len);
+    rv = reply.item.len;
+
+ loser:
+    if (reply.item.data)
+        free(reply.item.data);
+    if (message.data)
+        free(message.data);
+
+    return rv;
+}
+
+size_t 
+CMT_GenerateRandomBytes(PCMT_CONTROL control, 
+                        void *buf, CMUint32 maxbytes)
+{
+    CMUint32 remaining = maxbytes;
+    CMT_RNGState *rng = &(control->rng);
+    char *walk = (char *) buf;
+
+    /* Is there already enough in the incoming cache? */
+    while(remaining > rng->validInBytes)
+    {
+        /* Get what we have on hand. */
+        memcpy(walk, rng->in_cur, rng->validInBytes);
+        walk += rng->validInBytes;
+        remaining -= rng->validInBytes;
+
+        /* Request a buffer from PSM. */
+        rng->validInBytes = CMT_RequestPSMRandomData(control, 
+                                                     rng->inBuf, 
+                                                     RNG_IN_BUFFER_LEN);
+        if (rng->validInBytes == 0)
+            return (maxbytes - remaining); /* call failed */
+        rng->in_cur = rng->inBuf;
+    }
+    if (remaining > 0)
+    {
+        memcpy(walk, rng->in_cur, remaining);
+        rng->in_cur += remaining;
+        rng->validInBytes -= remaining;
+    }
+    return maxbytes;
+}
+
+void
+cmt_rng_xor(void *dstBuf, void *srcBuf, int len)
+{
+    unsigned char *s = (unsigned char*) srcBuf;
+    unsigned char *d = (unsigned char*) dstBuf;
+    unsigned char tmp;
+    int i;
+
+    for(i=0; i<len; i++, s++, d++)
+    {
+        tmp = *d;
+        /* I wish C had circular shift operators. So do others on the team. */
+        tmp = ((tmp << 1) | (tmp >> 7));
+        *d = tmp ^ *s;
+    }
+}
+
+CMTStatus 
+CMT_RandomUpdate(PCMT_CONTROL control, void *data, size_t numbytes)
+{
+    size_t dataLeft = numbytes, cacheLeft;
+    char *walk = (char *) data;
+
+    if (CMT_EnsureInitializedRNGBuf(control) != CMTSuccess)
+        goto loser;
+
+    /* If we have more than what the buffer can handle, wrap around. */
+    cacheLeft = (control->rng.out_end - control->rng.out_cur);
+    while (dataLeft >= cacheLeft)
+    {
+        cmt_rng_xor(control->rng.out_cur, walk, cacheLeft);
+        walk += cacheLeft;
+        dataLeft -= cacheLeft;
+
+        control->rng.out_cur = control->rng.outBuf;
+
+        /* Max out used space */
+        control->rng.validOutBytes = cacheLeft = RNG_OUT_BUFFER_LEN;
+    }
+
+    /* 
+       We now have less seed data available than we do space in the buf.
+       Write what we have and update validOutBytes if we're not looping already.
+     */
+    cmt_rng_xor(control->rng.out_cur, walk, dataLeft);
+    control->rng.out_cur += dataLeft;
+    if (control->rng.validOutBytes < RNG_OUT_BUFFER_LEN)
+        control->rng.validOutBytes += dataLeft;
+
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+size_t
+CMT_GetNoise(PCMT_CONTROL control, void *buf, CMUint32 maxbytes)
+{
+    /* ### mwelch - GetNoise and GenerateRandomBytes can be the 
+       same function now, because presumably the RNG is being 
+       seeded with environmental noise on the PSM end before we 
+       make any of these requests */
+    return CMT_GenerateRandomBytes(control, buf, maxbytes);
+}
+
+CMTStatus 
+CMT_FlushPendingRandomData(PCMT_CONTROL control)
+{
+    CMTItem message;
+
+    memset(&message, 0, sizeof(CMTItem));
+
+    if (CMT_EnsureInitializedRNGBuf(control) != CMTSuccess)
+        return CMTFailure; /* couldn't initialize RNG buffer */
+
+    if (control->rng.validOutBytes == 0)
+        return CMTSuccess; /* no random data available == we're flushed */
+
+    /* We have random data available. Send this to PSM.
+       We're sending an event, so no reply is needed. */
+    message.type = SSM_EVENT_MESSAGE 
+        | SSM_MISC_ACTION 
+        | SSM_MISC_PUT_RNG_DATA;
+    message.len = control->rng.validOutBytes;
+    message.data = (unsigned char *) calloc(message.len, sizeof(char));
+    if (!message.data)
+        goto loser;
+    memcpy(message.data, control->rng.outBuf, message.len);
+
+    if (CMT_TransmitMessage(control, &message) == CMTFailure)
+        goto loser;
+
+    /* Clear the RNG ring buffer, we've used that data */
+    control->rng.out_cur = control->rng.outBuf;
+    control->rng.validOutBytes = 0;
+    /* zero the buffer, because we XOR in new data */
+    memset(control->rng.outBuf, 0, RNG_OUT_BUFFER_LEN);
+
+    goto done;
+ loser:
+    if (message.data)
+        free(message.data);
+    return CMTFailure;
+ done:
+    return CMTSuccess;
+}

mozilla/security/psm/lib/client/cmtsdr.c

@@ -0,0 +1,237 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+/*
+  cmtsdr.c -- Support for the Secret Decoder Ring, which provides
+      encryption and decryption using stored keys.
+
+  Created by thayes 18 April 2000
+ */
+#include "stddef.h"
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include "protocolshr.h"
+#include "rsrcids.h"
+#include <string.h>
+
+#undef PROCESS_LOCALLY
+
+/* Encryption result - contains the key id and the resulting data */
+/* An empty key id indicates that NO encryption was performed */
+typedef struct EncryptionResult
+{
+  CMTItem keyid;
+  CMTItem data;
+} EncryptionResult;
+
+/* Constants for testing */
+static const char *kPrefix = "Encrypted:";
+
+static CMTItem
+CMT_CopyDataToItem(const unsigned char *data, CMUint32 len)
+{
+  CMTItem item;
+
+  item.data = (unsigned char*) calloc(len, 1);
+  item.len = len;
+  memcpy(item.data, data, len);
+
+  return item;
+}
+
+
+static CMTStatus
+tmp_SendMessage(PCMT_CONTROL control, CMTItem *message)
+{
+#ifndef PROCESS_LOCALLY
+  return CMT_SendMessage(control, message);
+#else
+  if (message->type == SSM_SDR_ENCRYPT_REQUEST) 
+    return CMT_DoEncryptionRequest(message);
+  else if (message->type == SSM_SDR_DECRYPT_REQUEST)
+    return CMT_DoDecryptionRequest(message);
+
+  return CMTFailure;
+#endif
+}
+/* End test code */
+
+CMTStatus
+CMT_SDREncrypt(PCMT_CONTROL control, void *ctx,
+               const unsigned char *key, CMUint32 keyLen,
+               const unsigned char *data, CMUint32 dataLen,
+               unsigned char **result, CMUint32 *resultLen)
+{
+  CMTStatus rv = CMTSuccess;
+  CMTItem message;
+  EncryptRequestMessage request;
+  SingleItemMessage reply;
+
+  /* Fill in the request */
+  request.keyid = CMT_CopyDataToItem(key, keyLen);
+  request.data = CMT_CopyDataToItem(data, dataLen);
+  request.ctx = CMT_CopyPtrToItem(ctx);
+
+  reply.item.data = 0;
+  reply.item.len = 0;
+  message.data = 0;
+  message.len = 0;
+
+  /* Encode */
+  rv = CMT_EncodeMessage(EncryptRequestTemplate, &message, &request);
+  if (rv != CMTSuccess) {
+    goto loser;
+  }
+
+  message.type = SSM_SDR_ENCRYPT_REQUEST;
+
+  /* Send */
+  /* if (CMT_SendMessage(control, &message) != CMTSuccess) goto loser; */
+  rv = tmp_SendMessage(control, &message);
+  if (rv != CMTSuccess) goto loser;
+
+  if (message.type != SSM_SDR_ENCRYPT_REPLY) { rv = CMTFailure; goto loser; }
+
+  rv = CMT_DecodeMessage(SingleItemMessageTemplate, &reply, &message);
+  if (rv != CMTSuccess)
+    goto loser;
+
+  *result = reply.item.data;
+  *resultLen = reply.item.len;
+
+  reply.item.data = 0;
+
+loser:
+  if (message.data) free(message.data);
+  if (request.keyid.data) free(request.keyid.data);
+  if (request.data.data) free(request.data.data);
+  if (request.ctx.data) free(request.ctx.data);
+  if (reply.item.data) free(reply.item.data);
+
+  return rv; /* need return value */
+}
+
+CMTStatus
+CMT_SDRDecrypt(PCMT_CONTROL control, void *ctx,
+               const unsigned char *data, CMUint32 dataLen,
+               unsigned char **result, CMUint32 *resultLen)
+{
+  CMTStatus rv;
+  CMTItem message;
+  DecryptRequestMessage request;
+  SingleItemMessage reply;
+
+  /* Fill in the request */
+  request.data = CMT_CopyDataToItem(data, dataLen);
+  request.ctx = CMT_CopyPtrToItem(ctx);
+
+  reply.item.data = 0;
+  reply.item.len = 0;
+  message.data = 0;
+  message.len = 0;
+
+  /* Encode */
+  rv = CMT_EncodeMessage(DecryptRequestTemplate, &message, &request);
+  if (rv != CMTSuccess) {
+    goto loser;
+  }
+
+  message.type = SSM_SDR_DECRYPT_REQUEST;
+
+  /* Send */
+  /* if (CMT_SendMessage(control, &message) != CMTSuccess) goto loser; */
+  rv = tmp_SendMessage(control, &message);
+  if (rv != CMTSuccess) goto loser;
+
+  if (message.type != SSM_SDR_DECRYPT_REPLY) { rv = CMTFailure; goto loser; }
+
+  rv = CMT_DecodeMessage(SingleItemMessageTemplate, &reply, &message);
+  if (rv != CMTSuccess)
+    goto loser;
+
+  *result = reply.item.data;
+  *resultLen = reply.item.len;
+
+  reply.item.data = 0;
+
+loser:
+  if (message.data) free(message.data);
+  if (request.data.data) free(request.data.data);
+  if (request.ctx.data) free(request.ctx.data);
+  if (reply.item.data) free(reply.item.data);
+
+  return rv; /* need return value */
+}
+
+CMTStatus
+CMT_SDRChangePassword(PCMT_CONTROL control, void *ctx)
+{
+  CMTStatus rv = CMTSuccess;
+  CMTItem message;
+  SingleItemMessage request;
+  SingleNumMessage reply;
+
+  /* Fill in the request */
+  request.item = CMT_CopyPtrToItem(ctx);
+
+  message.data = 0;
+  message.len = 0;
+
+  /* Encode */
+  rv = CMT_EncodeMessage(SingleItemMessageTemplate, &message, &request);
+  if (rv != CMTSuccess) {
+    goto loser;
+  }
+
+  message.type = (SSM_REQUEST_MESSAGE|SSM_MISC_ACTION|SSM_MISC_UI|SSM_UI_CHANGE_PASSWORD);
+
+  /* Send */
+  rv = CMT_SendMessage(control, &message);
+  if (rv != CMTSuccess) goto loser;
+
+  if (message.type != 
+     (SSM_REPLY_OK_MESSAGE|SSM_MISC_ACTION|SSM_MISC_UI|SSM_UI_CHANGE_PASSWORD)) { 
+    rv = CMTFailure;
+    goto loser; 
+  }
+
+  rv = CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message);
+  if (rv != CMTSuccess)
+    goto loser;
+
+loser:
+  if (request.item.data) free(request.item.data);
+  if (message.data) free(message.data);
+
+  return rv; /* need return value */
+}

mozilla/security/psm/lib/client/cmtssl.c

@@ -0,0 +1,467 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#else
+#ifdef XP_MAC
+#else /* windows */
+#include <windows.h>
+#include <winsock.h>
+#endif
+#endif
+#include <errno.h>
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include "rsrcids.h"
+
+
+
+CMTStatus CMT_OpenSSLConnection(PCMT_CONTROL control, CMTSocket sock,
+                                SSMSSLConnectionRequestType flags, 
+                                CMUint32 port, char * hostIP, 
+                                char * hostName, CMBool forceHandshake, void* clientContext)
+{
+	CMTItem message;
+    SSLDataConnectionRequest request;
+    DataConnectionReply reply;
+    CMUint32 sent;
+	
+	/* Do some parameter checking */
+	if (!control || !hostIP || !hostName) {
+		goto loser;
+	}
+
+    request.flags = flags;
+    request.port = port;
+    request.hostIP = hostIP;
+    request.hostName = hostName;
+    request.forceHandshake = forceHandshake;
+    request.clientContext = CMT_CopyPtrToItem(clientContext);
+
+    /* Encode message */
+    if (CMT_EncodeMessage(SSLDataConnectionRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_DATA_CONNECTION | SSM_SSL_CONNECTION;
+    
+	/* Send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_DATA_CONNECTION | SSM_SSL_CONNECTION)) {
+        goto loser;
+    }
+
+    /* Decode message */
+    if (CMT_DecodeMessage(DataConnectionReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+	/* Success */
+	if (reply.result == 0) {
+	  if (control->sockFuncs.connect(sock, reply.port, NULL) != CMTSuccess) {
+            goto loser;
+	  }
+	  sent = CMT_WriteThisMany(control, sock, control->nonce.data, 
+                               control->nonce.len);
+	  if (sent != control->nonce.len) {
+            goto loser;
+	  }
+	  
+	  /* Save connection info */
+	  if (CMT_AddDataConnection(control, sock, reply.connID)
+	      != CMTSuccess) {
+	    goto loser;
+	  }
+
+	  return CMTSuccess;
+	} 
+	
+loser:
+	return CMTFailure;
+}
+
+CMTStatus CMT_GetSSLDataErrorCode(PCMT_CONTROL control, CMTSocket sock,
+                                  CMInt32* errorCode)
+{
+    CMUint32 connID;
+
+    if (!control || !errorCode) {
+        goto loser;
+    }
+
+    /* get the data connection */
+    if (CMT_GetDataConnectionID(control, sock, &connID) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* get the PR error */
+    if (CMT_GetNumericAttribute(control, connID, SSM_FID_SSLDATA_ERROR_VALUE,
+                                errorCode) != CMTSuccess) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_ReleaseSSLSocketStatus(PCMT_CONTROL control, CMTSocket sock)
+{
+    CMUint32 connectionID;
+
+    if (!control || !sock) {
+        goto loser;
+    }
+    if (CMT_GetDataConnectionID(control, sock, &connectionID) != CMTSuccess) {
+        goto loser;
+    }
+    if (CMT_SetNumericAttribute(control, connectionID, 
+                                SSM_FID_SSLDATA_DISCARD_SOCKET_STATUS,
+                                0) != CMTSuccess) {
+        goto loser;
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_GetSSLSocketStatus(PCMT_CONTROL control, CMTSocket sock, 
+                                 CMTItem* pickledStatus, CMInt32* level)
+{
+    CMUint32 connectionID;
+    SingleNumMessage request;
+    CMTItem message;
+    PickleSecurityStatusReply reply;
+
+    if (!control || !pickledStatus || !level) {
+        goto loser;
+    }
+
+	/* get the data connection */
+    if (CMT_GetDataConnectionID(control, sock, &connectionID) != CMTSuccess) {
+		goto loser;
+	}
+
+    /* set up the request */
+    request.value = connectionID;
+
+    /* encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) !=
+        CMTSuccess) {
+        goto loser;
+    }
+
+    /* set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | 
+        SSM_CONSERVE_RESOURCE | SSM_PICKLE_SECURITY_STATUS;
+
+    /* send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION |
+                         SSM_CONSERVE_RESOURCE | SSM_PICKLE_SECURITY_STATUS)) {
+        goto loser;
+    }
+
+    /* decode the reply */
+    if (CMT_DecodeMessage(PickleSecurityStatusReplyTemplate, &reply, &message)
+        != CMTSuccess) {
+        goto loser;
+    }
+
+    /* success */
+    if (reply.result == 0) {
+        *pickledStatus = reply.blob;
+        *level = reply.securityLevel;
+        return CMTSuccess;
+    }
+
+loser:
+    return CMTFailure;
+}
+
+
+CMTStatus CMT_OpenTLSConnection(PCMT_CONTROL control, CMTSocket sock,
+                                CMUint32 port, char* hostIP, char* hostName)
+{
+    TLSDataConnectionRequest request;
+    CMTItem message;
+    DataConnectionReply reply;
+    CMUint32 sent;
+
+    /* do some parameter checking */
+    if (!control || !hostIP || !hostName) {
+        goto loser;
+    }
+
+    request.port = port;
+    request.hostIP = hostIP;
+    request.hostName = hostName;
+
+    /* encode the message */
+    if (CMT_EncodeMessage(TLSDataConnectionRequestTemplate, &message, &request)
+        != CMTSuccess) {
+        goto loser;
+    }
+
+    /* set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_DATA_CONNECTION | 
+        SSM_TLS_CONNECTION;
+
+    /* send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_DATA_CONNECTION | 
+                         SSM_TLS_CONNECTION)) {
+        goto loser;
+    }
+
+    /* decode the message */
+    if (CMT_DecodeMessage(DataConnectionReplyTemplate, &reply, &message) !=
+        CMTSuccess) {
+        goto loser;
+    }
+
+    /* success */
+    if (reply.result == 0) {
+        if (control->sockFuncs.connect(sock, reply.port, NULL) != CMTSuccess) {
+            goto loser;
+        }
+        sent = CMT_WriteThisMany(control, sock, control->nonce.data, 
+                                 control->nonce.len);
+        if (sent != control->nonce.len) {
+            goto loser;
+        }
+
+        /* save connection info */
+        if (CMT_AddDataConnection(control, sock, reply.connID) != CMTSuccess) {
+            goto loser;
+        }
+
+        return CMTSuccess;
+    }
+loser:
+    return CMTFailure;
+}
+
+
+CMTStatus CMT_TLSStepUp(PCMT_CONTROL control, CMTSocket sock, 
+                        void* clientContext)
+{
+    TLSStepUpRequest request;
+    SingleNumMessage reply;
+    CMTItem message;
+    CMUint32 connectionID;
+
+    /* check arguments */
+    if (!control || !sock) {
+        goto loser;
+    }
+
+    /* get the data connection ID */
+    if (CMT_GetDataConnectionID(control, sock, &connectionID) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* set up the request */
+    request.connID = connectionID;
+    request.clientContext = CMT_CopyPtrToItem(clientContext);
+
+    /* encode the request */
+    if (CMT_EncodeMessage(TLSStepUpRequestTemplate, &message, &request) !=
+        CMTSuccess) {
+        goto loser;
+    }
+
+    /* set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_TLS_STEPUP;
+
+    /* send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION |
+                         SSM_TLS_STEPUP)) {
+        goto loser;
+    }
+
+    /* decode the reply */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) !=
+        CMTSuccess) {
+        goto loser;
+    }
+
+    return (CMTStatus) reply.value;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_OpenSSLProxyConnection(PCMT_CONTROL control, CMTSocket sock,
+                                     CMUint32 port, char* hostIP, 
+                                     char* hostName)
+{
+    TLSDataConnectionRequest request;
+    CMTItem message;
+    DataConnectionReply reply;
+    CMUint32 sent;
+
+    /* do some parameter checking */
+    if (!control || !hostIP || !hostName) {
+        goto loser;
+    }
+
+    request.port = port;
+    request.hostIP = hostIP;
+    request.hostName = hostName;
+
+    /* encode the message */
+    if (CMT_EncodeMessage(TLSDataConnectionRequestTemplate, &message, &request)
+        != CMTSuccess) {
+        goto loser;
+    }
+
+    /* set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_DATA_CONNECTION | 
+        SSM_PROXY_CONNECTION;
+
+    /* send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_DATA_CONNECTION | 
+                         SSM_PROXY_CONNECTION)) {
+        goto loser;
+    }
+
+    /* decode the message */
+    if (CMT_DecodeMessage(DataConnectionReplyTemplate, &reply, &message) !=
+        CMTSuccess) {
+        goto loser;
+    }
+
+    /* success */
+    if (reply.result == 0) {
+        if (control->sockFuncs.connect(sock, reply.port, NULL) != CMTSuccess) {
+            goto loser;
+        }
+        sent = CMT_WriteThisMany(control, sock, control->nonce.data, 
+                                 control->nonce.len);
+        if (sent != control->nonce.len) {
+            goto loser;
+        }
+
+        /* save connection info */
+        if (CMT_AddDataConnection(control, sock, reply.connID) != CMTSuccess) {
+            goto loser;
+        }
+
+        return CMTSuccess;
+    }
+loser:
+    return CMTFailure;
+}
+
+
+CMTStatus CMT_ProxyStepUp(PCMT_CONTROL control, CMTSocket sock, 
+                        void* clientContext, char* remoteUrl)
+{
+    ProxyStepUpRequest request;
+    SingleNumMessage reply;
+    CMTItem message;
+    CMUint32 connectionID;
+
+    /* check arguments */
+    if (!control || !sock || !remoteUrl) {
+        goto loser;
+    }
+
+    /* get the data connection ID */
+    if (CMT_GetDataConnectionID(control, sock, &connectionID) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* set up the request */
+    request.connID = connectionID;
+    request.clientContext = CMT_CopyPtrToItem(clientContext);
+    request.url = remoteUrl;
+
+    /* encode the request */
+    if (CMT_EncodeMessage(ProxyStepUpRequestTemplate, &message, &request) !=
+        CMTSuccess) {
+        goto loser;
+    }
+
+    /* set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | 
+        SSM_PROXY_STEPUP;
+
+    /* send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION |
+                         SSM_PROXY_STEPUP)) {
+        goto loser;
+    }
+
+    /* decode the reply */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) !=
+        CMTSuccess) {
+        goto loser;
+    }
+
+    return (CMTStatus) reply.value;
+loser:
+    return CMTFailure;
+}

mozilla/security/psm/lib/client/cmtutils.c

@@ -0,0 +1,648 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#else
+#ifdef XP_MAC
+#include "macsocket.h"
+#else /* Windows */
+#include <windows.h>
+#include <winsock.h>
+#endif
+#endif
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "newproto.h"
+#include <string.h>
+
+/* Local defines */
+#if 0
+#define PSM_WAIT_BEFORE_SLEEP           (CM_TicksPerSecond() * 60)
+#define PSM_SPINTIME                    PSM_WAIT_BEFORE_SLEEP
+#define PSM_KEEP_CONNECTION_ALIVE       (PSM_WAIT_BEFORE_SLEEP * 900)
+#endif
+
+/* If you want to dump the messages sent between the plug-in and the PSM 
+ * server, then remove the comment for the appropriate define.
+ */
+#if 0
+#define PRINT_SEND_MESSAGES
+#define PRINT_RECEIVE_MESSAGES
+#endif
+
+#ifdef PRINT_SEND_MESSAGES
+#ifndef DEBUG_MESSAGES
+#define DEBUG_MESSAGES
+#endif /*DEBUG_MESSAGES*/
+#endif /*PRINT_SEND_MESSAGES*/
+
+#ifdef PRINT_RECEIVE_MESSAGES
+#ifndef DEBUG_MESSAGES
+#define DEBUG_MESSAGES
+#endif /*DEBUG_MESSAGES*/
+#endif /*PRINT_RECEIVE_MESSAGES*/
+
+#ifdef DEBUG_MESSAGES
+#define LOG(x) do { FILE *f; f=fopen("cmnav.log","a+"); if (f) { \
+   fprintf(f, x); fclose(f); } } while(0);
+#define LOG_S(x) do { FILE *f; f=fopen("cmnav.log","a+"); if (f) { \
+   fprintf(f, "%s", x); fclose(f); } } while(0);
+#define ASSERT(x) if (!(x)) { LOG("ASSERT:"); LOG(#x); LOG("\n"); exit(-1); }
+#else
+#define LOG(x)
+#define LOG_S(x)
+#define ASSERT(x)
+#endif
+
+CMUint32
+cmt_Strlen(char *str)
+{
+    CMUint32 len = strlen(str);
+    return sizeof(CMInt32) + (((len + 3)/4)*4);
+}
+
+CMUint32
+cmt_Bloblen(CMTItem *blob)
+{
+    return sizeof(CMInt32) + (((blob->len +3)/4)*4);
+}
+
+char *
+cmt_PackString(char *buf, char *str)
+{
+    CMUint32 len = strlen(str);
+    CMUint32 networkLen = htonl(len);
+    CMUint32 padlen = ((len + 3)/4)*4;
+
+    memcpy(buf, &networkLen, sizeof(CMUint32));
+    memcpy(buf + sizeof(CMUint32), str, len);
+    memset(buf + sizeof(CMUint32) + len, 0, padlen - len);
+
+    return buf+sizeof(CMUint32)+padlen;
+}
+
+char *
+cmt_PackBlob(char *buf, CMTItem *blob)
+{
+    CMUint32 len = blob->len;
+    CMUint32 networkLen = htonl(len);
+    CMUint32 padlen = (((blob->len + 3)/4)*4);
+
+    *((CMUint32*)buf) = networkLen;
+    memcpy(buf + sizeof(CMUint32), blob->data, len);
+    memset(buf + sizeof(CMUint32) + len, 0, padlen - len);
+
+    return buf + sizeof(CMUint32) + padlen;
+}
+
+char *
+cmt_UnpackString(char *buf, char **str)
+{
+    char *p = NULL;
+    CMUint32 len, padlen;
+
+    /* Get the string length */
+    len = ntohl(*(CMUint32*)buf);
+
+    /* Get the padded length */
+    padlen = ((len + 3)/4)*4;
+
+    /* Allocate the string and copy the data */
+    p = (char *) malloc(len + 1);
+    if (!p) {
+        goto loser;
+    }
+    /* Copy the data and NULL terminate */
+    memcpy(p, buf+sizeof(CMUint32), len);
+    p[len] = 0;
+
+    *str = p;
+    return buf+sizeof(CMUint32)+padlen;
+loser:
+    *str = NULL;
+    if (p) {
+        free(p);
+    }
+    return buf+sizeof(CMUint32)+padlen;
+}
+
+char *
+cmt_UnpackBlob(char *buf, CMTItem **blob)
+{
+    CMTItem *p = NULL;
+    CMUint32 len, padlen;
+
+    /* Get the blob length */
+    len = ntohl(*(CMUint32*)buf);
+    
+    /* Get the padded length */
+    padlen = ((len + 3)/4)*4;
+
+    /* Allocate the CMTItem for the blob */
+    p = (CMTItem*)malloc(sizeof(CMTItem));
+    if (!p) {
+        goto loser;
+    }
+    p->len = len;
+    p->data = (unsigned char *) malloc(len);
+    if (!p->data) {
+        goto loser;
+    }
+
+    /* Copy that data across */
+    memcpy(p->data, buf+sizeof(CMUint32), len);
+    *blob = p;
+
+    return buf+sizeof(CMUint32)+padlen;
+
+loser:
+    *blob = NULL;
+    CMT_FreeMessage(p);
+
+    return buf+sizeof(CMUint32)+padlen;
+}
+
+#ifdef DEBUG_MESSAGES
+void prettyPrintMessage(CMTItem *msg)
+{
+  int numLines = ((msg->len+7)/8);
+  char curBuffer[9], *cursor, string[2], hexVal[8];
+  char hexArray[25];
+  int i, j, numToCopy;
+
+  /*Try printing out 8 bytes at a time. */
+  LOG("\n**********************************************************\n");
+  LOG("About to pretty Print Message\n\n");
+  curBuffer[9] = '\0';
+  hexArray[24] = '\0';
+  hexVal[2] = '\0';
+  string[1] = '\0';
+  LOG("Header Info\n");
+  LOG("Message Type: ");
+  sprintf(hexArray, "%lx\n", msg->type);
+  LOG(hexArray);
+  LOG("Message Length: ");
+  sprintf (hexArray, "%ld\n\n", msg->len);
+  LOG(hexArray);
+  LOG("Body of Message\n");
+  for (i=0, cursor=msg->data; i<numLines; i++, cursor+=8) {
+    /* First copy over the buffer to our local array */
+    numToCopy = ((msg->len - (unsigned int)((unsigned long)cursor-(unsigned long)msg->data)) < 8) ?
+                msg->len - (unsigned int)((unsigned long)cursor-(unsigned long)msg->data) : 8;
+    memcpy(curBuffer, cursor, 8);
+    for (j=0;j<numToCopy;j++) {
+      string[0] = curBuffer[j];
+      if (isprint(curBuffer[j])) {
+	string[0] = curBuffer[j];
+      } else {
+	string[0] = ' ';
+      }
+      LOG(string);
+    }
+    string[0] = ' ';
+    for (;j<8;j++) {
+      LOG(string);
+    }
+    LOG("\t");
+    for (j=0; j<numToCopy; j++) {
+      sprintf (hexVal,"%.2x", 0x0ff & (unsigned short)curBuffer[j]);
+      LOG(hexVal);
+      LOG(" ");
+    }
+    LOG("\n");
+  }
+  LOG("Done Pretty Printing Message\n");
+  LOG("**********************************************************\n\n");
+}
+#endif
+
+CMTStatus CMT_ReadMessageDispatchEvents(PCMT_CONTROL control, CMTItem* message)
+{
+    CMTStatus status;
+    CMBool done = CM_FALSE;
+    CMUint32 msgCategory;
+    
+    /* We have to deal with other types of data on the socket and */
+    /* handle them accordingly */
+    while (!done) {
+    	status = CMT_ReceiveMessage(control, message);
+        if (status != CMTSuccess) {
+            goto loser;
+        }
+        msgCategory = (message->type & SSM_CATEGORY_MASK);
+        switch (msgCategory) {
+            case SSM_REPLY_OK_MESSAGE:
+                done = CM_TRUE;
+                break;
+            case SSM_REPLY_ERR_MESSAGE:
+                done = CM_TRUE;
+                break;
+            case SSM_EVENT_MESSAGE:
+                CMT_DispatchEvent(control, message);
+                break;
+            /* XXX FIX THIS!!! For the moment I'm ignoring all other types */
+            default:
+                break;
+        }
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_SendMessage(PCMT_CONTROL control, CMTItem* message)
+{
+	CMTStatus status;
+#ifdef PRINT_SEND_MESSAGES
+    LOG("About to print message sent to PSM\n");
+    prettyPrintMessage(message);
+#endif
+
+    /* Acquire lock on the control connection */
+    CMT_LOCK(control->mutex);
+
+    /* Try to send pending random data */
+    if (message->type != (SSM_REQUEST_MESSAGE | SSM_HELLO_MESSAGE))
+    {
+        /* If we've already said hello, then flush random data
+           just before sending the request. */
+        status = CMT_FlushPendingRandomData(control);
+        if (status != CMTSuccess)
+            goto loser;
+    }
+    
+	status = CMT_TransmitMessage(control, message);
+	if (status != CMTSuccess) {
+		goto loser;
+	}
+
+    if (CMT_ReadMessageDispatchEvents(control, message) != CMTSuccess) {
+        goto loser;
+    }
+    /* Release the control connection lock */
+    CMT_UNLOCK(control->mutex);
+	return CMTSuccess;
+loser:
+    /* Release the control connection lock */
+    CMT_UNLOCK(control->mutex);
+	return CMTFailure;
+}
+
+CMTStatus CMT_TransmitMessage(PCMT_CONTROL control, CMTItem * message)
+{
+    CMTMessageHeader header;
+	CMUint32 sent;
+
+    /* Set up the message header */
+    header.type = htonl(message->type);
+    header.len = htonl(message->len);
+
+	/* Send the message header */
+	sent = CMT_WriteThisMany(control, control->sock, 
+                             (void *)&header, sizeof(CMTMessageHeader));
+	if (sent != sizeof(CMTMessageHeader)) {
+		goto loser;
+	}
+
+	/* Send the message body */
+	sent = CMT_WriteThisMany(control, control->sock, (void *)message->data, 
+                             message->len);
+	if (sent != message->len) {
+		goto loser;
+	}
+
+    /* Free the buffer */
+    free(message->data);
+    message->data = NULL;
+	return CMTSuccess;
+
+loser:
+	return CMTFailure;
+}
+
+CMTStatus CMT_ReceiveMessage(PCMT_CONTROL control, CMTItem * response)
+{
+    CMTMessageHeader header;
+    CMUint32 numread;
+
+    /* Get the message header */
+    numread = CMT_ReadThisMany(control, control->sock, 
+                            (void *)&header, sizeof(CMTMessageHeader));
+    if (numread != sizeof(CMTMessageHeader)) {
+        goto loser;
+    }
+
+    response->type = ntohl(header.type);
+    response->len = ntohl(header.len);
+    response->data = (unsigned char *) malloc(response->len);
+    if (response->data == NULL) {
+        goto loser;
+    }
+
+    numread = CMT_ReadThisMany(control, control->sock, 
+                            (void *)(response->data), response->len); 
+    if (numread != response->len) {
+        goto loser;
+    }
+
+#ifdef PRINT_RECEIVE_MESSAGES
+    LOG("About to print message received from PSM.\n");
+    prettyPrintMessage(response);
+#endif /*PRINT_RECEIVE_MESSAGES*/
+    return CMTSuccess;
+loser:
+    if (response->data) {
+        free(response->data);
+    }
+    return CMTFailure;
+}
+
+CMUint32 CMT_ReadThisMany(PCMT_CONTROL control, CMTSocket sock, 
+                          void * buffer, CMUint32 thisMany)
+{
+	CMUint32 total = 0;
+  
+	while (total < thisMany) {
+		int got;
+		got = control->sockFuncs.recv(sock, (void*)((char*)buffer + total),
+                                      thisMany-total);
+		if (got < 0 ) {
+			break;
+		} 
+		total += got;
+	} 
+	return total;
+}
+ 
+CMUint32 CMT_WriteThisMany(PCMT_CONTROL control, CMTSocket sock, 
+                           void * buffer, CMUint32 thisMany)
+{
+	CMUint32 total = 0;
+  
+	while (total < thisMany) {
+		CMInt32 got;
+		got = control->sockFuncs.send(sock, (void*)((char*)buffer+total), 
+                                      thisMany-total);
+		if (got < 0) {
+			break;
+		}
+		total += got;
+	}
+	return total;
+}
+
+CMTItem* CMT_ConstructMessage(CMUint32 type, CMUint32 length)
+{
+    CMTItem * p;
+
+    p = (CMTItem*)malloc(sizeof(CMTItem));
+    if (!p) {
+	goto loser;
+    }
+
+    p->type = type;
+    p->len = length;
+    p->data = (unsigned char *) malloc(length);
+    if (!p->data) {
+	goto loser;
+    }
+    return p;
+
+loser:
+    CMT_FreeMessage(p);
+    return NULL;
+}
+
+void CMT_FreeMessage(CMTItem * p)
+{
+    if (p != NULL) {
+	if (p->data != NULL) {
+	    free(p->data);
+	}
+	free(p);
+    }
+}
+
+CMTStatus CMT_AddDataConnection(PCMT_CONTROL control, CMTSocket sock, 
+                                CMUint32 connectionID)
+{
+	PCMT_DATA ptr;
+
+	/* This is the first connection */
+	if (control->cmtDataConnections == NULL) {
+		control->cmtDataConnections = ptr = 
+            (PCMT_DATA)calloc(sizeof(CMT_DATA), 1);
+		if (!ptr) {
+			goto loser;
+		}
+	} else {
+	    /* Position at the last entry */
+	    for (ptr = control->cmtDataConnections; (ptr != NULL && ptr->next 
+                                                 != NULL); ptr = ptr->next);
+		ptr->next = (PCMT_DATA)calloc(sizeof(CMT_DATA), 1);
+		if (!ptr->next) {
+			goto loser;
+		} 
+		/* Fix up the pointers */
+		ptr->next->previous = ptr;
+		ptr = ptr->next;
+	}
+
+	/* Fill in the data */
+	ptr->sock = sock;
+	ptr->connectionID = connectionID;
+
+	return CMTSuccess;
+loser:
+	return CMTFailure;
+}
+
+int
+CMT_DestroyDataConnection(PCMT_CONTROL control, CMTSocket sock)
+{
+    PCMT_DATA ptr, pptr = NULL;
+    int rv=CMTSuccess;
+
+    if (!control) return rv;
+
+    control->sockFuncs.close(sock);
+    for (ptr = control->cmtDataConnections; ptr != NULL;
+	 pptr = ptr, ptr = ptr->next) {
+	if (ptr->sock == sock) {
+	    if (pptr == NULL) {
+		/* node is at head */
+		control->cmtDataConnections = ptr->next;
+		if (ptr->priv != NULL)
+		    ptr->priv->dest(ptr->priv);
+		free(ptr);
+		return rv;
+	    }
+	    /* node is elsewhere */
+	    pptr->next = ptr->next;
+	    if (ptr->priv != NULL)
+	        ptr->priv->dest(ptr->priv);
+	    free(ptr);
+	    return rv;
+	}
+    }
+    return rv;
+}
+
+CMTStatus CMT_CloseDataConnection(PCMT_CONTROL control, CMUint32 connectionID)
+{
+    /* PCMT_DATA ptr, pptr = NULL; */
+    CMTSocket sock;
+    /* int rv;*/
+
+    /* Get the socket for this connection */
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Free data connection associated with this socket */
+    if (CMT_DestroyDataConnection(control, sock) == CMTFailure) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_GetDataConnectionID(PCMT_CONTROL control, CMTSocket sock, CMUint32 * connectionID)
+{
+	PCMT_DATA ptr;
+
+	for (ptr = control->cmtDataConnections; ptr != NULL; ptr = ptr->next) {
+		if (ptr->sock == sock) {
+			*connectionID = ptr->connectionID;
+			return CMTSuccess;
+		}
+	}
+
+	return CMTFailure;
+}
+
+CMTStatus CMT_GetDataSocket(PCMT_CONTROL control, CMUint32 connectionID, CMTSocket * sock)
+{
+	PCMT_DATA ptr;
+
+	for (ptr = control->cmtDataConnections; ptr != NULL; ptr = ptr->next) {
+		if (ptr->connectionID == connectionID) {
+			*sock = ptr->sock;
+			return CMTSuccess;
+		}
+	}
+
+	return CMTFailure;
+}
+
+
+CMTStatus CMT_SetPrivate(PCMT_CONTROL control, CMUint32 connectionID,
+			 CMTPrivate *cmtpriv)
+{
+  PCMT_DATA ptr;
+
+  for (ptr = control->cmtDataConnections; ptr != NULL; ptr = ptr->next) {
+    if (ptr->connectionID == connectionID) {
+      ptr->priv = cmtpriv;
+      return CMTSuccess;
+    }
+  }
+  return CMTFailure;
+}
+
+CMTPrivate *CMT_GetPrivate(PCMT_CONTROL control, CMUint32 connectionID)
+{
+  PCMT_DATA ptr;
+
+  for (ptr = control->cmtDataConnections; ptr != NULL; ptr = ptr->next) {
+    if (ptr->connectionID == connectionID) {
+      return ptr->priv;
+    }
+  }
+  return NULL;
+}
+
+void CMT_FreeItem(CMTItem *p)
+{
+  CMT_FreeMessage(p);
+}
+
+CMTItem CMT_CopyPtrToItem(void* p)
+{
+    CMTItem value = {0, NULL, 0};
+
+    if (!p) {
+        return value;
+    }
+
+    value.len = sizeof(p);
+    value.data = (unsigned char *) malloc(value.len);
+    memcpy(value.data, &p, value.len);
+
+    return value;
+}
+
+void * CMT_CopyItemToPtr(CMTItem value)
+{
+    void * p = NULL;
+
+    if (value.len == sizeof(void*)) {
+        memcpy(&p, value.data, value.len);
+    }
+
+    return p;
+}
+
+CMTStatus CMT_ReferenceControlConnection(PCMT_CONTROL control)
+{    CMT_LOCK(control->mutex);
+    control->refCount++;
+    CMT_UNLOCK(control->mutex);
+    return CMTSuccess;
+}
+
+void
+CMT_LockConnection(PCMT_CONTROL control)
+{
+    CMT_LOCK(control->mutex);
+}
+
+void
+CMT_UnlockConnection(PCMT_CONTROL control)
+{
+    CMT_UNLOCK(control->mutex);
+}

mozilla/security/psm/lib/client/cmtutils.h

@@ -0,0 +1,77 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#ifndef __CMTUTILS_H__
+#define __CMTUTILS_H__
+
+#include "cmtcmn.h"
+
+#define New(type) (type*)malloc(sizeof(type))
+#define NewArray(type, size) (type*)malloc(sizeof(type)*(size))
+
+PCMT_EVENT CMT_GetEventHandler(PCMT_CONTROL control, CMUint32 type,
+                               CMUint32 resourceID);
+
+CMUint32 cmt_Strlen(char *str);
+char *cmt_PackString(char *buf, char *str);
+char *cmt_UnpackString(char *buf, char **str);
+
+CMUint32 cmt_Bloblen(CMTItem* len);
+char *cmt_PackBlob(char *buf, CMTItem * blob);
+char *cmt_UnpackBlob(char *buf, CMTItem **blob);
+
+CMTStatus CMT_SendMessage(PCMT_CONTROL control, CMTItem* message);
+CMTStatus CMT_TransmitMessage(PCMT_CONTROL control, CMTItem * message);
+CMTStatus CMT_ReceiveMessage(PCMT_CONTROL control, CMTItem * response);
+CMTStatus CMT_ReadMessageDispatchEvents(PCMT_CONTROL control, 
+					CMTItem* message);
+CMUint32 CMT_ReadThisMany(PCMT_CONTROL control, CMTSocket sock, 
+			  void * buffer, CMUint32 thisMany);
+CMUint32 CMT_WriteThisMany(PCMT_CONTROL control, CMTSocket sock, 
+			   void * buffer, CMUint32 thisMany);
+CMTItem* CMT_ConstructMessage(CMUint32 type, CMUint32 length);
+void CMT_FreeMessage(CMTItem * p);
+CMTStatus CMT_AddDataConnection(PCMT_CONTROL control, CMTSocket sock, CMUint32 connectionID);
+CMTStatus CMT_GetDataConnectionID(PCMT_CONTROL control, CMTSocket sock, CMUint32 * connectionID);
+CMTStatus CMT_GetDataSocket(PCMT_CONTROL control, CMUint32 connectionID, CMTSocket * sock);
+CMTStatus CMT_CloseDataConnection(PCMT_CONTROL control, CMUint32 connectionID);
+CMTStatus CMT_SetPrivate(PCMT_CONTROL control, CMUint32 connectionID,
+			 CMTPrivate *cmtpriv);
+CMTPrivate *CMT_GetPrivate(PCMT_CONTROL control, CMUint32 connectionID);
+void CMT_ServicePasswordRequest(PCMT_CONTROL cm_control, CMTItem * requestData);
+void CMT_ProcessEvent(PCMT_CONTROL cm_control);
+void CMT_DispatchEvent(PCMT_CONTROL cm_control, CMTItem * eventData);
+CMTItem CMT_CopyPtrToItem(void* p);
+void * CMT_CopyItemToPtr(CMTItem value);
+
+#endif /* __CMTUTILS_H__ */
+

mozilla/security/psm/lib/client/config.mk

@@ -0,0 +1,44 @@
+# 
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+# 
+
+#
+#  Override TARGETS variable so that only static libraries
+#  are specifed as dependencies within rules.mk.
+#
+
+TARGETS        = $(LIBRARY)
+SHARED_LIBRARY =
+IMPORT_LIBRARY =
+PURE_LIBRARY   =
+PROGRAM        =
+

mozilla/security/psm/lib/client/makefile.win

@@ -0,0 +1,130 @@
+#// 
+#// 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 the Netscape security libraries.
+#// 
+#// The Initial Developer of the Original Code is Netscape
+#// Communications Corporation.  Portions created by Netscape are 
+#// Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+#// Rights Reserved.
+#// 
+#// Contributor(s):
+#// 
+#// Alternatively, the contents of this file may be used under the
+#// terms of the GNU General Public License Version 2 or later (the
+#// "GPL"), in which case the provisions of the GPL are applicable 
+#// instead of those above.  If you wish to allow use of your 
+#// version of this file only under the terms of the GPL and not to
+#// allow others to use your version of this file under the MPL,
+#// indicate your decision by deleting the provisions above and
+#// replace them with the notice and other provisions required by
+#// the GPL.  If you do not delete the provisions above, a recipient
+#// may use your version of this file under either the MPL or the
+#// GPL.
+#// 
+IGNORE_MANIFEST=1
+#//------------------------------------------------------------------------
+#//
+#// Makefile to build the ssl library
+#//
+#//------------------------------------------------------------------------
+
+!if "$(MOZ_BITS)" == "16"
+!ifndef MOZ_DEBUG
+OPTIMIZER=-Os -UDEBUG -DNDEBUG
+!endif
+!endif
+
+#//------------------------------------------------------------------------
+#//
+#// Specify the depth of the current directory relative to the
+#// root of NS
+#//
+#//------------------------------------------------------------------------
+DEPTH= ..\..\..\..
+
+!ifndef MAKE_OBJ_TYPE
+MAKE_OBJ_TYPE=EXE
+!endif
+
+#//------------------------------------------------------------------------
+#//
+#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
+#//
+#//------------------------------------------------------------------------
+LIBNAME=cmt
+PDBFILE=$(LIBNAME).pdb
+
+LINCS = -I$(PUBLIC)\security \
+	-I$(PUBLIC)\nspr \
+        -I$(DEPTH)\include \
+	-I..\include
+
+!ifndef OS_CONFIG
+OS_CONFIG = WIN$(MOZ_BITS)
+!endif
+
+LCFLAGS = -DEXPORT_VERSION -DLIB_BUILD
+
+#//------------------------------------------------------------------------
+#// 
+#// Define the files necessary to build the target (ie. OBJS)
+#//
+#//------------------------------------------------------------------------
+OBJS=                         \
+    .\$(OBJDIR)\cmtinit.obj  \
+    .\$(OBJDIR)\cmtssl.obj   \
+    .\$(OBJDIR)\cmtutils.obj  \
+    .\$(OBJDIR)\cmtpkcs7.obj \
+    .\$(OBJDIR)\cmthash.obj \
+    .\$(OBJDIR)\cmtcert.obj \
+    .\$(OBJDIR)\cmtres.obj \
+    .\$(OBJDIR)\cmtjs.obj \
+    .\$(OBJDIR)\cmtevent.obj \
+    .\$(OBJDIR)\cmtpasswd.obj \
+    .\$(OBJDIR)\cmtadvisor.obj \
+    .\$(OBJDIR)\cmtrng.obj \
+	.\$(OBJDIR)\cmtsdr.obj \
+    $(NULL)
+
+EXPORTS = \
+    .\cmtcmn.h \
+    .\cmtclist.h \
+    $(NULL)
+
+#//------------------------------------------------------------------------
+#//
+#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
+#// (these must be defined before the common makefiles are included)
+#//
+#//------------------------------------------------------------------------
+LIBRARY=.\$(OBJDIR)\$(LIBNAME).lib
+
+#//------------------------------------------------------------------------
+#//
+#// install headers
+#//
+#//------------------------------------------------------------------------
+INSTALL_DIR=$(PUBLIC)\security
+INSTALL_FILE_LIST=cmtcmn.h cmtjs.h cmtclist.h
+
+#//------------------------------------------------------------------------
+#//
+#// Include the common makefile rules
+#//
+#//------------------------------------------------------------------------
+include <$(DEPTH)/config/rules.mak>
+
+install:: $(LIBRARY)
+    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+export:: INSTALL_FILES
+

mozilla/security/psm/lib/client/manifest.mn

@@ -0,0 +1,64 @@
+# 
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+# 
+
+CORE_DEPTH = ../../..
+DEPTH = ../../..
+
+EXPORTS = \
+	cmtcmn.h \
+	cmtjs.h  \
+	cmtclist.h \
+	$(NULL)
+
+MODULE = security
+
+CSRCS = cmtinit.c  \
+	cmtssl.c   \
+	cmtutils.c \
+	cmtcert.c  \
+	cmthash.c  \
+	cmtpkcs7.c \
+	cmtres.c   \
+	cmtjs.c    \
+	cmtevent.c \
+        cmtpasswd.c \
+	cmtadvisor.c \
+	cmtrng.c \
+	cmtsdr.c \
+	$(NULL)
+
+REQUIRES = nspr security
+
+LIBRARY_NAME = cmt
+
+INCLUDES += -I$(CORE_DEPTH)/include

mozilla/security/psm/lib/client/sample/Makefile

@@ -0,0 +1,128 @@
+#! gmake
+# 
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+# 
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
+ifneq ($(OS_ARCH), WINNT)
+ifeq ($(OS_ARCH), Linux)
+# On linux, we link with libstdc++
+CPLUSPLUSRUNTIME = -L /usr/lib -lstdc++ -lm
+else
+# libC, presumably, is what we must link with elsewhere
+CPLUSPLUSRUNTIME = -lC -lm
+endif
+endif
+
+ifeq ($(OS_ARCH), SunOS)
+ifeq ($(OS_RELEASE), 5.5.1)
+OS_LIBS += -ldl -lsocket -lnsl -lthread -lposix4
+endif
+ifeq ($(OS_RELEASE), 5.6)
+OS_LIBS += -ldl -lsocket -lnsl -lthread -lposix4
+endif
+endif
+
+ifeq ($(OS_ARCH), Linux)
+ifdef USE_PTHREADS
+# Replace OS_LIBS, because the order of libpthread, libdl, and libc are
+# very important. Otherwise you get horrible crashes.
+OS_LIBS = -lpthread -ldl -lc
+endif
+endif
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+
+ifeq ($(OS_ARCH), WINNT)
+LDFLAGS += /NODEFAULTLIB:library
+endif
+
+EXTRA_LIBS = \
+	$(DIST)/lib/$(LIB_PREFIX)cmt.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)protocol.$(LIB_SUFFIX) \
+	$(NULL)
+
+ifeq ($(OS_ARCH), WINNT)
+EXTRA_LIBS += 	wsock32.lib \
+		winmm.lib \
+		$(NULL)
+endif
+
+link:
+	if test -f $(PROGRAM); then	\
+		echo "rm $(PROGRAM)";	\
+		rm $(PROGRAM);		\
+	fi;				\
+	gmake				\
+
+build_sample:
+ifneq ($(OS_ARCH),WINNT)
+	cd $(CORE_DEPTH)/coreconf; gmake
+endif
+	cd $(CORE_DEPTH)/security; gmake import; gmake export
+	cd ../../protocol; gmake
+	cd ..; gmake
+	gmake
+

mozilla/security/psm/lib/client/sample/appsock.c

@@ -0,0 +1,250 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#include "cmtcmn.h"
+#include "appsock.h"
+
+#ifdef XP_UNIX
+#include <netinet/tcp.h>
+#include <errno.h>
+#endif
+
+CMT_SocketFuncs socketFuncs = {
+    APP_GetSocket,
+    APP_Connect,
+    APP_VerifyUnixSocket,
+    APP_Send,
+    APP_Select,
+    APP_Receive,
+    APP_Shutdown,
+    APP_Close
+};
+
+CMTSocket APP_GetSocket(int unixSock)
+{
+    APPSocket *sock;
+    int on = 1;
+
+#ifndef XP_UNIX
+    if (unixSock) {
+        return NULL;
+    }
+#endif
+
+    sock = malloc(sizeof(APPSocket));
+    if (sock == NULL) {
+        return NULL;
+    }
+    if (unixSock) {
+        sock->sock = socket(AF_UNIX, SOCK_STREAM, 0);
+    } else {
+        sock->sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    }
+    if (sock->sock < 0) {
+        free(sock);
+        return NULL;
+    }
+    if (!unixSock && 
+        setsockopt(sock->sock, IPPROTO_TCP, TCP_NODELAY, (const char*)&on,
+                   sizeof(on))) {
+        free(sock);
+        return NULL;
+    }
+
+    sock->isUnix = unixSock;
+#ifdef XP_UNIX
+    memset (&sock->servAddr, 0, sizeof(struct sockaddr_un));
+#endif
+    return (CMTSocket)sock;
+}
+
+CMTStatus APP_Connect(CMTSocket sock, short port, char *path)
+{
+    APPSocket *cmSock = (APPSocket*)sock;
+    struct sockaddr_in iServAddr;
+    const struct sockaddr *servAddr;
+    size_t addrLen;
+    int error;
+
+    if (cmSock->isUnix){
+#ifndef XP_UNIX
+        return CMTFailure;
+#else
+        cmSock->servAddr.sun_family = AF_UNIX;
+	memcpy(&cmSock->servAddr.sun_path, path, strlen(path)+1);
+        servAddr = (const struct sockaddr*)&cmSock->servAddr;
+        addrLen = sizeof(cmSock->servAddr);
+#endif
+    } else {
+        iServAddr.sin_family = AF_INET;
+        iServAddr.sin_port = htons(port);
+        iServAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+        servAddr = (const struct sockaddr*)&iServAddr;
+        addrLen = sizeof(struct sockaddr_in);
+    }
+    while (connect(cmSock->sock, servAddr, addrLen) != 0) {
+#ifdef WIN32
+        error = WSAGetLastError();
+        if (error == WSAEISCONN) {
+            break;
+        }
+        if ((error != WSAEINPROGRESS) && (error != WSAEWOULDBLOCK) && 
+            (error!= WSAEINVAL)) {
+            goto loser;
+        }
+#else
+        error = errno;
+        if (error == EISCONN) {
+            break;
+        }
+        if (error != EINPROGRESS) {
+            goto loser;
+        }
+#endif
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus APP_VerifyUnixSocket(CMTSocket sock)
+{
+#ifndef XP_UNIX
+    return CMTFailure;
+#else
+    APPSocket *cmSock = (APPSocket*)sock;
+    int rv;
+    struct stat statbuf;
+
+    if (!cmSock->isUnix) {
+        return CMTFailure;
+    }
+    rv = stat(cmSock->servAddr.sun_path, &statbuf);
+    if (rv < 0) {
+        goto loser;
+    }
+    if (statbuf.st_uid != geteuid()) {
+        goto loser;
+    }
+    return CMTSuccess;
+ loser:
+    close(cmSock->sock);
+    free(cmSock);
+    return CMTFailure;
+#endif
+}
+
+size_t APP_Send(CMTSocket sock, void *buffer, size_t length)
+{
+    APPSocket *cmSock = (APPSocket*) sock;
+
+    return send(cmSock->sock, buffer, length, 0);
+}
+
+CMTSocket APP_Select(CMTSocket *socks, int numsocks, int poll)
+{
+    APPSocket **sockArr = (APPSocket**)socks;
+    SOCKET nsocks = 0;
+    int i, rv;
+    struct timeval timeout;
+    fd_set readfds;
+
+#ifdef WIN32
+win_startover:
+#endif
+    FD_ZERO(&readfds);
+    for (i=0; i<numsocks; i++) {
+        FD_SET(sockArr[i]->sock, &readfds);
+        if (sockArr[i]->sock > nsocks) {
+            nsocks = sockArr[i]->sock;
+        }
+    }
+    if (poll) {
+        timeout.tv_sec = 0;
+        timeout.tv_usec = 0;
+    }
+    rv = select(nsocks+1, &readfds, NULL, NULL, (poll) ? &timeout : NULL);
+
+#ifdef WIN32
+    /* XXX Win95/98 Bug (Q177346)
+     *     select() with no timeout might return even if there is no data
+     *     pending or no error has occurred.  To get around this problem,
+     *     we loop if these erroneous conditions happen.
+     */
+    if (poll == 0 && rv == 0) {
+        goto win_startover;
+    }
+#endif
+
+    /* Figure out which socket was selected */
+    if (rv == -1 || rv == 0) {
+        goto loser;
+    }
+    for (i=0; i<numsocks; i++) {
+        if (FD_ISSET(sockArr[i]->sock, &readfds)) {
+            return (CMTSocket)sockArr[i];
+        }
+    }
+ loser:
+    return NULL;
+}
+
+size_t APP_Receive(CMTSocket sock, void *buffer, size_t bufSize)
+{
+    APPSocket *cmSock = (APPSocket*)sock;
+
+    return recv(cmSock->sock, buffer, bufSize, 0);
+}
+
+CMTStatus APP_Shutdown(CMTSocket sock)
+{
+    APPSocket *cmSock = (APPSocket*)sock;
+    int rv;
+
+    rv = shutdown(cmSock->sock, 1);
+    return (rv == 0) ? CMTSuccess : CMTFailure;
+}
+
+CMTStatus APP_Close(CMTSocket sock)
+{
+    APPSocket *cmSock = (APPSocket*)sock;
+    int rv;
+
+#ifdef XP_UNIX
+    rv = close(cmSock->sock);
+#else
+    rv = closesocket(cmSock->sock);
+#endif
+    free(cmSock);
+    return (rv == 0) ? CMTSuccess : CMTFailure;
+}

mozilla/security/psm/lib/client/sample/appsock.h

@@ -0,0 +1,69 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#ifndef _APPSOCK_H_
+#define _APPSOCK_H_
+#include "cmtcmn.h"
+
+#ifdef XP_UNIX
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+
+typedef int SOCKET;
+#endif
+
+typedef struct APPSocketStr {
+    SOCKET sock;
+    int    isUnix;
+#ifdef XP_UNIX
+    struct sockaddr_un servAddr;
+#endif 
+} APPSocket; 
+
+extern CMT_SocketFuncs socketFuncs;
+
+CMTStatus APP_Close(CMTSocket sock);
+CMTStatus APP_Shutdown(CMTSocket sock);
+size_t APP_Receive(CMTSocket sock, void *buffer, size_t bufSize);
+CMTSocket APP_Select(CMTSocket *socks, int numsocks, int poll);
+size_t APP_Send(CMTSocket sock, void *buffer, size_t length);
+CMTStatus APP_VerifyUnixSocket(CMTSocket sock);
+CMTStatus APP_Connect(CMTSocket sock, short port, char *path);
+CMTSocket APP_GetSocket(int unixSock);
+
+
+#endif /* _APPSOCK_H_ */

mozilla/security/psm/lib/client/sample/config.mk

@@ -0,0 +1,44 @@
+# 
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+# 
+
+#
+#  Override TARGETS variable so that only static libraries
+#  are specifed as dependencies within rules.mk.
+#
+
+TARGETS        = $(PROGRAM)
+SHARED_LIBRARY =
+IMPORT_LIBRARY =
+PURE_LIBRARY   =
+LIBRARY        =
+

mozilla/security/psm/lib/client/sample/manifest.mn

@@ -0,0 +1,52 @@
+# 
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+# 
+CORE_DEPTH = ../../../..
+
+# MODULE public and private header  directories are implicitly REQUIRED.
+MODULE	= cmtsample
+
+EXPORTS = \
+	$(NULL)
+
+CSRCS = \
+	sample.c \
+	appsock.c \
+	$(NULL)
+INCLUDES += -I../../protocol -I..
+
+# The MODULE is always implicitly required.
+# Listing it here in REQUIRES makes it appear twice in the cc command line.
+REQUIRES = security
+
+PROGRAM  = cmtsample
+

mozilla/security/psm/lib/client/sample/sample.c

@@ -0,0 +1,351 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#include "cmtcmn.h"
+#include "cmtjs.h"
+#include "appsock.h"
+#include <stdarg.h>
+#include <string.h>
+
+#ifdef XP_UNIX
+#include <netdb.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
+#ifdef WIN32
+#include <direct.h>
+#endif
+
+/*
+ * This is a simple program that tries to detect if the psm server is loaded.
+ * If the server is not loaded, it will start it.  The program will then 
+ * connect to the server and fetch an HTML page from an SSL server.
+ *
+ * NOTE: This sample program does not implement a mutex for the libraries.
+ * If implementing a threaded application, then pass in a mutex structure
+ * so that connections to the psm server happen in a thread safe manner.
+ */
+
+#define NUM_CONNECT_TRIES 10
+#define READ_BUFFER_SIZE  1024
+void
+usage(void)
+{
+    printf("Usage:\n"
+           "\tcmtsample <secure site>\n\n"
+           "This program will then echo the retrieved HTML to the screen\n");
+}
+
+void
+errorMessage(int err,char *msg, ...)
+{
+    va_list args;
+    
+    va_start(args, msg);
+    fprintf (stderr, "cmtSample%s: ", (err) ? " error" : "");
+    vfprintf (stderr, msg, args);
+    fprintf (stderr, "\n");
+    va_end(args);
+    if (err) {
+        exit (err);
+    }
+}
+
+#ifdef XP_UNIX
+#define FILE_PATH_SEPARATOR '/'
+#elif defined (WIN32)
+#define FILE_PATH_SEPARATOR '\\'
+#else
+#error Tell me what the file path separator is.
+#endif
+
+PCMT_CONTROL
+connect_to_psm(void)
+{
+    PCMT_CONTROL control=NULL;
+    char path[256], *tmp;
+
+#ifdef XP_UNIX
+    if (getcwd(path,256) == NULL) {
+      return NULL;
+    }
+#elif defined(WIN32)
+    if (_getcwd(path,256) == NULL) {
+      return NULL;
+    }
+#else
+#error Teach me how to get the current working directory.
+#endif
+    tmp = &path[strlen(path)];
+    sprintf(tmp,"%c%s", FILE_PATH_SEPARATOR, "psm");
+    return CMT_EstablishControlConnection(path, &socketFuncs, NULL);
+}
+
+#define HTTPS_STRING "https://"
+
+char*
+extract_host_from_url(char *url)
+{
+    char *start, *end, *retString=NULL;
+
+    while(isspace(*url)) {
+        url++;
+    }
+    url = strdup(url);
+    start = strstr(url, HTTPS_STRING);
+    if (start == NULL) {
+        return NULL;
+    }
+    start += strlen(HTTPS_STRING);
+    /*
+     * Figure out the end of the host name.
+     */
+    end = strchr(start, ':');
+    if (end != NULL) {
+        *end = '\0';
+    } else {
+        end = strchr(start, '/');
+        if (end != NULL) {
+            *end = '\0';
+        } else {
+            end = strchr(start, ' ');
+            if (end != NULL) {
+                *end = '\0';
+            }
+        }
+    }
+    retString = strdup(start);
+    return retString;
+}
+
+CMUint32
+get_port_from_url(char *url)
+{
+    char *colon, *port;
+
+    url = strdup(url);
+    colon = strrchr(url, ':');
+    if (colon == NULL ||
+        !isdigit(colon[1])) {
+        /* Return the default SSL port. */
+        free(url);
+        return 443;
+    }
+    colon++;
+    port = colon;
+    while(isdigit(*colon))
+        colon++;
+    colon[1] = '\0';
+    free(url);
+    return (CMUint32)atol(port);
+}
+
+char*
+extract_get_target(char *url)
+{
+    char *slash;
+
+    slash = strstr(url, "//");
+    slash += 2;
+    slash = strchr(slash, '/');
+    if (slash != NULL)
+        return strdup (slash);
+    else 
+        return strdup ("/");
+}
+
+/*
+ * We'll use this function for prompting for a password.
+ */
+char*
+passwordCallback(void *arg, char *prompt, void *cotext, int isPaswd)
+{
+    char input[256];
+    
+    printf(prompt);
+    fgets(input, 256, stdin);
+
+    return strdup(input);
+}
+
+void
+freeCallback(char *userInput)
+{
+  free (userInput);
+}
+
+#define NUM_PREFS 2
+
+int 
+main(int argc, char **argv)
+{
+  PCMT_CONTROL control;
+    CMTSocket sock, selSock;
+    char *hostname;
+    struct hostent *host;
+    char *ipAddress;
+    char buffer[READ_BUFFER_SIZE];
+    size_t bytesRead;
+    struct sockaddr_in destAddr;
+    char *getString;
+    char requestString[256];
+    char *profile;
+    CMTSetPrefElement prefs[NUM_PREFS];
+    char profileDir[256];
+
+#ifdef WIN32
+    WORD WSAVersion = 0x0101;
+    WSADATA WSAData;
+
+    WSAStartup (WSAVersion, &WSAData);
+#endif
+
+    if (argc < 2) {
+        usage();
+        return 1;
+    }
+    errorMessage (0,"cmtsample v1.0");
+    errorMessage (0,"Will try connecting to site %s", argv[1]);
+    if (strstr(argv[1], "https://") == NULL) {
+        errorMessage(2,"%s is not a secure site", argv[1]);
+    }
+    control = connect_to_psm();
+    if (control == NULL) {
+        errorMessage(3, "Could not connect to the psm server");
+    }
+    /* 
+     * Now we have to send the hello message.
+     */
+
+#ifdef WIN32
+    profile = strdup("default");
+    sprintf(profileDir,"%s", "c:\\default");
+#elif defined (XP_UNIX)
+    if (argc > 2) {
+        sprintf(profileDir,"%s", argv[2]);
+    } else {
+        profile = getenv("LOGNAME");
+        sprintf(profileDir, "%s/.netscape", getenv("HOME"));
+    }
+#else
+#error Teach me how to fill in the user profile.
+#endif
+    errorMessage(0,"Using directory <%s> for dbs.\n", profileDir);
+    if (CMT_Hello(control, PROTOCOL_VERSION,
+		  profile, profileDir) != CMTSuccess)
+    {
+        errorMessage(10, "Failed to send the Hello Message.");
+    }
+    CMT_SetPromptCallback(control, passwordCallback, NULL);
+    CMT_SetAppFreeCallback(control, freeCallback);
+    /*
+     * Now pass along some preferences to psm.  We'll pass hard coded
+     * ones here, but apps should figure out a way to manage their user's
+     * preferences.
+     */
+    prefs[0].key   = "security.enable_ssl2";
+    prefs[0].value = "true";
+    prefs[0].type  = CMT_PREF_BOOL;
+    prefs[1].key   = "security.enable_ssl3";
+    prefs[1].value = "true";
+    prefs[1].type  = CMT_PREF_BOOL;
+    CMT_PassAllPrefs(control, NUM_PREFS, prefs);
+    hostname = extract_host_from_url(argv[1]);
+    host = gethostbyname(hostname);
+    if (host == NULL) {
+        errorMessage(11, "gethostbyname for %s failed", hostname);
+    }
+    if (host->h_length != 4) {
+        errorMessage(4, "Site %s uses IV v6 socket.  Not supported by psm.");
+    }
+    
+    /* Create the socket we will use to get the decrypted data back from
+     * the psm server.
+     */
+    sock = APP_GetSocket(0);
+    if (sock == NULL) {
+        errorMessage(5, "Could not create new socket for communication with "
+                        "the psm server.");
+    }
+    memcpy(&(destAddr.sin_addr.s_addr), host->h_addr, host->h_length);
+    ipAddress = inet_ntoa(destAddr.sin_addr);
+    errorMessage(0, "Mapped %s to the following IP address: %s", argv[1],
+                 ipAddress);
+
+    if (CMT_OpenSSLConnection(control, sock, SSM_REQUEST_SSL_DATA_SSL,
+                              get_port_from_url(argv[1]), ipAddress, 
+                              hostname, CM_FALSE, NULL) != CMTSuccess) {
+        errorMessage(6, "Could not open SSL connection to %s.", argv[1]);
+    }
+
+    getString = extract_get_target(argv[1]);
+    sprintf(requestString, 
+            "GET %s HTTP/1.0\r\n"
+            "\r\n", getString, hostname);
+    APP_Send(sock, requestString, strlen(requestString));
+    /*
+     * Now all we have to do is sit here and fetch the data from the
+     * socket.
+     */
+    errorMessage (0, "About to print out the fetched page.");
+    while ((selSock=APP_Select(&sock, 1, 0)) != NULL) {
+        if (selSock == sock) {
+            bytesRead = APP_Receive(sock, buffer, READ_BUFFER_SIZE-1);
+            if (bytesRead == -1 || bytesRead == 0) {
+                break;
+            }
+            buffer[bytesRead] = '\0';
+            fprintf(stderr, buffer);
+        }
+    }
+    fprintf(stderr,"\n");
+    if (bytesRead == -1) {
+        errorMessage(7, "Error receiving decrypted data from psm.");
+    }
+    errorMessage(0, "Successfully read the entire page.");
+    if (CMT_DestroyDataConnection(control, sock) != CMTSuccess) {
+        errorMessage(8, "Error destroygin the SSL data connection "
+                     "with the psm server.");
+    }
+    if (CMT_CloseControlConnection(control) != CMTSuccess) {
+        errorMessage(9, "Error closing the control connection.");
+    }
+    return 0;
+}
+
+
+
+

mozilla/security/psm/lib/client/test.c

@@ -0,0 +1,99 @@
+/* 
+ * 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 the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+#include "cmt.h"
+
+CMTStatus myCallback(CMTControl * control, CMTItem * event, void * arg);
+
+int main(int argc, char ** argv)
+{
+  CMTItem * msg, * event = NULL;
+  CMTStatus status;
+  int socket, datasocket;
+  int sent;
+  CMTControl * connect;
+  char * buffer = "some weird text that I feel like passing to server";
+  
+  connect = CMT_ControlConnect(myCallback, event);
+  
+  msg = CMT_ConstructMessage(10);
+
+  msg->type = (int)CMTClientMessage;
+  sprintf((char *)msg->data, "first msg!");
+
+  status = CMT_SendMessage(connect, msg, event);
+  if (status != SECSuccess)
+    perror("CMT_SendMessage");
+  
+  CMT_FreeEvent(event);
+  event = NULL;
+
+  sprintf((char *)msg->data, "second msg");
+  status = CMT_SendMessage(connect, msg, event);
+  if (status != SECSuccess)
+    perror("CMT_SendMessage");
+
+  datasocket = CMT_DataConnect(connect, NULL);
+  if (datasocket < 0) 
+    perror("CMT_DataConnect");
+  
+  sent = write(datasocket, (void *)buffer, strlen(buffer));
+  sent = write(datasocket, (void *)buffer, strlen(buffer));
+
+  close(datasocket);
+  
+  msg->type = (int)CMTClientMessage;
+  sprintf((char *)msg->data, "third msg!");
+  status = CMT_SendMessage(connect, msg, event);
+  if (status != SECSuccess)
+    perror("CMT_SendMessage"); 
+  
+  status = CMT_CloseControlConnection(connect);
+  if (status != SECSuccess)
+    perror("CMT_CloseControl");
+  
+  CMT_FreeMessage(msg);
+  CMT_FreeEvent(event);
+}
+
+CMTStatus myCallback(CMTControl * control, CMTItem * event, void * arg)
+{
+  if (event) 
+    printf("Event received is : type %d, data %s\n", event->type, event->data);
+  else printf("No event!\n");
+  if (arg) 
+    printf("Arg is %s\n", (char *)arg);
+  else printf("No arg!\n");
+
+
+  return SECSuccess;
+}

mozilla/security/psm/lib/macbuild/PSMPrefix.h

@@ -0,0 +1,3 @@
+
+
+#include "MacPrefix.h"

mozilla/security/psm/lib/macbuild/PSMPrefix_debug.h

@@ -0,0 +1,2 @@
+
+#include "MacPrefix_debug.h"

mozilla/security/psm/lib/makefile.win

@@ -17,11 +17,11 @@
 # Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): Srilatha Moturi  <srilatha@netscape.com>
-#                 Krishna Mohan Khandrika <kkhandrika@netscape.com>
+# Contributor(s): 
 
-DEPTH=..\..
+DEPTH=..\..\..
+include <$(DEPTH)/config/config.mak>
 
-DIRS=mapihook resources mapiDll
+DIRS = client protocol
 
 include <$(DEPTH)\config\rules.mak>

mozilla/security/psm/lib/manifest.mn

@@ -0,0 +1,43 @@
+# 
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+# 
+#
+
+CORE_DEPTH = ../..
+DEPTH      = ../..
+
+DIRS = protocol client
+
+#
+# these dirs are not built at the moment
+#
+#NOBUILD_DIRS = jar

mozilla/security/psm/lib/nlslayer/Makefile.in

@@ -0,0 +1,56 @@
+#! gmake
+# 
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME = nlslayer
+MODULE = security
+
+EXPORTS = \
+	nlslayer.h \
+	$(NULL)
+
+CPPSRCS  = nlslayer.cpp \
+	 $(NULL)
+
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/security/psm/lib/nlslayer/macbuild/nlslayerPrefix.h

@@ -0,0 +1,3 @@
+
+
+#include "MacPrefix.h"

mozilla/security/psm/lib/nlslayer/macbuild/nlslayerPrefix_debug.h

@@ -0,0 +1,2 @@
+
+#include "MacPrefix_debug.h"

mozilla/security/psm/lib/nlslayer/makefile.win

@@ -1,29 +1,45 @@
 #!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
+#
+# The contents of this file are subject to the Netscape 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/
-# 
+# the License at http://www.mozilla.org/NPL/
+#
 # 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): 
-# Srilatha Moturi <srilatha@netscape.com>
 #
+# 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) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
 
 DEPTH=..\..\..\..
 
+include <$(DEPTH)\config\config.mak>
+
+LIBRARY_NAME=nlslayer
+
+CPPSRCS =				\
+	nlslayer.cpp		\
+	$(NULL)
+
+CPP_OBJS =					\
+	.\$(OBJDIR)\nlslayer.obj		\
+	$(NULL)
+
+MODULE=security
+
+LIBRARY_NAME = nlslayer
+LIBRARY=.\$(OBJDIR)\$(DLLNAME).dll
+
 include <$(DEPTH)\config\rules.mak>
 
-chrome::
-    $(REGCHROME) content messenger-mapi messenger.jar
+install:: $(LIBRARY)
+        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+clobber::