This commit was manufactured by cvs2svn to create tag 'CacheMergeWithTrunk'.

git-svn-id: svn://10.0.0.236/tags/CacheMergeWithTrunk@55505 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/netwerk/cache/Makefile.in

@@ -19,14 +19,20 @@
 # Contributor(s): 
 #
 
-DEPTH		= ../../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= protocol client
+DIRS		= \
+        public \
+        memcache \
+        filecache \
+        mgr \
+        build \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

mozilla/netwerk/cache/Makefile.win

@@ -1,4 +1,4 @@
-#!nmake
+#!gmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -19,9 +19,15 @@
 #
 # Contributor(s): 
 
-DEPTH=..\..\..
-include <$(DEPTH)/config/config.mak>
 
-DIRS = client protocol
+DEPTH=..\..
+DIRS= 	\
+	public                  \
+	mgr			\
+	memcache		\
+	filecache		\
+	build                   \
+	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
+

mozilla/netwerk/cache/build/Makefile.in

@@ -0,0 +1,54 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= nkcache
+LIBRARY_NAME	= nkcache
+IS_COMPONENT	= 1
+
+CPPSRCS		= nsNetDataCacheModule.cpp
+
+SHARED_LIBRARY_LIBS = \
+		$(DIST)/lib/libnkcachemgr_s.a \
+		$(DIST)/lib/libnkfilecache_s.a \
+		$(DIST)/lib/libnkmemcache_s.a \
+        $(DIST)/lib/libmozdbm_s.a     \
+        $(DIST)/lib/libxpcomio_s.a \
+		$(NULL)
+
+LOCAL_INCLUDES	= \
+		-I$(DEPTH)/netwerk/cache/memcache \
+		-I$(DEPTH)/netwerk/cache/filecache \
+		-I$(DEPTH)/netwerk/cache/mgr \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS = \
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+

mozilla/netwerk/cache/build/makefile.win

@@ -0,0 +1,51 @@
+#!gmake
+#
+# 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.
+#
+
+DEPTH=..\..\..
+MODULE=nkcache
+
+MAKE_OBJ_TYPE=DLL
+DLLNAME=nkcache
+DLL=.\$(OBJDIR)\$(DLLNAME).dll
+
+CPP_OBJS=                                    \
+        .\$(OBJDIR)\nsNetDataCacheModule.obj \
+	$(NULL)
+
+LLIBS=                                \
+        $(DIST)\lib\nkcachemgr_s.lib  \
+        $(DIST)\lib\nkfilecache_s.lib \
+        $(DIST)\lib\nkmemcache_s.lib  \
+        $(DIST)\lib\dbm32.lib         \
+        $(DIST)\lib\xpcom.lib         \
+        $(LIBNSPR)  
+
+INCS = $(INCS)                             \
+        -I$(DEPTH)\netwerk\cache\memcache  \
+        -I$(DEPTH)\netwerk\cache\filecache \
+        -I$(DEPTH)\netwerk\cache\mgr       \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
+

mozilla/netwerk/cache/build/nsNetDataCacheModule.cpp

@@ -0,0 +1,49 @@
+ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+#include "nsCOMPtr.h"
+#include "nsIModule.h"
+#include "nscore.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsIGenericFactory.h"
+
+#include "nsINetDataCache.h"
+#include "nsINetDataCacheManager.h"
+#include "nsMemCacheCID.h"
+#include "nsMemCache.h"
+#include "nsNetDiskCache.h"
+#include "nsNetDiskCacheCID.h"
+#include "nsCacheManager.h"
+
+// Factory method to create a new nsMemCache instance.  Used
+// by nsNetDataCacheModule
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMemCache, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNetDiskCache, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCacheManager, Init)
+
+static nsModuleComponentInfo components[] = {
+    { "Memory Cache", NS_MEM_CACHE_FACTORY_CID, NS_NETWORK_MEMORY_CACHE_PROGID, nsMemCacheConstructor },
+    { "File Cache",   NS_NETDISKCACHE_CID,      NS_NETWORK_FILE_CACHE_PROGID,   nsNetDiskCacheConstructor },
+    { "Cache Manager",NS_CACHE_MANAGER_CID,     NS_NETWORK_CACHE_MANAGER_PROGID,nsCacheManagerConstructor }
+};
+
+NS_IMPL_NSGETMODULE("Network Data Cache", components)

mozilla/netwerk/cache/filecache/Makefile.in

@@ -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 Mozilla Communicator.
+# 
+# The Initial Developer of the Original Code is Intel Corp.
+# Portions created by Intel Corp. are
+# Copyright (C) 1999, 1999 Intel Corp.  All
+# Rights Reserved.
+# 
+# Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+#                 Carl Wong <carl.wong@intel.com>
+# 
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+VPATH       = @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = nkcache
+
+LIBRARY_NAME = nkfilecache_s
+
+REQUIRES	= nspr dbm 
+
+EXTRA_DSO_LDOPTS  +=  -L$(DIST)/lib  -lmozdbm_s
+
+EXPORTS=nsNetDiskCacheCID.h
+
+CPPSRCS		= \
+        nsDBAccessor.cpp\
+        nsDBEnumerator.cpp \
+        nsNetDiskCache.cpp \
+        nsDiskCacheRecord.cpp \
+        nsDiskCacheRecordChannel.cpp \
+		$(NULL)
+
+EXTRA_LIBS	= $(NSPR_LIBS) 
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/netwerk/cache/filecache/makefile.win

@@ -0,0 +1,44 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..
+
+include <$(DEPTH)/config/config.mak>
+
+MODULE = nkcache
+
+LIBRARY_NAME = nkfilecache_s
+
+CPP_OBJS=                                    \
+        .\$(OBJDIR)\nsDBAccessor.obj         \
+        .\$(OBJDIR)\nsDBEnumerator.obj       \
+        .\$(OBJDIR)\nsNetDiskCache.obj       \
+        .\$(OBJDIR)\nsDiskCacheRecord.obj    \
+        .\$(OBJDIR)\nsDiskCacheRecordChannel.obj    \
+	$(NULL)
+
+EXPORTS=nsNetDiskCacheCID.h
+
+include <$(DEPTH)\config\rules.mak> 
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -rf $(OBJDIR)
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+

mozilla/netwerk/cache/filecache/nsDBAccessor.cpp

@@ -0,0 +1,351 @@
+/*
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+// FUR - Add overall description comment here
+
+#include "nsDBAccessor.h"
+#include "nscore.h"
+
+#include "prtypes.h"
+#include "plhash.h"
+#include "nsCRT.h"
+#include "nsAutoLock.h"
+
+nsDBAccessor::nsDBAccessor() :
+  mDB(0) ,
+  mSessionID(0) ,
+  mSessionCntr(0)
+{
+
+  NS_INIT_REFCNT();
+}
+
+nsDBAccessor::~nsDBAccessor()
+{
+  printf(" ~nsDBAccessor\n") ;
+  Shutdown() ;
+}
+
+//
+// Implement nsISupports methods
+//
+NS_IMPL_ISUPPORTS(nsDBAccessor, NS_GET_IID(nsIDBAccessor))
+
+
+///////////////////////////////////////////////////////////
+// nsIDBAccessor methods 
+
+NS_IMETHODIMP
+nsDBAccessor::Init(nsIFileSpec* dbfile)
+{
+  // FUR - lock not needed
+  m_Lock = PR_NewLock() ;
+  if(!m_Lock)
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  char* dbname ;
+
+  // this should cover all platforms. 
+  dbfile->GetNativePath(&dbname) ;
+
+  // FUR - how is page size chosen ?  It's worth putting a comment
+  // in here about the possible usefulness of tuning these parameters
+  HASHINFO hash_info = {
+    16*1024 , /* bucket size */
+    0 ,       /* fill factor */
+    0 ,       /* number of elements */
+    0 ,       /* bytes to cache */
+    0 ,       /* hash function */
+    0} ;      /* byte order */
+
+  // FUR - lock not needed
+  nsAutoLock lock(m_Lock) ;
+
+  mDB = dbopen(dbname,
+               O_RDWR | O_CREAT ,
+               0600 ,
+               DB_HASH ,
+               & hash_info) ;
+
+  // FUR - does dbname have to be free'ed ?
+
+  if(!mDB)
+    return NS_ERROR_FAILURE ;
+
+  // set mSessionID
+  // FUR - Why the +1 ?  (No need for key to be NUL-terminated string.)
+  PRUint32 len = PL_strlen(SessionKey)+1 ;
+  DBT db_key, db_data ;
+
+  db_key.data = NS_CONST_CAST(char*, SessionKey) ;
+  db_key.size = len ;
+
+  int status = (*mDB->get)(mDB, &db_key, &db_data, 0) ;
+  if(status == -1) {
+    NS_ERROR("ERROR: failed get session id in database.") ;
+    return NS_ERROR_FAILURE ;
+  }
+
+  if(status == 0) {
+    // get the last session id
+    PRInt16 *old_ID = NS_STATIC_CAST(PRInt16*, db_data.data) ;
+    if(*old_ID < ini_sessionID) {
+      NS_ERROR("ERROR: Bad Session ID in database, corrupted db.") ;
+      return NS_ERROR_FAILURE ;
+    }
+
+    // FUR - need to comment out all printfs, or turn them into PR_LOG statements
+    printf("found previous session, id = %d\n", *old_ID) ;
+    mSessionID = *old_ID + 1 ;
+  } 
+  else if(status == 1) {
+    // must be a new db
+    mSessionID = ini_sessionID ;
+  }
+  db_data.data = NS_REINTERPRET_CAST(void*, &mSessionID) ;
+  db_data.size = sizeof(PRInt16) ;
+
+  // store the new session id
+  status = (*mDB->put)(mDB, &db_key, &db_data, 0) ;
+  if(status == 0) {
+    (*mDB->sync)(mDB, 0) ;
+    return NS_OK ;
+  } 
+  else {
+    NS_ERROR("reset session ID failure.") ;
+    return NS_ERROR_FAILURE ;
+  }
+}
+
+NS_IMETHODIMP
+nsDBAccessor::Shutdown(void)
+{
+  if(mDB) {
+    (*mDB->sync)(mDB, 0) ;
+    (*mDB->close)(mDB) ;
+    mDB = nsnull ;
+  }
+
+  // FUR - locks not necessary
+  if(m_Lock) 
+    PR_DestroyLock(m_Lock);
+  return NS_OK ;
+}
+  
+NS_IMETHODIMP
+nsDBAccessor::Get(PRInt32 aID, void** anEntry, PRUint32 *aLength) 
+{
+  if(!anEntry)
+    return NS_ERROR_NULL_POINTER ;
+
+  *anEntry = nsnull ;
+  *aLength = 0 ;
+
+  NS_ASSERTION(mDB, "no database") ;
+
+  // Lock the db
+  nsAutoLock lock(m_Lock) ;
+  DBT db_key, db_data ;
+
+  db_key.data = NS_REINTERPRET_CAST(void*, &aID) ;
+  db_key.size = sizeof(PRInt32) ;
+  
+  int status = 0 ;
+  status = (*mDB->get)(mDB, &db_key, &db_data, 0) ;
+
+  if(status == 0) {
+    *anEntry = db_data.data ;
+    *aLength = db_data.size ;
+    return NS_OK ;
+  } 
+  else if(status == 1)
+    return NS_OK ;
+  else
+    return NS_ERROR_FAILURE ;
+
+}
+
+NS_IMETHODIMP
+nsDBAccessor::Put(PRInt32 aID, void* anEntry, PRUint32 aLength)
+{
+  NS_ASSERTION(mDB, "no database") ;
+
+  // Lock the db
+  nsAutoLock lock(m_Lock) ;
+  DBT db_key, db_data ;
+
+  db_key.data = NS_REINTERPRET_CAST(void*, &aID) ;
+  db_key.size = sizeof(PRInt32) ;
+
+  db_data.data = anEntry ;
+  db_data.size = aLength ;
+
+  if(0 == (*mDB->put)(mDB, &db_key, &db_data, 0)) {
+    // FUR - I would avoid unnecessary sync'ing for performance's
+    // sake.  Maybe you could limit sync to max rate of, say, once
+    // every few seconds by keeping track of last sync time, using PR_Now().
+    (*mDB->sync)(mDB, 0) ;
+    return NS_OK ;
+  }
+  else {
+    // FUR - Try to avoid using NS_ERROR unless error is unrecoverable and serious
+    NS_ERROR("ERROR: Failed to put anEntry into db.\n") ;
+    return NS_ERROR_FAILURE ;
+  }
+}
+
+/*
+ * It's more important to remove the id->metadata entry first since
+ * key->id mapping is just a reference
+ */
+NS_IMETHODIMP
+nsDBAccessor::Del(PRInt32 aID, void* anEntry, PRUint32 aLength)
+{
+  NS_ASSERTION(mDB, "no database") ;
+
+  // FUR - no locks necessary
+  // Lock the db
+  nsAutoLock lock(m_Lock) ;
+  DBT db_key ;
+
+  // delete recordID->metadata
+  db_key.data = NS_REINTERPRET_CAST(void*, &aID) ;
+  db_key.size = sizeof(PRInt32) ;
+
+  PRInt32 status = -1 ;
+  status = (*mDB->del)(mDB, &db_key, 0) ;
+
+  if(-1 == status) {
+    // FUR - no printf's, use PR_LOG, NS_WARNING, or NS_ASSERTION, as the situation warrants
+    printf(" delete error\n") ;
+    return NS_ERROR_FAILURE ;
+  } 
+
+  // delete key->recordID
+  db_key.data = anEntry ;
+  db_key.size = aLength ;
+  status = (*mDB->del)(mDB, &db_key, 0) ;
+  if(-1 == status) {
+    // FUR - no printf's
+    printf(" delete error\n") ;
+    return NS_ERROR_FAILURE ;
+  } 
+
+  // FUR - Defer sync ?  See above
+  (*mDB->sync)(mDB, 0) ;
+
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDBAccessor::GetID(const char* key, PRUint32 length, PRInt32* aID) 
+{
+  NS_ASSERTION(mDB, "no database") ;
+
+  // Lock the db
+  nsAutoLock lock(m_Lock) ;
+
+  DBT db_key, db_data ;
+
+  db_key.data = NS_CONST_CAST(char*, key) ;
+  db_key.size = length ;
+
+  int status = (*mDB->get)(mDB, &db_key, &db_data, 0) ;
+  if(status == 0) {
+    // found recordID
+    *aID = *(NS_REINTERPRET_CAST(PRInt32*, db_data.data)) ;
+    return NS_OK ;
+  }
+  else if(status == 1) {
+    // create a new one
+    PRInt32 id = 0 ;
+    id = mSessionID << 16 | mSessionCntr++ ;
+
+    // add new id into mDB
+    db_data.data = NS_REINTERPRET_CAST(void*, &id) ;
+    db_data.size = sizeof(PRInt32) ;
+
+    status = (*mDB->put)(mDB, &db_key, &db_data, 0) ;
+    if(status != 0) {
+      NS_ERROR("updating db failure.") ;
+      return NS_ERROR_FAILURE ;
+    }
+    // FUR - defer sync ?
+    (*mDB->sync)(mDB, 0) ;
+    *aID = id ;
+    return NS_OK ;
+  } 
+  else {
+    NS_ERROR("ERROR: keydb failure.") ;
+    return NS_ERROR_FAILURE ;
+  }
+}
+
+NS_IMETHODIMP
+nsDBAccessor::EnumEntry(void** anEntry, PRUint32* aLength, PRBool bReset) 
+{
+  if(!anEntry)
+    return NS_ERROR_NULL_POINTER ;
+
+  *anEntry = nsnull ;
+  *aLength = 0 ;
+
+  NS_ASSERTION(mDB, "no database") ;
+
+  PRUint32 flag ;
+
+  if(bReset) 
+    flag = R_FIRST ;
+  else
+    flag = R_NEXT ;
+
+  // Lock the db
+  nsAutoLock lock(m_Lock) ;
+  DBT db_key, db_data ;
+
+  // FUR - +1 unnecessary ?
+  PRUint32 len = PL_strlen(SessionKey)+1 ;
+
+  int status ;
+
+  do {
+    status = (*mDB->seq)(mDB, &db_key, &db_data, flag) ;
+    flag = R_NEXT ;
+    if(status == -1)
+      return NS_ERROR_FAILURE ;
+    // get next if it's a key->recordID 
+    if(db_key.size > sizeof(PRInt32) && db_data.size == sizeof(PRInt32))
+      continue ;
+    // get next if it's a sessionID entry
+    if(db_key.size == len && db_data.size == sizeof(PRInt16))
+      continue ;
+    // recordID is always 32 bits long
+    if(db_key.size == sizeof(PRInt32))
+      break ;
+  } while(!status) ;
+
+  if (0 == status) {
+    *anEntry = db_data.data ;
+    *aLength = db_data.size ;
+  }
+  return NS_OK ;
+}

mozilla/netwerk/cache/filecache/nsDBAccessor.h

@@ -0,0 +1,68 @@
+/*
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+// FUR - Add overall description comment here
+
+#ifndef _NSIDBACCESSOR_H_
+#define _NSIDBACCESSOR_H_
+
+#include "nsIDBAccessor.h"
+#include "mcom_db.h"
+
+// bogus string for the key of session id 
+// FUR - suggest "SK" instead of "^^"
+static const char * const SessionKey = "^^" ;
+
+// initial session id number 
+static const PRInt16 ini_sessionID = 0xff ;
+
+class nsDBAccessor : public nsIDBAccessor
+{
+  public:
+  NS_DECL_ISUPPORTS
+
+  nsDBAccessor() ;
+  virtual ~nsDBAccessor() ;
+  
+  NS_IMETHOD Init(nsIFileSpec* dbfile) ;
+  NS_IMETHOD Shutdown(void) ; 
+
+  NS_IMETHOD Put(PRInt32 aID, void* anEntry, PRUint32 aLength) ;
+
+  NS_IMETHOD Get(PRInt32 aID, void** anEntry, PRUint32 *aLength) ;
+
+  NS_IMETHOD Del(PRInt32 aID, void* anEntry, PRUint32 aLength) ;
+
+  NS_IMETHOD GetID(const char* key, PRUint32 length, PRInt32* aID) ;
+
+  NS_IMETHOD EnumEntry(void* *anEntry, PRUint32* aLength, PRBool bReset) ;
+
+  protected:
+
+  private:
+  DB *                          mDB ;
+  PRInt16                       mSessionID ;
+  PRInt16                       mSessionCntr ;
+  PRLock *                      m_Lock ;
+} ;
+
+#endif // _NSIDBACCESSOR_H_

mozilla/netwerk/cache/filecache/nsDBEnumerator.cpp

@@ -0,0 +1,97 @@
+/*
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+// FUR - Add overall description comment here
+
+#include "nsDBEnumerator.h"
+#include "nsDiskCacheRecord.h"
+
+nsDBEnumerator::nsDBEnumerator(nsIDBAccessor* aDB, nsNetDiskCache* aCache) :
+  m_DB(aDB) ,
+  m_DiskCache(aCache) ,
+  tempEntry(0) ,
+  tempEntry_length(0) ,
+  m_CacheEntry(0) ,
+  bReset(PR_TRUE) 
+{
+  NS_INIT_REFCNT();
+
+}
+
+nsDBEnumerator::~nsDBEnumerator()
+{
+//  printf(" ~nsDBEnumerator()\n") ;
+  NS_IF_RELEASE(m_CacheEntry) ;
+}
+
+//
+// Implement nsISupports methods
+//
+NS_IMPL_ISUPPORTS(nsDBEnumerator, NS_GET_IID(nsIEnumerator))
+
+/////////////////////////////////////////////////////////////////
+// nsISimpleEnumerator methods
+
+NS_IMETHODIMP
+nsDBEnumerator::HasMoreElements(PRBool *_retval)
+{
+  *_retval = PR_FALSE ;
+
+  m_DB->EnumEntry(&tempEntry, &tempEntry_length, bReset) ;
+  bReset = PR_FALSE ;
+
+  if(tempEntry && tempEntry_length != 0)
+    *_retval = PR_TRUE ;
+
+  return NS_OK ;
+}
+
+// this routine does not create a new item by itself  
+// Rather it reuses the item inside the object. So if you need to use the 
+// item later, you have to
+// create a new item specifically, using copy constructor or some other dup 
+// function. And don't forget to release it after you're done
+//
+NS_IMETHODIMP
+nsDBEnumerator::GetNext(nsISupports **_retval)
+{
+  if(!m_CacheEntry) {
+    m_CacheEntry = new nsDiskCacheRecord(m_DB, m_DiskCache) ;
+    if(m_CacheEntry)
+      NS_ADDREF(m_CacheEntry) ;
+    else
+      return NS_ERROR_OUT_OF_MEMORY ;
+  }
+
+  if(!_retval)
+    return NS_ERROR_NULL_POINTER ;
+  *_retval = nsnull ;
+
+  nsresult rv = m_CacheEntry->RetrieveInfo(tempEntry, tempEntry_length) ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  *_retval = NS_STATIC_CAST(nsISupports*, m_CacheEntry) ;
+  NS_ADDREF(*_retval) ; // all good getter addref 
+
+  return NS_OK ;
+}

mozilla/netwerk/cache/filecache/nsDBEnumerator.h

@@ -0,0 +1,61 @@
+/*
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+// FUR - Add overall description comment here
+
+#ifndef _NS_DBENUMERATOR_H_
+#define _NS_DBENUMERATOR_H_
+
+#include "nsISimpleEnumerator.h"
+#include "nsINetDataCacheRecord.h"
+#include "nsIDBAccessor.h"
+#include "nsCOMPtr.h"
+#include "nsNetDiskCache.h"
+#include "nsDiskCacheRecord.h"
+
+class nsCachedDiskData ; /* forward decl */
+
+class nsDBEnumerator : public nsISimpleEnumerator {
+public:
+    NS_DECL_ISUPPORTS
+
+    // FUR can use NS_DECL_NSISIMPLEENUMERATOR here
+    /* boolean HasMoreElements (); */
+    NS_IMETHOD HasMoreElements(PRBool *_retval) ;
+
+    /* nsISupports GetNext (); */
+    NS_IMETHOD GetNext(nsISupports **_retval) ;
+
+    nsDBEnumerator(nsIDBAccessor* aDB, nsNetDiskCache* aCache) ;
+    virtual ~nsDBEnumerator() ;
+
+    // FUR all members should be prefixed by 'm', e.g. mbReset
+private:
+    nsCOMPtr<nsIDBAccessor>                m_DB ;
+    nsCOMPtr<nsNetDiskCache>                        m_DiskCache ;
+    void *                                 tempEntry ;
+    PRUint32                               tempEntry_length ;
+    nsDiskCacheRecord*                    m_CacheEntry ;
+    PRBool                                 bReset ;
+};
+
+#endif // _NS_DBENUMERATOR_H_

mozilla/netwerk/cache/filecache/nsDiskCacheRecord.cpp

@@ -0,0 +1,451 @@
+/*
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#include "nsDiskCacheRecord.h"
+#include "nsINetDataDiskCache.h"
+#include "nsNetDiskCacheCID.h"
+#include "nsDiskCacheRecordChannel.h"
+#include "nsFileStream.h"
+
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsIProtocolHandler.h"
+#include "nsIIOService.h"
+#include "nsIAllocator.h"
+
+#include "plstr.h"
+#include "prprf.h"
+#include "prmem.h"
+#include "prlog.h"
+#include "prtypes.h"
+#include "netCore.h"
+
+#include "nsDBAccessor.h"
+
+#if !defined(IS_LITTLE_ENDIAN) && !defined(IS_BIG_ENDIAN)
+ERROR! Must have a byte order
+#endif
+
+#ifdef IS_LITTLE_ENDIAN
+#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32))
+#else
+#define COPY_INT32(_a,_b)  /* swap */                   \
+    do {                                                \
+    ((char *)(_a))[0] = ((char *)(_b))[3];              \
+    ((char *)(_a))[1] = ((char *)(_b))[2];              \
+    ((char *)(_a))[2] = ((char *)(_b))[1];              \
+    ((char *)(_a))[3] = ((char *)(_b))[0];              \
+    } while(0)
+#endif
+
+nsDiskCacheRecord::nsDiskCacheRecord(nsIDBAccessor* db, nsNetDiskCache* aCache) :
+  mKey(0) ,
+  mKeyLength(0) ,
+  mRecordID(0) ,
+  mMetaData(0) ,
+  mMetaDataLength(0) ,
+  mDB(db) ,
+  mInfo(0) ,
+  mInfoSize(0) ,
+  mNumChannels(0) ,
+  mDiskCache(aCache) 
+{
+
+  NS_INIT_REFCNT();
+}
+
+// mem alloced. so caller should do free() on key. 
+NS_IMETHODIMP
+nsDiskCacheRecord::Init(const char* key, PRUint32 length) 
+{
+  NS_NewFileSpec(getter_AddRefs(mFile));
+  if(!mFile)
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  // copy key
+  mKeyLength = length ;
+  mKey = NS_STATIC_CAST(char*, nsAllocator::Alloc(mKeyLength*sizeof(char))) ;
+  if(!mKey) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  memcpy(mKey, key, length) ;
+
+  // get RecordID
+  // FUR!! Another disk access ?  If called from GetCachedData, ID is already known
+  mDB->GetID(key, length, &mRecordID) ;
+  // FUR - check for GetID failure
+
+  // setup the file name
+  nsCOMPtr<nsIFileSpec> dbFolder ;
+  mDiskCache->GetDiskCacheFolder(getter_AddRefs(dbFolder)) ;
+
+  nsresult rv = mFile->FromFileSpec(dbFolder) ;
+  if(NS_FAILED(rv))
+    return NS_ERROR_FAILURE ;
+
+  // dir is a hash result of mRecordID%32, hope it's enough 
+  char filename[9], dirName[3] ;
+  
+  // FUR!! - should the format string be "%.02x".  How does this work !?
+  PR_snprintf(dirName, 3, "%.2x", (((PRUint32)mRecordID) % 32)) ;
+  mFile->AppendRelativeUnixPath(dirName) ;
+
+  // FUR!! - should the format string be "%.08x".  How does this work !?
+  PR_snprintf(filename, 9, "%.8x", mRecordID) ;
+  mFile->AppendRelativeUnixPath(filename) ;
+
+  return NS_OK ;
+}
+
+nsDiskCacheRecord::~nsDiskCacheRecord()
+{
+//  printf(" ~nsDiskCacheRecord()\n") ;
+  if(mKey)
+    nsAllocator::Free(mKey) ;
+  if(mMetaData)
+    nsAllocator::Free(mMetaData) ;
+
+}
+
+//
+// Implement nsISupports methods
+//
+NS_IMPL_ISUPPORTS(nsDiskCacheRecord, NS_GET_IID(nsINetDataCacheRecord))
+
+///////////////////////////////////////////////////////////////////////
+// nsINetDataCacheRecord methods
+
+// yes, mem alloced on *_retval.
+NS_IMETHODIMP
+nsDiskCacheRecord::GetKey(PRUint32 *length, char** _retval) 
+{
+  if(!_retval)
+    return NS_ERROR_NULL_POINTER ;
+
+  *length = mKeyLength ;
+  *_retval = NS_STATIC_CAST(char*, nsAllocator::Alloc(mKeyLength*sizeof(char))) ;
+  if(!*_retval)
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  memcpy(*_retval, mKey, mKeyLength) ;
+
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::GetRecordID(PRInt32* aRecordID)
+{
+  *aRecordID = mRecordID ;
+  return NS_OK ;
+}
+
+// yes, mem alloced on *_retval. 
+NS_IMETHODIMP
+nsDiskCacheRecord::GetMetaData(PRUint32 *length, char **_retval) 
+{
+  if(!_retval)
+    return NS_ERROR_NULL_POINTER ;
+
+  // always null the return value first. 
+  *_retval = nsnull ;
+
+  *length = mMetaDataLength ;
+
+  if(mMetaDataLength) {
+    *_retval = NS_STATIC_CAST(char*, nsAllocator::Alloc(mMetaDataLength*sizeof(char))) ;
+    if(!*_retval)
+      return NS_ERROR_OUT_OF_MEMORY ;
+
+    memcpy(*_retval, mMetaData, mMetaDataLength) ;
+  }
+
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::SetMetaData(PRUint32 length, const char* data)
+{
+  // set the mMetaData
+  mMetaDataLength = length ;
+  if(mMetaData)
+    nsAllocator::Free(mMetaData) ;
+  mMetaData = NS_STATIC_CAST(char*, nsAllocator::Alloc(mMetaDataLength*sizeof(char))) ;
+  if(!mMetaData) {
+    return NS_ERROR_OUT_OF_MEMORY ;
+  }
+  memcpy(mMetaData, data, length) ;
+
+  // Generate mInfo
+  nsresult rv = GenInfo() ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  // write through into mDB
+  rv = mDB->Put(mRecordID, mInfo, mInfoSize) ;
+
+  // FUR - mInfo leaking ?
+  return rv ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::GetStoredContentLength(PRUint32 *aStoredContentLength)
+{
+  return mFile->GetFileSize(aStoredContentLength) ;
+}
+
+// untill nsIFileSpec::Truncate() is in, we have to do all this ugly stuff
+NS_IMETHODIMP
+nsDiskCacheRecord::SetStoredContentLength(PRUint32 aStoredContentLength)
+{
+  PRUint32 len = 0 ;
+  nsresult rv = mFile->GetFileSize(&len) ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  if(len < aStoredContentLength)
+  {
+    NS_ERROR("Error: can not set filesize to something bigger than itself.\n") ;
+    return NS_ERROR_FAILURE ;
+  }
+  else 
+    return mFile->Truncate(aStoredContentLength) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::Delete(void)
+{
+  if(mNumChannels)
+    return NS_ERROR_NOT_AVAILABLE ;
+
+  PRUint32 len ;
+  mFile->GetFileSize(&len) ;
+
+  nsFileSpec cache_file ;
+  nsresult rv = mFile->GetFileSpec(&cache_file) ;
+
+  if(NS_FAILED(rv)) 
+    return NS_ERROR_FAILURE ;
+
+  cache_file.Delete(PR_TRUE) ;
+
+  // updata the storage size
+  mDiskCache->m_StorageInUse -= len ;
+
+  rv = mDB->Del(mRecordID, mKey, mKeyLength) ;
+  if(NS_FAILED(rv)) 
+    return NS_ERROR_FAILURE ;
+  else
+    return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::GetFilename(nsIFileSpec * *aFilename) 
+{
+  if(!aFilename)
+    return NS_ERROR_NULL_POINTER ;
+
+  *aFilename = mFile ;
+  NS_ADDREF(*aFilename) ;
+
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::NewChannel(nsILoadGroup *loadGroup, nsIChannel **_retval) 
+{
+  nsDiskCacheRecordChannel* channel = new nsDiskCacheRecordChannel(this, loadGroup) ;
+  if(!channel) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  nsresult rv = channel->Init() ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  NS_ADDREF(channel) ;
+  *_retval = NS_STATIC_CAST(nsIChannel*, channel) ;
+  return NS_OK ;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// nsDiskCacheRecord methods
+
+// file name is represented by a url string. I hope this would be more
+// generic
+nsresult
+nsDiskCacheRecord::GenInfo() 
+{
+  if(mInfo)
+    nsAllocator::Free(mInfo) ;
+
+  char* file_url=nsnull ;
+  PRUint32 name_len ;
+  mFile->GetURLString(&file_url) ;
+  name_len = PL_strlen(file_url)+1 ;
+
+  mInfoSize  = sizeof(PRUint32) ;    // checksum for mInfoSize
+  mInfoSize += sizeof(PRInt32) ;     // RecordID
+  mInfoSize += sizeof(PRUint32) ;    // key length
+  mInfoSize += mKeyLength ;          // key 
+  mInfoSize += sizeof(PRUint32) ;    // metadata length
+  mInfoSize += mMetaDataLength ;     // metadata 
+  mInfoSize += sizeof(PRUint32) ;    // filename length
+  mInfoSize += name_len ;            // filename 
+
+  void* newInfo = nsAllocator::Alloc(mInfoSize*sizeof(char)) ;
+  if(!newInfo) {
+    return NS_ERROR_OUT_OF_MEMORY ;
+  }
+
+  // copy the checksum mInfoSize
+  char* cur_ptr = NS_STATIC_CAST(char*, newInfo) ;
+  COPY_INT32(cur_ptr, &mInfoSize) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // copy RecordID
+  COPY_INT32(cur_ptr, &mRecordID) ;
+  cur_ptr += sizeof(PRInt32) ;
+
+  // copy key length
+  COPY_INT32(cur_ptr, &mKeyLength) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // copy key
+  memcpy(cur_ptr, mKey, mKeyLength) ;
+  cur_ptr += mKeyLength ;
+
+  // copy metadata length
+  COPY_INT32(cur_ptr, &mMetaDataLength) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // copy metadata
+  memcpy(cur_ptr, mMetaData, mMetaDataLength) ;
+  cur_ptr += mMetaDataLength ;
+
+  // copy file name length 
+  COPY_INT32(cur_ptr, &name_len) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // copy file name
+  memcpy(cur_ptr, file_url, name_len) ;
+  cur_ptr += name_len ;
+
+  PR_ASSERT(cur_ptr == NS_STATIC_CAST(char*, newInfo) + mInfoSize);
+  mInfo = newInfo ;
+
+  return NS_OK ;
+}
+
+/*
+ * This Method suppose to get all the info from the db record
+ * and set them to accroding members. the original values
+ * will all be overwritten. only minimal error checking is performed.
+ */
+NS_IMETHODIMP
+nsDiskCacheRecord::RetrieveInfo(void* aInfo, PRUint32 aInfoLength) 
+{
+  // reset everything
+  if(mInfo) {
+    nsAllocator::Free(mInfo) ;
+    mInfo = nsnull ;
+  }
+
+  if(mKey) {
+    nsAllocator::Free(mKey) ;
+    mKey = nsnull ;
+  }
+  if(mMetaData) {
+    nsAllocator::Free(mMetaData) ;
+    mMetaData = nsnull ;
+  }
+
+  char * cur_ptr = NS_STATIC_CAST(char*, aInfo) ;
+
+  char* file_url ;
+  PRUint32 name_len ;
+
+  // set mInfoSize 
+  COPY_INT32(&mInfoSize, cur_ptr) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // check this at least
+  if(mInfoSize != aInfoLength) 
+    return NS_ERROR_FAILURE ;
+
+  // set mRecordID 
+  COPY_INT32(&mRecordID, cur_ptr) ;
+  cur_ptr += sizeof(PRInt32) ;
+
+  // set mKeyLength
+  COPY_INT32(&mKeyLength, cur_ptr) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // set mKey
+  mKey = NS_STATIC_CAST(char*, nsAllocator::Alloc(mKeyLength*sizeof(char))) ;
+  if(!mKey) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+  
+  memcpy(mKey, cur_ptr, mKeyLength) ;
+  cur_ptr += mKeyLength ;
+
+  PRInt32 id ;
+  mDB->GetID(mKey, mKeyLength, &id) ;
+  NS_ASSERTION(id==mRecordID, "\t ++++++ bad record, somethings wrong\n") ;
+
+  // set mMetaDataLength
+  COPY_INT32(&mMetaDataLength, cur_ptr) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // set mMetaData
+  mMetaData = NS_STATIC_CAST(char*, nsAllocator::Alloc(mMetaDataLength*sizeof(char))) ;
+  if(!mMetaData) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+  
+  memcpy(mMetaData, cur_ptr, mMetaDataLength) ;
+  cur_ptr += mMetaDataLength ;
+
+  // get mFile name length
+  COPY_INT32(&name_len, cur_ptr) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // get mFile native name
+  file_url = NS_STATIC_CAST(char*, nsAllocator::Alloc(name_len*sizeof(char))) ;
+  if(!file_url) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+  
+  memcpy(file_url, cur_ptr, name_len) ;
+  cur_ptr += name_len ;
+
+  PR_ASSERT(cur_ptr == NS_STATIC_CAST(char*, aInfo) + mInfoSize);
+
+  // create mFile if Init() isn't called 
+  if(!mFile) {
+    NS_NewFileSpec(getter_AddRefs(mFile));
+    if(!mFile)
+      return NS_ERROR_OUT_OF_MEMORY ;
+  }
+
+  // setup mFile
+  mFile->SetURLString(file_url) ;
+
+  return NS_OK ;
+}
+

mozilla/netwerk/cache/filecache/nsDiskCacheRecord.h

@@ -0,0 +1,70 @@
+/*
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#ifndef _NET_CACHEDDISKDATA_H_
+#define _NET_CACHEDDISKDATA_H_
+
+#include "nsINetDataCacheRecord.h"
+#include "nsCOMPtr.h"
+#include "nsIDBAccessor.h"
+#include "prtypes.h"
+#include "nsILoadGroup.h"
+#include "nsIFileChannel.h" 
+#include "nsNetDiskCache.h"
+
+class nsDiskCacheRecord : public nsINetDataCacheRecord
+{
+  public:
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSINETDATACACHERECORD
+
+  protected: 
+
+  nsDiskCacheRecord(nsIDBAccessor* db, nsNetDiskCache* aCache) ;
+  virtual ~nsDiskCacheRecord() ;
+
+  NS_IMETHOD RetrieveInfo(void* aInfo, PRUint32 aInfoLength) ;
+  NS_IMETHOD Init(const char* key, PRUint32 length) ;
+
+  nsresult GenInfo(void) ;
+
+  private:
+
+  char*                     mKey ;
+  PRUint32                  mKeyLength ;
+  PRInt32                   mRecordID ;
+  char*                     mMetaData ;
+  PRUint32                  mMetaDataLength ;
+  nsCOMPtr<nsIFileSpec>     mFile ;
+  nsCOMPtr<nsIDBAccessor>            mDB ; 
+  void*                     mInfo ;
+  PRUint32                  mInfoSize ;
+  PRUint32                  mNumChannels ;
+  nsCOMPtr<nsNetDiskCache>           mDiskCache ;
+
+  friend class nsDiskCacheRecordChannel ;
+  friend class nsDBEnumerator ;
+  friend class nsNetDiskCache ;
+} ;
+
+#endif // _NET_CACHEDDISKDATA_H_

mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp

@@ -0,0 +1,392 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#include "nsDiskCacheRecordChannel.h"
+//#include "nsFileTransport.h"
+#include "nsIIOService.h"
+#include "nsIServiceManager.h"
+
+#include "nsIOutputStream.h"
+
+static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
+
+// This is copied from nsMemCacheChannel, We should consolidate these two.
+class WriteStreamWrapper : public nsIOutputStream 
+{
+  public:
+  WriteStreamWrapper(nsDiskCacheRecordChannel* aChannel,
+                     nsIOutputStream *aBaseStream) ;
+
+  virtual ~WriteStreamWrapper() ;
+
+  static nsresult
+  Create(nsDiskCacheRecordChannel* aChannel, nsIOutputStream *aBaseStream, nsIOutputStream* *aWrapper) ;
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIBASESTREAM
+  NS_DECL_NSIOUTPUTSTREAM
+
+  private:
+  nsDiskCacheRecordChannel*         mChannel;
+  nsCOMPtr<nsIOutputStream>         mBaseStream;
+} ;
+
+// implement nsISupports
+NS_IMPL_ISUPPORTS(WriteStreamWrapper, NS_GET_IID(nsIOutputStream))
+
+WriteStreamWrapper::WriteStreamWrapper(nsDiskCacheRecordChannel* aChannel, 
+                                       nsIOutputStream *aBaseStream) 
+  : mChannel(aChannel), mBaseStream(aBaseStream)
+{ 
+  NS_INIT_REFCNT(); 
+  NS_ADDREF(mChannel);
+}
+
+WriteStreamWrapper::~WriteStreamWrapper()
+{
+  NS_RELEASE(mChannel);
+}
+
+nsresult 
+WriteStreamWrapper::Create(nsDiskCacheRecordChannel*aChannel, nsIOutputStream *aBaseStream, nsIOutputStream* * aWrapper) 
+{
+  WriteStreamWrapper *wrapper = new WriteStreamWrapper(aChannel, aBaseStream);
+  if (!wrapper) return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(wrapper);
+  *aWrapper = wrapper;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+WriteStreamWrapper::Write(const char *aBuffer, PRUint32 aCount, PRUint32 *aNumWritten) 
+{
+  *aNumWritten = 0;
+  nsresult rv = mBaseStream->Write(aBuffer, aCount, aNumWritten);
+  mChannel->NotifyStorageInUse(*aNumWritten);
+  return rv;
+}
+
+NS_IMETHODIMP
+WriteStreamWrapper::Flush() 
+{ 
+  return mBaseStream->Flush(); 
+}
+
+NS_IMETHODIMP
+WriteStreamWrapper::Close() 
+{ 
+  return mBaseStream->Close(); 
+}
+
+nsDiskCacheRecordChannel::nsDiskCacheRecordChannel(nsDiskCacheRecord *aRecord, 
+                                                   nsILoadGroup *aLoadGroup)
+  : mRecord(aRecord) ,
+    mLoadGroup(aLoadGroup) 
+{
+  NS_INIT_REFCNT() ;
+  mRecord->mNumChannels++ ;
+}
+
+nsDiskCacheRecordChannel::~nsDiskCacheRecordChannel()
+{
+  mRecord->mNumChannels-- ;
+}
+
+// FUR!!
+//
+//  I know that I gave conflicting advice on the issue of file
+//  transport versus file protocol handler, but I thought that the
+//  last word was that we would use the raw transport, when I wrote:
+//
+//   > I just thought of an argument for the other side of the coin, i.e. the
+//   > benefit of *not* reusing the file protocol handler: On the Mac, it's
+//   > expensive to convert from a string URL to an nsFileSpec, because the Mac
+//   > is brain-dead and scans every directory on the path to the file.  It's
+//   > cheaper to create a nsFileSpec for a cache file by combining a single,
+//   > static nsFileSpec that corresponds to the cache directory with the
+//   > relative path to the cache file (using nsFileSpec's operator +).  This
+//   > operation is optimized on the Mac to avoid the scanning operation.
+//
+//  The Mac guys will eat us alive if we do path string to nsFileSpec
+//  conversions for every cache file we open.
+
+nsresult 
+nsDiskCacheRecordChannel::Init(void) 
+{
+  char* urlStr ;
+  mRecord->mFile->GetURLString(&urlStr) ;
+
+  nsresult rv ;
+  NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = serv->NewChannel("load",    // XXX what should this be?
+                        urlStr,
+                        nsnull,    // no base uri
+                        mLoadGroup,
+                        nsnull,    // no eventsink getter
+                        0,
+                        nsnull,    // no original URI
+                        0,
+                        0,
+                        getter_AddRefs(mFileTransport));
+  return rv ;
+}
+
+nsresult 
+nsDiskCacheRecordChannel::NotifyStorageInUse(PRInt32 aBytesUsed)
+{
+  return mRecord->mDiskCache->m_StorageInUse += aBytesUsed ;
+}
+
+// implement nsISupports
+NS_IMPL_ISUPPORTS(nsDiskCacheRecordChannel, NS_GET_IID(nsIChannel))
+
+// implement nsIRequest
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::IsPending(PRBool *aIsPending) 
+{
+  *aIsPending = PR_FALSE ;
+  if(!mFileTransport)
+    return NS_OK ;
+
+  return mFileTransport->IsPending(aIsPending) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::Cancel(void)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->Cancel() ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::Suspend(void)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->Suspend() ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::Resume(void)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->Resume() ;
+}
+
+// implement nsIChannel
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetURI(nsIURI * *aURI)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->GetURI(aURI) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::OpenInputStream(PRUint32 aStartPosition, 
+                                          PRInt32 aReadCount,
+                                          nsIInputStream* *aResult)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->OpenInputStream(aStartPosition,
+                                         aReadCount,
+                                         aResult) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::OpenOutputStream(PRUint32 startPosition, 
+                                           nsIOutputStream* *aResult)
+{
+  nsresult rv ;
+  NS_ENSURE_ARG(aResult) ;
+
+  nsCOMPtr<nsIOutputStream> outputStream ;
+
+  PRUint32 oldLength ;
+  mRecord->GetStoredContentLength(&oldLength) ;
+
+  if(startPosition < oldLength) {
+    NotifyStorageInUse(startPosition - oldLength) ;
+
+    // we should truncate the file at here. 
+    rv = mRecord->SetStoredContentLength(startPosition) ;
+    if(NS_FAILED(rv)) {
+      printf(" failed to truncate\n") ;
+      return rv ;
+    }
+  }
+
+  rv = mFileTransport->OpenOutputStream(startPosition, getter_AddRefs(outputStream)) ;
+  if(NS_FAILED(rv)) return rv ;
+
+  return WriteStreamWrapper::Create(this, outputStream, aResult) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::AsyncOpen(nsIStreamObserver *observer, 
+                                    nsISupports *ctxt)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->AsyncOpen(observer, ctxt) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::AsyncRead(PRUint32 aStartPosition, 
+                                    PRInt32 aReadCount,
+                                    nsISupports *aContext, 
+                                    nsIStreamListener *aListener)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->AsyncRead(aStartPosition , 
+                                   aReadCount , 
+                                   aContext , 
+                                   aListener) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::AsyncWrite(nsIInputStream *fromStream, 
+                                     PRUint32 startPosition,
+                                     PRInt32 writeCount, 
+                                     nsISupports *ctxt,
+                                     nsIStreamObserver *observer)
+
+{
+  /*
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->AsyncWrite(fromStream, 
+                                    startPosition,
+                                    writeCount,
+                                    ctxt,
+                                    observer) ;
+  */
+
+  // I can't do this since the write is not monitored, and I won't be
+  // able to updata the storage. 
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->GetLoadAttributes(aLoadAttributes) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->SetLoadAttributes(aLoadAttributes) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetContentType(char * *aContentType)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->GetContentType(aContentType) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetContentLength(PRInt32 *aContentLength)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->GetContentLength(aContentLength) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetOwner(nsISupports* *aOwner)
+{
+  *aOwner = mOwner.get() ;
+  NS_IF_ADDREF(*aOwner) ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::SetOwner(nsISupports* aOwner) 
+{
+  mOwner = aOwner ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetOriginalURI(nsIURI* *aURI)
+{
+  // FUR - might need to implement this - not sure
+  return NS_ERROR_NOT_IMPLEMENTED ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+{
+  // Not required to be implemented, since it is implemented by cache manager
+  NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
+{
+  // Not required to be implemented, since it is implemented by cache manager
+  NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
+{
+  // Not required to be implemented, since it is implemented by cache manager
+  NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
+{
+  // Not required to be implemented, since it is implemented by cache manager
+  NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}

mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.h

@@ -0,0 +1,65 @@
+/*
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#ifndef _ns_DiskCacheRecordChannel_h_
+#define _ns_DiskCacheRecordChannel_h_
+
+#include "nsIChannel.h"
+#include "nsCOMPtr.h"
+#include "nsDiskCacheRecord.h"
+
+/*
+ * This class is plagiarized from nsMemCacheChannel
+ */
+
+class nsDiskCacheRecordChannel : public nsIChannel
+{
+  public:
+
+  nsDiskCacheRecordChannel(nsDiskCacheRecord *aRecord, nsILoadGroup *aLoadGroup);
+  virtual ~nsDiskCacheRecordChannel() ;
+
+  // Declare nsISupports methods
+  NS_DECL_ISUPPORTS
+
+  // Declare nsIRequest methods
+  NS_DECL_NSIREQUEST
+
+  // Declare nsIChannel methods
+  NS_DECL_NSICHANNEL
+
+  nsresult Init(void) ;
+
+  private:
+
+  nsresult NotifyStorageInUse(PRInt32 aBytesUsed) ;
+
+  nsCOMPtr<nsDiskCacheRecord>           mRecord ;
+  nsCOMPtr<nsILoadGroup>                mLoadGroup ;
+  nsCOMPtr<nsISupports>                 mOwner ;
+  nsCOMPtr<nsIChannel>                  mFileTransport ;
+
+  friend class WriteStreamWrapper ;
+} ;
+
+#endif // _ns_DiskCacheRecordChannel_h_
+

mozilla/netwerk/cache/filecache/nsIDBAccessor.h

@@ -0,0 +1,60 @@
+/*
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#ifndef _NS_IDBACCESSOR_H_
+#define _NS_IDBACCESSOR_H_
+
+#include "nsISupports.h"
+#include "nsIFileSpec.h"
+
+// nsIDBAccessorIID {6AADD4D0-7785-11d3-87FE-000629D01344}
+#define NS_IDBACCESSOR_IID \
+{ 0x6aadd4d0, 0x7785, 0x11d3, \
+ {0x87, 0xfe, 0x0, 0x6, 0x29, 0xd0, 0x13, 0x44}}
+
+// nsDBAccessorCID {6AADD4D1-7785-11d3-87FE-000629D01344}
+#define NS_DBACCESSOR_CID \
+{ 0x6aadd4d1, 0x7785, 0x11d3, \
+  { 0x87, 0xfe, 0x0, 0x6, 0x29, 0xd0, 0x13, 0x44 }} 
+
+class nsIDBAccessor : public nsISupports
+{
+  public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDBACCESSOR_IID)
+
+  NS_IMETHOD Init(nsIFileSpec* DBFile) = 0 ;
+  NS_IMETHOD Shutdown(void) = 0 ;
+
+  NS_IMETHOD Put(PRInt32 aID, void* anEntry, PRUint32 aLength) = 0 ;
+
+  NS_IMETHOD Get(PRInt32 aID, void** anEntry, PRUint32 *aLength) = 0 ;
+
+  NS_IMETHOD Del(PRInt32 aID, void* anEntry, PRUint32 aLength) = 0 ;
+
+  NS_IMETHOD GetID(const char* key, PRUint32 length, PRInt32* aID) = 0 ;
+
+  NS_IMETHOD EnumEntry(void* *anEntry, PRUint32* aLength, PRBool bReset) = 0 ;
+
+} ;
+
+#endif // _NS_IDBACCESSOR_H_
+

mozilla/netwerk/cache/filecache/nsNetDiskCache.cpp

@@ -0,0 +1,691 @@
+/*
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#include "nsNetDiskCache.h"
+#include "nscore.h"
+
+#include "plstr.h"
+#include "prprf.h"
+#include "prtypes.h"
+#include "prio.h"
+#include "prsystem.h" // Directory Seperator
+#include "plhash.h"
+#include "prclist.h"
+#include "prmem.h"
+
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+
+#include "nsIPref.h"
+#include "mcom_db.h"
+#include "nsDBEnumerator.h"
+
+#include "nsDiskCacheRecord.h"
+
+static NS_DEFINE_CID(kPrefCID, NS_PREF_CID) ;
+static NS_DEFINE_CID(kDBAccessorCID, NS_DBACCESSOR_CID) ;
+
+static const PRUint32 DISK_CACHE_SIZE_DEFAULT = 5*1024*1024 ; // 5MB
+static const char * const DISK_CACHE_PREF  = "browser.cache.disk_cache_size";
+static const char * const CACHE_DIR_PREF   = "browser.cache.directory";
+
+class nsDiskCacheRecord ;
+
+nsNetDiskCache::nsNetDiskCache() :
+  m_Enabled(PR_TRUE) ,
+  m_NumEntries(0) ,
+  m_pNextCache(0) ,
+  m_pDiskCacheFolder(0) ,
+  m_StorageInUse(0) ,
+  m_DB(0) ,
+  m_BaseDirNum(32) 
+{
+  // set it to INF for now 
+  m_MaxEntries = (PRUint32)-1 ;
+
+  NS_INIT_REFCNT();
+
+}
+
+nsNetDiskCache::~nsNetDiskCache()
+{
+  printf("~nsNetDiskCache\n") ;
+
+  NS_IF_RELEASE(m_DB) ;
+
+  // FUR!!
+  // You shouldn't rely on the value of m_BaseDirNum to diagnose whether or not
+  // a cache corruption has occurred since it's possible that the app does not
+  // shut down cleanly and a corrupted cache has still not been cleaned up from
+  // a previous session.  My suggestion is that you pick a different scheme for
+  // renaming the dirs, e.g. rename them as "trash*" and remove all directories
+  // with this name pattern on shutdown.
+
+  // FUR
+  // I think that, eventually, we also want a distinguished key in the DB which
+  // means "clean cache shutdown".  You clear this flag when the db is first
+  // opened and set it just before the db is closed.  If the db wasn't shutdown
+  // cleanly in a prior session, i.e. because the app crashed, on startup you
+  // scan all the individual files in directories and look for "orphans",
+  // i.e. cache files which don't have corresponding entries in the db.  That's
+  // also when storage-in-use and number of entries would be recomputed.
+  //
+  // We don't necessarily need all this functionality immediately, though.
+
+  if(m_BaseDirNum > 32)
+    RemoveDirs(32) ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::Init(void) 
+{
+  nsresult rv ;
+
+  // FUR!!
+  // I really don't think prefs belong here, since that breaks modularity.  It
+  // presupposes that the file cache code is embedded in the browser or some
+  // other application that uses the prefs, i.e. the code might be used in a
+  // standalone cache manipulation tool or, someday, in server code.  Pref
+  // reading belongs at a higher level, either in the application itself or
+  // possibly the I/O manager.
+
+
+  // Also, Init() needs to be lazy, since folder name is not set on startup,
+  // i.e. need a call to MaybeInit() at the beginning of every public method
+
+  NS_WITH_SERVICE(nsIPref, pref, kPrefCID, &rv) ;
+  if (NS_FAILED(rv)) 
+    NS_ERROR("Failed to get globle preference!\n") ;
+
+  rv = NS_NewFileSpec(getter_AddRefs(m_pDiskCacheFolder));
+  if (!m_pDiskCacheFolder) {
+    NS_ERROR("ERROR: Could not make a file spec.\n") ;
+    return NS_ERROR_OUT_OF_MEMORY ;
+  }
+
+  char* tempPref = 0 ;
+  if(pref) {
+    PRInt32 nTemp = 0 ;
+
+    /*
+    rv = pref->CopyCharPref(CACHE_DIR_PREF, &tempPref) ;
+    if (NS_SUCCEEDED(rv)) {
+      printf("cache dir is %s\n", tempPref) ;
+      m_pDiskCacheFolder->SetUnixStyleFilePath(tempPref) ;
+	  PR_Free(tempPref) ;
+    } else */
+    {
+      m_pDiskCacheFolder->SetUnixStyleFilePath("/tmp") ;
+      printf("using default folder, /tmp\n") ;
+    }
+  }
+  else {
+    // temp hack for now. change later for other platform
+    m_pDiskCacheFolder->SetUnixStyleFilePath("/tmp") ;
+  }
+
+  // FUR - suggest you use nsCOMPtr for m_DB - it will eliminate
+  //       manual addref/release and reduce likelihood of bugs
+  NS_IF_RELEASE(m_DB) ;
+  m_DB = new nsDBAccessor() ;
+  if(!m_DB)
+    return NS_ERROR_OUT_OF_MEMORY ;
+  else
+    NS_ADDREF(m_DB) ;
+
+  rv = InitDB() ;
+
+  // try once for recovery
+  if(rv == NS_ERROR_FAILURE) {
+    rv = DBRecovery() ;
+    return rv ;
+  }
+
+  rv = UpdateInfo() ;
+  return rv ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::InitDB(void)
+{
+  // create cache sub directories
+  nsresult rv ; 
+  nsCOMPtr<nsIFileSpec> cacheSubDir;
+  rv = NS_NewFileSpec(getter_AddRefs(cacheSubDir));
+
+  // FUR - any way to avoid doing this, if it's already been done ?
+  for (int i=0; i < 32; i++) {
+    rv = cacheSubDir->FromFileSpec(m_pDiskCacheFolder) ;
+    if(NS_FAILED(rv))
+      return rv ;
+
+    char dirName[3];
+    PR_snprintf (dirName, 3, "%0.2x", i);
+    cacheSubDir->AppendRelativeUnixPath (dirName) ;
+    CreateDir(cacheSubDir);
+  }
+
+  NS_NewFileSpec(getter_AddRefs(m_DBFile)) ;
+  // FUR - check for NS_NewFileSpec failure
+  rv = m_DBFile->FromFileSpec(m_pDiskCacheFolder) ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  m_DBFile->AppendRelativeUnixPath("cache.db") ;
+
+  rv = m_DB->Init(m_DBFile) ;
+  return rv ;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// nsISupports methods
+
+// FUR - Suggest you use NS_IMPL_ISUPPORTS3() macro instead
+NS_IMETHODIMP
+nsNetDiskCache::QueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+  NS_ASSERTION(aInstancePtr, "no instance pointer");
+  if(aIID.Equals(NS_GET_IID(nsINetDataDiskCache)) ||
+     aIID.Equals(NS_GET_IID(nsINetDataCache)) ||
+     aIID.Equals(NS_GET_IID(nsISupports))) {
+    *aInstancePtr = NS_STATIC_CAST(nsINetDataDiskCache*, this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  else
+    return NS_NOINTERFACE ;
+}
+
+NS_IMPL_ADDREF(nsNetDiskCache) ;
+NS_IMPL_RELEASE(nsNetDiskCache) ;
+
+///////////////////////////////////////////////////////////////////////////
+// nsINetDataCache Method 
+
+NS_IMETHODIMP
+nsNetDiskCache::GetDescription(PRUnichar* *aDescription) 
+{
+  nsAutoString description("Disk Cache") ;
+  *aDescription = description.ToNewUnicode() ;
+  if(!*aDescription)
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  return NS_OK ;
+}
+
+/* don't alloc mem for nsICachedNetData. 
+ * RecordID is generated using the same scheme in nsCacheDiskData,
+ * see GetCachedNetData() for detail.
+ */
+NS_IMETHODIMP
+nsNetDiskCache::Contains(const char* key, PRUint32 length, PRBool *_retval) 
+{
+  *_retval = PR_FALSE ;
+
+  NS_ASSERTION(m_DB, "no db.") ;
+
+  PRInt32 id = 0 ;
+  m_DB->GetID(key, length, &id) ;
+  // FUR - Check for GetID failure ?
+
+  void* info = 0 ;
+  PRUint32 info_size = 0 ;
+
+  nsresult rv = m_DB->Get(id, &info, &info_size) ;
+  if(NS_SUCCEEDED(rv) && info) 
+    *_retval = PR_TRUE ;
+        
+  return NS_OK ;
+}
+
+/* regardless if it's cached or not, a copy of nsNetDiskCache would 
+ * always be returned. so release it appropriately. 
+ * if mem alloced, updata m_NumEntries also.
+ * for now, the new nsCachedNetData is not written into db yet since
+ * we have nothing to write.
+ */
+NS_IMETHODIMP
+nsNetDiskCache::GetCachedNetData(const char* key, PRUint32 length, nsINetDataCacheRecord **_retval) 
+{
+  NS_ASSERTION(m_DB, "no db.") ;
+
+  nsresult rv = 0 ;
+  if (!_retval)
+    return NS_ERROR_NULL_POINTER ;
+
+  *_retval = nsnull ;
+
+  PRInt32 id = 0 ;
+  m_DB->GetID(key, length, &id) ;
+  // FUR - Check for GetID failure ?
+
+  // construct an empty record
+  nsDiskCacheRecord* newRecord = new nsDiskCacheRecord(m_DB, this) ;
+  if(!newRecord) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  rv = newRecord->Init(key, length) ;
+  if(NS_FAILED(rv)) {
+    delete newRecord ;
+    return rv ;
+  }
+
+  NS_ADDREF(newRecord) ; // addref for _retval 
+  *_retval = (nsINetDataCacheRecord*) newRecord ;
+  
+  void* info = 0 ;
+  PRUint32 info_size = 0 ;
+
+  rv = m_DB->Get(id, &info, &info_size) ;
+  if(NS_SUCCEEDED(rv) && info) {
+
+    nsresult r1 ;
+    r1 = newRecord->RetrieveInfo(info, info_size) ;
+
+    // FUR!! need to release and return error if RetrieveInfo() fails
+    if(NS_SUCCEEDED(rv)) 
+      return NS_OK ;
+    else 
+      return r1;
+    
+  } else if (NS_SUCCEEDED(rv) && !info) {
+    // this is a new record. 
+    m_NumEntries ++ ;
+    return NS_OK ;
+  } else 
+    return rv ;
+}
+
+/* get an nsICachedNetData, mem needs to be de-alloced if not found. */
+NS_IMETHODIMP
+nsNetDiskCache::GetCachedNetDataByID(PRInt32 RecordID, nsINetDataCacheRecord **_retval) 
+{
+  NS_ASSERTION(m_DB, "no db.") ;
+
+  if (!_retval)
+    return NS_ERROR_NULL_POINTER ;
+
+  *_retval = nsnull ;
+  
+  nsresult rv ;
+
+  void* info = 0 ;
+  PRUint32 info_size = 0 ;
+
+  rv = m_DB->Get(RecordID, &info, &info_size) ;
+  if(NS_SUCCEEDED(rv) && info) {
+
+    // construct an empty record if only found in db
+    nsDiskCacheRecord* newRecord = new nsDiskCacheRecord(m_DB, this) ;
+    if(!newRecord) 
+      return NS_ERROR_OUT_OF_MEMORY ;
+
+    NS_ADDREF(newRecord) ; // addref for _retval
+    rv = newRecord->RetrieveInfo(info, info_size) ;
+
+    if(NS_SUCCEEDED(rv)) {
+      *_retval = (nsINetDataCacheRecord*) newRecord ;
+      return NS_OK ;
+    } 
+    else {
+      // bad record, I guess
+      NS_RELEASE(newRecord) ; // release if bad things happen
+      return rv ;
+    }
+  } else {
+    NS_ERROR("Error: RecordID not in DB\n") ;
+    return rv ;
+  }
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::GetEnabled(PRBool *aEnabled) 
+{
+  *aEnabled = m_Enabled ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::SetEnabled(PRBool aEnabled) 
+{
+  m_Enabled = aEnabled ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::GetFlags(PRUint32 *aFlags) 
+{
+  *aFlags = FILE_PER_URL_CACHE;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::GetNumEntries(PRUint32 *aNumEntries) 
+{
+  *aNumEntries = m_NumEntries ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::GetMaxEntries(PRUint32 *aMaxEntries)
+{
+  *aMaxEntries = m_MaxEntries ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::NewCacheEntryIterator(nsISimpleEnumerator **_retval) 
+{
+  if(!_retval)
+    return NS_ERROR_NULL_POINTER ;
+
+  *_retval = nsnull ;
+
+  nsISimpleEnumerator* enumerator = new nsDBEnumerator(m_DB, this) ;
+  if(enumerator) {
+    NS_ADDREF(enumerator) ;
+    *_retval = enumerator ;
+    return NS_OK ;
+  }
+  else 
+    return NS_ERROR_OUT_OF_MEMORY ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::GetNextCache(nsINetDataCache * *aNextCache)
+{
+  if(!aNextCache)
+    return NS_ERROR_NULL_POINTER ;
+
+  *aNextCache = m_pNextCache ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::SetNextCache(nsINetDataCache *aNextCache)
+{
+  m_pNextCache = aNextCache ;
+  return NS_OK ;
+}
+
+// db size can always be measured at the last minute. Since it's hard
+// to know before hand. 
+NS_IMETHODIMP
+nsNetDiskCache::GetStorageInUse(PRUint32 *aStorageInUse)
+{
+  PRUint32 total_size = m_StorageInUse, len = 0 ;
+
+  // FUR!!
+  // GetStorageInUse() can be called hundreds of times per second, i.e. every
+  // time a buffer of data is written to the cache, so we can't afford to stat
+  // the db file on every call.  I would suggest caching the size of the db and
+  // invalidating that cached value every time a record is written to the db,
+  // or even every ten written records.
+
+  // add the size of the db.
+  //  m_DBFile->GetFileSize(&len) ;
+  //  total_size += len ;
+
+  // we need size in kB
+  total_size = total_size >> 10 ;
+
+  *aStorageInUse = total_size ;
+  return NS_OK ;
+}
+
+/*
+ * The whole cache dirs can be whiped clean since all the cache 
+ * files are resides in seperate hashed dirs. It's safe to do so.
+ */
+ 
+NS_IMETHODIMP
+nsNetDiskCache::RemoveAll(void)
+{
+  nsresult rv = RemoveDirs(0) ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  // don't forget the db file itself
+  m_DB->Shutdown() ;
+  nsFileSpec dbfile ;
+  m_DBFile->GetFileSpec(&dbfile) ;
+  dbfile.Delete(PR_TRUE) ;
+
+  // reinitilize
+  rv = InitDB() ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  rv = UpdateInfo() ;
+  return rv ;
+}
+
+//////////////////////////////////////////////////////////////////
+// nsINetDataDiskCache methods
+
+NS_IMETHODIMP
+nsNetDiskCache::GetDiskCacheFolder(nsIFileSpec * *aDiskCacheFolder)
+{
+  *aDiskCacheFolder = m_pDiskCacheFolder ;
+  NS_ADDREF(*aDiskCacheFolder) ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::SetDiskCacheFolder(nsIFileSpec * aDiskCacheFolder)
+{
+  char *newfolder, *oldfolder ;
+  m_pDiskCacheFolder->GetNativePath(&oldfolder) ;
+  aDiskCacheFolder->GetNativePath(&newfolder) ;
+
+  if(PL_strcmp(newfolder, oldfolder) == 0) {
+    m_pDiskCacheFolder = aDiskCacheFolder ;
+
+    // should we do this? 
+    // FUR - no
+    nsresult rv = RemoveAll() ;
+    return rv ;
+  }
+  else 
+    // FUR
+    // Need to blow away old cache, build new one
+    return NS_OK ;
+}
+
+//////////////////////////////////////////////////////////////////
+// nsNetDiskCache methods
+
+// create a directory (recursively)
+NS_IMETHODIMP
+nsNetDiskCache::CreateDir(nsIFileSpec* dir_spec) 
+{
+  PRBool does_exist ;
+  nsCOMPtr<nsIFileSpec> p_spec ;
+
+  dir_spec->Exists(&does_exist) ;
+  if(does_exist) 
+    return NS_OK ;
+
+  dir_spec->GetParent(getter_AddRefs(p_spec)) ;
+  // FUR - check return value
+  p_spec->Exists(&does_exist) ;
+  if(!does_exist) {
+    CreateDir(p_spec) ;
+    dir_spec->CreateDir() ;
+    // FUR - check return value
+  }
+  else {
+    dir_spec->CreateDir() ;
+    // FUR - check return value
+  }
+  
+  return NS_OK ;
+}
+
+// FUR!!
+// We can't afford to make a *separate* pass over the whole db on every
+// startup, just to figure out m_NumEntries and m_StorageInUse.  (This is a
+// several second operation on a large db).  We'll likely need to store
+// distinguished keys in the db that contain these values and update them
+// incrementally, except when failure to shut down the db cleanly is detected.
+
+// this will walk through db and update m_NumEntries and m_StorageInUse
+NS_IMETHODIMP
+nsNetDiskCache::UpdateInfo(void)
+{
+  // count num of entries in db
+//  NS_ADDREF(this) ; // addref before assign to a nsCOMPtr. 
+  nsISimpleEnumerator* dbEnumerator = new nsDBEnumerator(m_DB, this) ;
+  if(dbEnumerator)
+    NS_ADDREF(dbEnumerator) ;
+  else
+    return NS_ERROR_FAILURE ;
+
+  PRUint32 numEntries = 0, storageInUse = 0, len = 0 ;
+  PRBool more = PR_FALSE ;
+
+  do {
+    dbEnumerator->HasMoreElements(&more) ;
+    if(more) {
+      // update entry number
+      numEntries++ ;
+
+      // update storage in use
+      nsINetDataCacheRecord* record ;
+      dbEnumerator->GetNext((nsISupports**)&record) ;
+      record->GetStoredContentLength(&len) ;
+      storageInUse += len ;
+      NS_IF_RELEASE(record) ;
+    }
+  } while (more) ;
+
+  NS_IF_RELEASE(dbEnumerator) ;
+
+  m_NumEntries = numEntries ;
+  m_StorageInUse = storageInUse ;
+
+  printf(" m_NumEntries = %d, size is %d.\n", m_NumEntries, m_StorageInUse) ;
+
+  return NS_OK ;
+}
+
+// this routine will add m_BaseDirNum to current CacheSubDir names. 
+// e.g. 00->20, 1f->5f. and update the m_BaseDirNum to another 32. 
+// the idea is as long as we remember the base number,
+// we know how many dirs needs to be removed during shutdown period
+// it will be from 0x20 to m_BaseDirNum. 
+// also, we assume that this operation will not be performed 3 times more
+// within a single session. it is part of scavenging routine. 
+
+NS_IMETHODIMP
+nsNetDiskCache::RenameCacheSubDirs(void) 
+{
+  nsCOMPtr<nsIFileSpec> cacheSubDir;
+  nsresult rv = NS_NewFileSpec(getter_AddRefs(cacheSubDir)) ;
+
+  for (int i=0; i < 32; i++) {
+    rv = cacheSubDir->FromFileSpec(m_pDiskCacheFolder) ;
+    if(NS_FAILED(rv))
+      return rv ;
+
+    char dirName[3];
+    PR_snprintf(dirName, 3, "%0.2x", i) ;
+    cacheSubDir->AppendRelativeUnixPath(dirName) ;
+
+    // re-name the directory
+    PR_snprintf(dirName, 3, "%0.2x", i+m_BaseDirNum) ;
+    rv = cacheSubDir->Rename(dirName) ;
+    if(NS_FAILED(rv))
+      return NS_ERROR_FAILURE ;
+  }
+
+  // update m_BaseDirNum 
+  m_BaseDirNum += 32 ;
+
+  return NS_OK ;
+}
+
+// this routine will be called everytime we have a db corruption. 
+NS_IMETHODIMP
+nsNetDiskCache::DBRecovery(void)
+{
+  nsresult rv = RenameCacheSubDirs() ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  // remove corrupted db file
+  rv = m_DB->Shutdown() ;
+  
+  // FUR!!
+  // You shouldn't return if this fails.  Otherwise, it might prevent db deletion
+  if(NS_FAILED(rv))
+    return rv ;
+
+  nsFileSpec dbfile ;
+  m_DBFile->GetFileSpec(&dbfile) ;
+  dbfile.Delete(PR_TRUE) ;
+
+  // make sure it's not there any more
+  PRBool exists = dbfile.Exists() ;
+  if(exists) {
+    NS_ERROR("can't remove old db.") ;
+    return NS_ERROR_FAILURE ;
+  }
+
+  // reinitilize
+  rv = InitDB() ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  rv = UpdateInfo() ;
+  return rv ;
+}
+
+// this routine is used by dtor and RemoveAll() to clean up dirs.
+// All directory named from aNum - m_BasedDirNum will be deleted. 
+NS_IMETHODIMP
+nsNetDiskCache::RemoveDirs(PRUint32 aNum)
+{
+  nsCOMPtr<nsIFileSpec> cacheSubDir;
+  nsresult rv = NS_NewFileSpec(getter_AddRefs(cacheSubDir));
+  if(NS_FAILED(rv))
+    return NS_ERROR_FAILURE ;
+
+  for (int i=aNum; i < m_BaseDirNum; i++) {
+    cacheSubDir->FromFileSpec(m_pDiskCacheFolder) ;
+
+    char dirName[3];
+    PR_snprintf (dirName, 3, "%0.2x", i);
+    cacheSubDir->AppendRelativeUnixPath (dirName) ;
+
+    nsFileSpec subdir ;
+    cacheSubDir->GetFileSpec(&subdir) ;
+
+    for(nsDirectoryIterator di(subdir, PR_FALSE); di.Exists(); di++) {
+      di.Spec().Delete(PR_TRUE) ;
+    }
+
+    subdir.Delete(PR_FALSE) ; // recursive delete
+  }
+
+  return NS_OK ;
+}

mozilla/netwerk/cache/filecache/nsNetDiskCache.h

@@ -0,0 +1,82 @@
+/*
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+// FUR - Add overall description comment here
+
+#ifndef __gen_nsNetDiskCache_h__
+#define __gen_nsNetDiskCache_h__
+
+#include "nsINetDataDiskCache.h"
+#include "nsNetDiskCacheCID.h"
+#include "nsCOMPtr.h"
+#include "nsIPref.h"
+#include "nsDBAccessor.h"
+
+class nsIURI; /* forward decl */
+class nsICachedNetData; /* forward decl */
+class nsISimpleEnumerator; /* forward decl */
+class nsIFileSpec; /* forward decl */
+
+/* starting interface:    nsNetDiskCache */
+
+class nsNetDiskCache : public nsINetDataDiskCache {
+  public: 
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSINETDATACACHE
+  NS_DECL_NSINETDATADISKCACHE
+
+  NS_IMETHOD Init(void) ;
+
+  nsNetDiskCache() ;
+  virtual ~nsNetDiskCache() ;
+
+  protected:
+
+  NS_IMETHOD InitDB(void) ;
+  NS_IMETHOD CreateDir(nsIFileSpec* dir_spec) ;
+  NS_IMETHOD UpdateInfo(void) ;
+
+  NS_IMETHOD RenameCacheSubDirs(void) ;
+  NS_IMETHOD DBRecovery(void) ;
+  NS_IMETHOD RemoveDirs(PRUint32 aNum) ;
+
+  private:
+
+  PRBool 			                m_Enabled ;
+  PRUint32 			                m_NumEntries ;
+  nsCOMPtr<nsINetDataCache> 	    m_pNextCache ;
+  nsCOMPtr<nsIFileSpec>   	        m_pDiskCacheFolder ;
+  nsCOMPtr<nsIFileSpec>             m_DBFile ;
+
+  PRUint32                          m_MaxEntries ;
+  PRUint32                          m_StorageInUse ;
+  nsIDBAccessor*                    m_DB ;
+
+  // this is used to indicate a db corruption
+  PRInt32                           m_BaseDirNum ;
+
+  friend class nsDiskCacheRecord ;
+  friend class nsDiskCacheRecordChannel ;
+} ;
+
+#endif /* __gen_nsNetDiskCache_h__ */

mozilla/netwerk/cache/filecache/nsNetDiskCacheCID.h

@@ -0,0 +1,32 @@
+/*
+ * 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 Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#ifndef _nsNetDiskCacheCID_h_
+#define _nsNetDiskCacheCID_h_
+
+#define NS_NETDISKCACHE_CID_STR "ECFEEA00-7201-11d3-87FE-000629D01344"
+
+#define NS_NETDISKCACHE_CID \
+{ 0xecfeea00, 0x7201, 0x11d3, \
+ { 0x87, 0xfe, 0x0, 0x6, 0x29, 0xd0, 0x13, 0x44 }}
+
+#endif /* _nsNetDiskCacheCID_h_ */

mozilla/netwerk/cache/filecache/test/Makefile.in

@@ -0,0 +1,50 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+REQUIRES	= libreg xpcom
+
+CPPSRCS		= \
+         diskcache.cpp \
+		$(NULL)
+
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
+
+ifdef NO_LD_ARCHIVE_FLAGS
+LOST_SYM_LIBS	= -lxpcomds_s -lxptinfo -lmozreg_s
+endif
+
+LIBS		= \
+		-lmozjs \
+		-lxpcom \
+        -lmozdbm_s \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(LOST_SYM_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+LOCAL_INCLUDES = -I$(srcdir)/..
+
+DEFINES		+= -DUSE_NSREG -DCACHE

mozilla/netwerk/cache/filecache/test/diskcache.cpp

@@ -0,0 +1,836 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsIStreamListener.h"
+#include "nsIStreamObserver.h"
+#include "nsIServiceManager.h"
+#include "nsIInputStream.h"
+#include "nsIOutputStream.h"
+#include "nsIEventQueue.h"
+#include "nsIEventQueueService.h"
+#include "nsIChannel.h"
+#include "nsCOMPtr.h"
+#include "nsString.h"
+#include <stdio.h>
+#include <unistd.h>
+
+#include "nsINetDataCache.h"
+#include "nsINetDataCacheRecord.h"
+//#include "nsMemCacheCID.h"
+#include "nsNetDiskCache.h"
+#include "nsIPref.h"
+#include "prenv.h"
+#include "nsIFileStream.h"
+
+// Number of test entries to be placed in the cache
+#define NUM_CACHE_ENTRIES  250
+
+// Cache content stream length will have random length between zero and
+// MAX_CONTENT_LENGTH bytes
+#define MAX_CONTENT_LENGTH 20000
+
+// Length of random-data cache entry key
+#define CACHE_KEY_LENGTH 15
+
+// Length of random-data cache entry meta-data
+#define CACHE_METADATA_LENGTH 100
+
+//static NS_DEFINE_CID(kMemCacheCID, NS_MEM_CACHE_FACTORY_CID);
+static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+static NS_DEFINE_CID(kDiskCacheCID, NS_NETDISKCACHE_CID) ;
+static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
+static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID);
+
+// Mapping from test case number to RecordID
+static PRInt32 recordID[NUM_CACHE_ENTRIES];
+
+static PRInt32
+mapRecordIdToTestNum(PRInt32 aRecordID)
+{
+    int i;
+    for (i = 0; i < NUM_CACHE_ENTRIES; i++) {
+        if (recordID[i] == aRecordID)
+            return i;
+    }
+    return -1;
+}
+
+// A supply of stream data to either store or compare with
+class nsITestDataStream {
+public:
+    virtual ~nsITestDataStream() {};
+    virtual PRUint32 Next() = 0;
+    virtual void Read(char* aBuf, PRUint32 aCount) = 0;
+
+    virtual PRBool Match(char* aBuf, PRUint32 aCount) = 0;
+    virtual void Skip(PRUint32 aCount) = 0;
+};
+
+// A reproducible stream of random data.
+class RandomStream : public nsITestDataStream {
+public:
+    RandomStream(PRUint32 aSeed) {
+        mStartSeed = mState = aSeed;
+    }
+    
+    PRUint32 GetStartSeed() {
+        return mStartSeed;
+    }
+    
+    PRUint32 Next() {
+        mState = 1103515245 * mState + 12345;
+        return mState;
+    }
+
+    void Read(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            *aBuf++ = Next();
+        }
+    }
+
+    PRBool
+    Match(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            if (*aBuf++ != (char)(Next() & 0xff))
+                return PR_FALSE;
+        }
+        return PR_TRUE;
+    }
+
+    void
+    Skip(PRUint32 aCount) {
+        while (aCount--)
+            Next();
+    }
+
+protected:
+    
+    PRUint32 mState;
+    PRUint32 mStartSeed;
+};
+
+// A stream of data that increments on each byte that is read, modulo 256
+class CounterStream : public nsITestDataStream {
+public:
+    CounterStream(PRUint32 aSeed) {
+        mStartSeed = mState = aSeed;
+    }
+    
+    PRUint32 GetStartSeed() {
+        return mStartSeed;
+    }
+    
+    PRUint32 Next() {
+        mState += 1;
+        mState &= 0xff;
+        return mState;
+    }
+
+    void Read(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            *aBuf++ = Next();
+        }
+    }
+
+    PRBool
+    Match(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            if (*aBuf++ != (char)Next())
+                return PR_FALSE;
+        }
+        return PR_TRUE;
+    }
+
+    void
+    Skip(PRUint32 aCount) {
+        mState += aCount;
+        mState &= 0xff;
+    }
+
+protected:
+    
+    PRUint32 mState;
+    PRUint32 mStartSeed;
+};
+
+static int gNumReaders = 0;
+static PRUint32 gTotalBytesRead = 0;
+static PRUint32 gTotalDuration = 0;
+
+class nsReader : public nsIStreamListener {
+public:
+    NS_DECL_ISUPPORTS
+
+    nsReader()
+        : mStartTime(0), mBytesRead(0)
+    {
+        NS_INIT_REFCNT();
+        gNumReaders++;
+    }
+
+    virtual ~nsReader() {
+        delete mTestDataStream;
+        gNumReaders--;
+    }
+
+    nsresult 
+    Init(nsIChannel *aChannel, nsITestDataStream* aRandomStream, PRUint32 aExpectedStreamLength) {
+        mChannel = aChannel;
+        mTestDataStream = aRandomStream;
+        mExpectedStreamLength = aExpectedStreamLength;
+        mRefCnt = 1;
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnStartRequest(nsIChannel* channel,
+                              nsISupports* context) {
+        mStartTime = PR_IntervalNow();
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnDataAvailable(nsIChannel* channel, 
+                               nsISupports* context,
+                               nsIInputStream *aIStream, 
+                               PRUint32 aSourceOffset,
+                               PRUint32 aLength) {
+        char buf[1025];
+        while (aLength > 0) {
+            PRUint32 amt;
+            PRBool match;
+            aIStream->Read(buf, sizeof buf, &amt);
+            if (amt == 0) break;
+            aLength -= amt;
+            mBytesRead += amt;
+            match = mTestDataStream->Match(buf, amt);
+            NS_ASSERTION(match, "Stored data was corrupted on read");
+        }
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnStopRequest(nsIChannel* channel, 
+                             nsISupports* context,
+                             nsresult aStatus,
+                             const PRUnichar* aMsg) {
+        PRIntervalTime endTime;
+        PRIntervalTime duration;
+        
+        endTime = PR_IntervalNow();
+        duration = (endTime - mStartTime);
+
+        if (NS_FAILED(aStatus)) printf("channel failed.\n");
+        //        printf("read %d bytes\n", mBytesRead);
+
+        NS_ASSERTION(mBytesRead == mExpectedStreamLength,
+                     "Stream in cache is wrong length");
+
+        gTotalBytesRead += mBytesRead;
+        gTotalDuration += duration;
+
+        // Release channel
+        mChannel = 0;
+        return NS_OK;
+    }
+
+protected:
+    PRIntervalTime       mStartTime;
+    PRUint32             mBytesRead;
+    nsITestDataStream*   mTestDataStream;
+    PRUint32             mExpectedStreamLength;
+    nsCOMPtr<nsIChannel> mChannel;
+};
+
+NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIStreamObserver)
+
+static nsIEventQueue* eventQueue;
+
+nsresult
+InitQueue() {
+    nsresult rv;
+
+    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service");
+
+    rv = eventQService->CreateThreadEventQueue();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create event queue");
+  
+    rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQueue);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread");
+
+    return NS_OK;
+}
+
+// Process events until all streams are OnStopRequest'ed
+nsresult
+WaitForEvents() {
+    while (gNumReaders) {
+        eventQueue->ProcessPendingEvents();
+    }
+    return NS_OK;
+}
+
+// Read data for a single cache record and compare against testDataStream
+nsresult
+TestReadStream(nsINetDataCacheRecord *record, nsITestDataStream *testDataStream,
+               PRUint32 expectedStreamLength)
+{
+    nsCOMPtr<nsIChannel> channel;
+    nsresult rv;
+    PRUint32 actualContentLength;
+
+    rv = record->NewChannel(0, getter_AddRefs(channel));
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+    rv = record->GetStoredContentLength(&actualContentLength);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    NS_ASSERTION(actualContentLength == expectedStreamLength,
+                 "nsINetDataCacheRecord::GetContentLength() busted ?");
+    
+    nsReader *reader = new nsReader;
+    reader->AddRef();
+    rv = reader->Init(channel, testDataStream, expectedStreamLength);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    
+    rv = channel->AsyncRead(0, -1, 0, reader);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    reader->Release();
+
+    return NS_OK;
+}
+
+// Check that records can be retrieved using their record-ID, in addition
+// to using the opaque key.
+nsresult
+TestRecordID(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    RandomStream *randomStream;
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char *metaData;
+    PRUint32 testNum;
+    PRBool match;
+
+    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        rv = cache->GetCachedNetDataByID(recordID[testNum], getter_AddRefs(record));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't obtain record using record ID");
+
+        // Match against previously stored meta-data
+        rv = record->GetMetaData(&metaDataLength, &metaData);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get record meta-data");
+        match = randomStream->Match(metaData, metaDataLength);
+        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
+
+        nsAllocator::Free(metaData);
+        delete randomStream;
+    }
+    return NS_OK;
+}
+
+// Check that all cache entries in the database are enumerated and that
+// no duplicates appear.
+nsresult
+TestEnumeration(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsCOMPtr<nsISupports> tempISupports;
+    nsCOMPtr<nsISimpleEnumerator> iterator;
+    RandomStream *randomStream;
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char *metaData;
+    PRUint32 testNum;
+    PRBool match;
+    PRInt32 recID;
+
+    int numRecords = 0;
+
+    // Iterate over all records in the cache
+    rv = cache->NewCacheEntryIterator(getter_AddRefs(iterator));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create new cache entry iterator");
+
+    PRBool notDone;
+    while (1) {
+
+        // Done iterating ?
+        rv = iterator->HasMoreElements(&notDone);
+        if (NS_FAILED(rv)) return rv;
+        if (!notDone)
+            break;
+
+        // Get next record in iteration
+        rv = iterator->GetNext(getter_AddRefs(tempISupports));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "iterator bustage");
+        record = do_QueryInterface(tempISupports);
+
+        numRecords++;
+
+        // Get record ID
+        rv = record->GetRecordID(&recID);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get Record ID");
+        testNum = mapRecordIdToTestNum(recID);
+        NS_ASSERTION(testNum != -1, "Corrupted Record ID ?");
+
+        // Erase mapping from table, so that duplicate enumerations are detected
+        recordID[testNum] = -1;
+
+        // Make sure stream matches test data
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        // Match against previously stored meta-data
+        rv = record->GetMetaData(&metaDataLength, &metaData);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get record meta-data");
+        match = randomStream->Match(metaData, metaDataLength);
+        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
+        nsAllocator::Free(metaData);
+
+        delete randomStream;
+    }
+
+    NS_ASSERTION(numRecords == NUM_CACHE_ENTRIES, "Iteration bug");
+
+    return NS_OK;
+}
+
+// Read the test data that was written in FillCache(), checking for
+// corruption, truncation.
+nsresult
+TestRead(nsINetDataCache *cache)
+{
+    nsresult rv;
+    PRBool inCache;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    RandomStream *randomStream;
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char *metaData, *storedCacheKey;
+    PRUint32 testNum, storedCacheKeyLength;
+    PRBool match;
+
+    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        // Ensure that entry is in the cache
+        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(inCache, "nsINetDataCache::Contains error");
+        
+        rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        // Match against previously stored meta-data
+        match = record->GetMetaData(&metaDataLength, &metaData);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        match = randomStream->Match(metaData, metaDataLength);
+        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
+        nsAllocator::Free(metaData);
+
+        // Test GetKey() method
+        rv = record->GetKey(&storedCacheKeyLength, &storedCacheKey);
+        NS_ASSERTION(NS_SUCCEEDED(rv) &&
+                     (storedCacheKeyLength == sizeof cacheKey) &&
+                     !memcmp(storedCacheKey, &cacheKey[0], sizeof cacheKey),
+                     "nsINetDataCacheRecord::GetKey failed");
+        nsAllocator::Free(storedCacheKey);
+
+        PRUint32 expectedStreamLength = randomStream->Next() & 0xffff;
+
+        TestReadStream(record, randomStream, expectedStreamLength);
+    }
+
+    WaitForEvents();
+
+    // Compute rate in MB/s
+    double rate = gTotalBytesRead / PR_IntervalToMilliseconds(gTotalDuration);
+    rate *= NUM_CACHE_ENTRIES;
+    rate *= 1000;
+    rate /= (1024 * 1024);
+    printf("Read %d bytes at a rate of %5.1f MB per second \n",
+           gTotalBytesRead, rate);
+
+    return NS_OK;
+}
+
+// Repeatedly call SetStoredContentLength() on a cache entry and make
+// read the stream's data to ensure that it's not corrupted by the effect
+nsresult
+TestTruncation(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    RandomStream *randomStream;
+    char cacheKey[CACHE_KEY_LENGTH];
+
+    randomStream = new RandomStream(0);
+    randomStream->Read(cacheKey, sizeof cacheKey);
+
+    rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+    randomStream->Skip(CACHE_METADATA_LENGTH);
+    PRUint32 initialStreamLength = randomStream->Next() & 0xffff;
+    delete randomStream;
+
+    PRUint32 i;
+    PRUint32 delta = initialStreamLength / 64;
+    for (i = initialStreamLength; i >= delta; i -= delta) {
+        PRUint32 expectedStreamLength = i;
+
+        // Do the truncation
+        record->SetStoredContentLength(expectedStreamLength);
+        randomStream = new RandomStream(0);
+        randomStream->Skip(CACHE_KEY_LENGTH + CACHE_METADATA_LENGTH + 1);
+
+        TestReadStream(record, randomStream, expectedStreamLength);
+        WaitForEvents();
+    }
+
+    return NS_OK;
+}
+
+// Write known data to random offsets in a single cache entry and test
+// resulting stream for correctness.
+nsresult
+TestOffsetWrites(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsCOMPtr<nsIChannel> channel;
+    nsCOMPtr<nsIOutputStream> outStream;
+    char buf[512];
+    char cacheKey[CACHE_KEY_LENGTH];
+    RandomStream *randomStream;
+
+    randomStream = new RandomStream(0);
+    randomStream->Read(cacheKey, sizeof cacheKey);
+
+    rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access record via opaque cache key");
+
+
+    nsCOMPtr<nsIFileSpec> file ;
+    record->GetFilename(getter_AddRefs(file)) ;
+    char* name ;
+    file->GetUnixStyleFilePath(&name) ;
+    printf(" file name is %s \n", name) ;
+
+    // Write buffer-fulls of data at random offsets into the cache entry.
+    // Data written is (offset % 0xff)
+    PRUint32 startingOffset;
+    PRUint32 streamLength = 0;
+    PRUint32 len = 0 ;
+    CounterStream *counterStream;
+
+    int i = 0;
+    for (i = 0; i < 257; i++) {
+        rv = record->NewChannel(0, getter_AddRefs(channel));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        startingOffset = streamLength ? streamLength - (randomStream->Next() % sizeof buf): 0;
+        rv = channel->OpenOutputStream(startingOffset, getter_AddRefs(outStream));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        
+        truncate(name, startingOffset) ;
+
+        counterStream = new CounterStream(startingOffset);
+        counterStream->Read(buf, sizeof buf);
+
+      nsresult status ;
+      nsCOMPtr<nsIRandomAccessStore> ras = do_QueryInterface(outStream, &status);
+      if (NS_FAILED(status)) {
+      //        mState = END_WRITE;
+        return NS_ERROR_FAILURE;
+      }
+      PRIntn offset ;
+      ras->Tell(&offset) ;
+//      printf(" offset is %d \n", offset) ;
+
+        PRUint32 numWritten;
+        rv = outStream->Write(buf, sizeof buf, &numWritten);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(numWritten == sizeof buf, "Write() bug?");
+        streamLength = startingOffset + sizeof buf;
+
+        rv = outStream->Close();
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't close channel");
+        delete counterStream;
+
+        record->GetStoredContentLength(&len) ;
+        if(len != streamLength) 
+          printf(" offset = %d is wrong, filesize = %d\n", startingOffset, len) ;
+
+    }
+
+        /*
+        rv = record->NewChannel(0, getter_AddRefs(channel));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        startingOffset = 208;
+        rv = channel->OpenOutputStream(startingOffset, getter_AddRefs(outStream));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        
+        counterStream = new CounterStream(startingOffset);
+        counterStream->Read(buf, sizeof buf);
+
+      nsresult status ;
+      nsCOMPtr<nsIRandomAccessStore> ras = do_QueryInterface(outStream, &status);
+      if (NS_FAILED(status)) {
+      //        mState = END_WRITE;
+        return NS_ERROR_FAILURE;
+      }
+      PRIntn offset = 0 ;
+      ras->Tell(&offset) ;
+      printf(" offset is %d \n", offset) ;
+
+        PRUint32 numWritten;
+        rv = outStream->Write(buf, sizeof buf, &numWritten);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(numWritten == sizeof buf, "Write() bug?");
+        streamLength = startingOffset + sizeof buf;
+
+        rv = outStream->Close();
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't close channel");
+        delete counterStream;
+
+        record->GetStoredContentLength(&len) ;
+        if(len != streamLength) 
+          printf(" offset = %d is wrong, filesize = %d\n", startingOffset, len) ;
+          */
+    
+    delete randomStream;
+
+    counterStream = new CounterStream(0);
+    TestReadStream(record, counterStream, streamLength);
+    WaitForEvents();
+
+    return NS_OK;
+}
+
+// Create entries in the network data cache, using random data for the
+// key, the meta-data and the stored content data.
+nsresult
+FillCache(nsINetDataCache *cache)
+{
+    nsresult rv;
+    PRBool inCache;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsCOMPtr<nsIChannel> channel;
+    nsCOMPtr<nsIOutputStream> outStream;
+    char buf[1000];
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char metaData[CACHE_METADATA_LENGTH];
+    PRUint32 testNum;
+    char *data;
+    RandomStream *randomStream;
+
+    PRIntervalTime startTime = PR_IntervalNow();
+    
+    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        // No entry should be in cache until we add it
+        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(!inCache, "nsINetDataCache::Contains error");
+        
+        rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access record via opaque cache key");
+
+        // Test nsINetDataCacheRecord::GetRecordID()
+        rv = record->GetRecordID(&recordID[testNum]);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get Record ID");
+
+        // Test nsINetDataCache::GetNumEntries()
+        PRUint32 numEntries = (PRUint32)-1;
+        rv = cache->GetNumEntries(&numEntries);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+        NS_ASSERTION(numEntries == testNum + 1, "GetNumEntries failure");
+
+        // Record meta-data should be initially empty
+        rv = record->GetMetaData(&metaDataLength, &data);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        if ((metaDataLength != 0) || (data != 0))
+            return NS_ERROR_FAILURE;
+
+        // Store random data as meta-data
+        randomStream->Read(metaData, sizeof metaData);
+        record->SetMetaData(sizeof metaData, metaData);
+
+        rv = record->NewChannel(0, getter_AddRefs(channel));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        rv = channel->OpenOutputStream(0, getter_AddRefs(outStream));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        
+        PRUint32 beforeOccupancy;
+        rv = cache->GetStorageInUse(&beforeOccupancy);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+
+        int streamLength = randomStream->Next() & 0xffff;
+        int remaining = streamLength;
+        while (remaining) {
+            PRUint32 numWritten;
+            int amount = PR_MIN(sizeof buf, remaining);
+            randomStream->Read(buf, amount);
+
+            rv = outStream->Write(buf, amount, &numWritten);
+            NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+            NS_ASSERTION(numWritten == (PRUint32)amount, "Write() bug?");
+            
+            remaining -= amount;
+        }
+        outStream->Close();
+
+        PRUint32 afterOccupancy;
+        rv = cache->GetStorageInUse(&afterOccupancy);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+        PRUint32 streamLengthInKB = streamLength >> 10;
+        NS_ASSERTION((afterOccupancy - beforeOccupancy) >= streamLengthInKB,
+                     "nsINetDataCache::GetStorageInUse() is busted");
+        
+
+        // *Now* there should be an entry in the cache
+        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(inCache, "nsINetDataCache::Contains error");
+
+        delete randomStream;
+    }
+
+    PRIntervalTime endTime = PR_IntervalNow();
+
+    return NS_OK;
+}
+
+nsresult NS_AutoregisterComponents()
+{
+  nsresult rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,
+                                                 NULL /* default */);
+  return rv;
+}
+
+PRBool initPref ()
+{
+  nsresult rv;
+  NS_WITH_SERVICE(nsIPref, prefPtr, kPrefCID, &rv);
+  if (NS_FAILED(rv))
+    return false;
+
+  nsCOMPtr<nsIFileSpec> fileSpec;
+  rv = NS_NewFileSpec (getter_AddRefs(fileSpec));
+  if (NS_FAILED(rv))
+    return false;
+
+  nsCString defaultPrefFile = PR_GetEnv ("MOZILLA_FIVE_HOME");
+  if (defaultPrefFile.Length())
+    defaultPrefFile += "/";
+  else
+    defaultPrefFile = "./";
+  defaultPrefFile += "default_prefs.js";
+
+  fileSpec->SetUnixStyleFilePath (defaultPrefFile.GetBuffer());
+
+  PRBool exists = false;
+  fileSpec->Exists(&exists);
+  if (exists)
+    prefPtr->ReadUserPrefsFrom(fileSpec);
+  else
+    return false;
+  return true;
+}
+
+int
+main(int argc, char* argv[])
+{
+    initPref() ;
+    nsresult rv;
+    nsCOMPtr<nsINetDataCache> cache;
+
+    rv = NS_AutoregisterComponents();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't register XPCOM components");
+
+    rv = nsComponentManager::CreateInstance(kDiskCacheCID, nsnull,
+                                            NS_GET_IID(nsINetDataCache),
+                                            getter_AddRefs(cache));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create memory cache factory");
+
+    InitQueue();
+
+    PRUnichar* description;
+    rv = cache->GetDescription(&description);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache description");
+    nsCAutoString descStr(description);
+    printf("Testing: %s\n", descStr.GetBuffer());
+
+    rv = cache->RemoveAll();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
+
+    PRUint32 startOccupancy;
+    rv = cache->GetStorageInUse(&startOccupancy);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+
+    PRUint32 numEntries = (PRUint32)-1;
+    rv = cache->GetNumEntries(&numEntries);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
+
+    rv = FillCache(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't fill cache with random test data");
+
+    rv = TestRead(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't read random test data from cache");
+
+    rv = TestRecordID(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't index records using record ID");
+
+    rv = TestEnumeration(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully enumerate records");
+
+    rv = TestTruncation(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully truncate records");
+
+    rv = TestOffsetWrites(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully write to records using non-zero offsets");
+
+    rv = cache->RemoveAll();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
+    rv = cache->GetNumEntries(&numEntries);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
+
+    PRUint32 endOccupancy;
+    rv = cache->GetStorageInUse(&endOccupancy);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+
+    NS_ASSERTION(startOccupancy == endOccupancy, "Cache occupancy not correctly computed ?");
+
+    return 0;
+}
+

mozilla/netwerk/cache/memcache/Makefile.in

@@ -0,0 +1,46 @@
+# Generated automatically from Makefile.in by configure.
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+VPATH       = @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = nkcache
+
+LIBRARY_NAME = nkmemcache_s
+
+REQUIRES	= nspr dbm 
+
+EXPORTS=nsMemCacheCID.h
+
+CPPSRCS		= \
+        nsMemCache.cpp \
+        nsMemCacheRecord.cpp \
+        nsMemCacheChannel.cpp \
+		$(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/netwerk/cache/memcache/makefile.win

@@ -0,0 +1,42 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..
+
+include <$(DEPTH)/config/config.mak>
+
+MODULE = nkcache
+
+LIBRARY_NAME = nkmemcache_s
+
+CPP_OBJS =                                \
+ 	.\$(OBJDIR)\nsMemCache.obj        \
+	.\$(OBJDIR)\nsMemCacheRecord.obj  \
+	.\$(OBJDIR)\nsMemCacheChannel.obj \
+	$(NULL)
+
+EXPORTS=nsMemCacheCID.h
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -rf $(OBJDIR)
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+

mozilla/netwerk/cache/memcache/nsMemCache.cpp

@@ -0,0 +1,334 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+/**
+ * nsMemCache is the implementation of an in-memory network-data
+ * cache, used to cache the responses to network retrieval commands.
+ * Each cache entry may contain both content, e.g. GIF image data, and
+ * associated metadata, e.g. HTTP headers.  Each entry is indexed by
+ * two different keys: a record id number and an opaque key, which is
+ * created by the cache manager by combining the URI with a "secondary
+ * key", e.g. HTTP post data.
+ */
+
+#include "nsMemCache.h"
+#include "nsMemCacheRecord.h"
+#include "nsIGenericFactory.h"
+#include "nsString.h"
+#include "nsHashtable.h"
+#include "nsHashtableEnumerator.h"
+#include "nsEnumeratorUtils.h"
+
+PRInt32 nsMemCache::gRecordSerialNumber = 0;
+
+nsMemCache::nsMemCache()
+    : mNumEntries(0), mOccupancy(0), mEnabled(PR_TRUE),
+      mHashTable(0)
+{
+    NS_INIT_REFCNT();
+}
+
+nsMemCache::~nsMemCache()
+{
+    nsresult rv;
+
+    rv = RemoveAll();
+    NS_ASSERTION(NS_SUCCEEDED(rv) && (mNumEntries == 0),
+                 "Failure to shut down memory cache. "
+                 "Somewhere, someone is holding references to at least one cache record");
+    delete mHashTable;
+}
+
+nsresult
+nsMemCache::Init()
+{
+    mHashTable = new nsHashtable(256);
+    if (!mHashTable)
+        return NS_ERROR_OUT_OF_MEMORY;
+    return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(nsMemCache, NS_GET_IID(nsINetDataCache))
+
+NS_IMETHODIMP
+nsMemCache::GetDescription(PRUnichar * *aDescription)
+{
+    nsAutoString description("Memory Cache");
+    *aDescription = description.ToNewUnicode();
+    if (!*aDescription)
+        return NS_ERROR_OUT_OF_MEMORY;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::Contains(const char *aKey, PRUint32 aKeyLength, PRBool *aFound)
+{
+    nsOpaqueKey *opaqueKey = new nsOpaqueKey(aKey, aKeyLength);
+    if (!opaqueKey)
+        return NS_ERROR_OUT_OF_MEMORY;
+    *aFound = mHashTable->Exists(opaqueKey);
+    delete opaqueKey;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetCachedNetData(const char *aKey, PRUint32 aKeyLength,
+                             nsINetDataCacheRecord* *aRecord)
+{
+    nsresult rv;
+    nsMemCacheRecord* record = 0;
+    nsOpaqueKey *opaqueKey2 = 0;
+    nsOpaqueKey *opaqueKey3 = 0;
+    nsOpaqueKey *opaqueKey;
+
+    opaqueKey = new nsOpaqueKey(aKey, aKeyLength);
+    if (!opaqueKey)
+        goto out_of_memory;
+    record = (nsMemCacheRecord*)mHashTable->Get(opaqueKey);
+    delete opaqueKey;
+
+    // No existing cache database entry was found.  Create a new one.
+    // This requires two mappings in the hash table:
+    //    Record ID  ==> record
+    //    Opaque key ==> record
+    if (!record) {
+        record = new nsMemCacheRecord;
+        if (!record)
+            goto out_of_memory;
+        rv = record->Init(aKey, aKeyLength, ++gRecordSerialNumber, this);
+        if (NS_FAILED(rv)) goto out_of_memory;
+
+        // Index the record by opaque key
+        opaqueKey2 = new nsOpaqueKey(record->mKey, record->mKeyLength);
+        if (!opaqueKey2) goto out_of_memory;
+        mHashTable->Put(opaqueKey2, record);
+        
+        // Index the record by it's record ID
+        char *recordIDbytes = NS_REINTERPRET_CAST(char *, &record->mRecordID);
+        opaqueKey3 = new nsOpaqueKey(recordIDbytes,
+                                     sizeof record->mRecordID);
+        if (!opaqueKey3) {
+            // Clean up the first record from the hash table
+            mHashTable->Remove(opaqueKey);
+            goto out_of_memory;
+        }
+        mHashTable->Put(opaqueKey3, record);
+        
+        // The hash table holds on to the record
+        record->AddRef();
+        
+        delete opaqueKey2;
+        delete opaqueKey3;
+        mNumEntries++;
+    }
+
+    record->AddRef();
+    *aRecord = record;
+    return NS_OK;
+
+ out_of_memory:
+    delete opaqueKey2;
+    delete opaqueKey3;
+    delete record;
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetCachedNetDataByID(PRInt32 RecordID,
+                                 nsINetDataCacheRecord* *aRecord)
+{
+    nsOpaqueKey opaqueKey(NS_REINTERPRET_CAST(const char *, &RecordID),
+                          sizeof RecordID);
+    *aRecord = (nsINetDataCacheRecord*)mHashTable->Get(&opaqueKey);
+    if (*aRecord) {
+        NS_ADDREF(*aRecord);
+        return NS_OK;
+    }
+    return NS_ERROR_FAILURE;
+}
+
+NS_METHOD
+nsMemCache::Delete(nsMemCacheRecord* aRecord)
+{
+    nsMemCacheRecord *removedRecord;
+
+    char *recordIDbytes = NS_REINTERPRET_CAST(char *, &aRecord->mRecordID);
+    nsOpaqueKey opaqueRecordIDKey(recordIDbytes,
+                                  sizeof aRecord->mRecordID);
+    removedRecord = (nsMemCacheRecord*)mHashTable->Remove(&opaqueRecordIDKey);
+    NS_ASSERTION(removedRecord == aRecord, "memory cache database inconsistent");
+
+    nsOpaqueKey opaqueKey(aRecord->mKey, aRecord->mKeyLength);
+    removedRecord = (nsMemCacheRecord*)mHashTable->Remove(&opaqueKey);
+    NS_ASSERTION(removedRecord == aRecord, "memory cache database inconsistent");
+
+    aRecord->Release();
+
+    mNumEntries--;
+    
+    return NS_OK;
+}
+    
+
+NS_IMETHODIMP
+nsMemCache::GetEnabled(PRBool *aEnabled)
+{
+    NS_ENSURE_ARG(aEnabled);
+    *aEnabled = mEnabled;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::SetEnabled(PRBool aEnabled)
+{
+    mEnabled = aEnabled;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetFlags(PRUint32 *aFlags)
+{
+    NS_ENSURE_ARG(aFlags);
+    *aFlags = MEMORY_CACHE;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetNumEntries(PRUint32 *aNumEntries)
+{
+    NS_ENSURE_ARG(aNumEntries);
+    *aNumEntries = mNumEntries;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetMaxEntries(PRUint32 *aMaxEntries)
+{
+    NS_ENSURE_ARG(aMaxEntries);
+    *aMaxEntries = MEM_CACHE_MAX_ENTRIES;
+    return NS_OK;
+}
+
+static NS_METHOD
+HashEntryConverter(nsHashKey *aKey, void *aValue,
+                   void *unused, nsISupports **retval)
+{
+    nsMemCacheRecord *record;
+    nsOpaqueKey *opaqueKey;
+
+    record = (nsMemCacheRecord*)aValue;
+    opaqueKey = (nsOpaqueKey*)aKey;
+
+    // Hash table keys that index cache entries by their record ID
+    // shouldn't be enumerated.
+    if ((opaqueKey->GetKeyLength() == sizeof(PRInt32))) {
+
+#ifdef DEBUG
+        PRInt32 recordID;
+        record->GetRecordID(&recordID);
+        NS_ASSERTION(*((PRInt32*)opaqueKey->GetKey()) == recordID,
+                     "Key has incorrect key length");
+#endif
+        return NS_ERROR_FAILURE;
+    }
+
+    NS_IF_ADDREF(record);
+    *retval = NS_STATIC_CAST(nsISupports*, record);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::NewCacheEntryIterator(nsISimpleEnumerator* *aIterator)
+{
+    nsCOMPtr<nsIEnumerator> iterator;
+
+    NS_ENSURE_ARG(aIterator);
+    NS_NewHashtableEnumerator(mHashTable, HashEntryConverter,
+                              mHashTable, getter_AddRefs(iterator));
+    return NS_NewAdapterEnumerator(aIterator, iterator);
+}
+
+NS_IMETHODIMP
+nsMemCache::GetNextCache(nsINetDataCache* *aNextCache)
+{
+    NS_ENSURE_ARG(aNextCache);
+    *aNextCache = mNextCache;
+    NS_ADDREF(*aNextCache);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::SetNextCache(nsINetDataCache* aNextCache)
+{
+    mNextCache = aNextCache;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetStorageInUse(PRUint32 *aStorageInUse)
+{
+    NS_ENSURE_ARG(aStorageInUse);
+
+    // Convert from bytes to KB
+    *aStorageInUse = (mOccupancy >> 10);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::RemoveAll(void)
+{
+    PRBool failed;
+
+    nsCOMPtr<nsISimpleEnumerator> iterator;
+    nsCOMPtr<nsISupports> recordSupports;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsresult rv;
+
+    failed = PR_FALSE;
+    rv = NewCacheEntryIterator(getter_AddRefs(iterator));
+    if (NS_FAILED(rv))
+        return rv;
+
+    PRBool notDone;
+    while (1) {
+        rv = iterator->HasMoreElements(&notDone);
+        if (NS_FAILED(rv)) return rv;
+        if (!notDone)
+            break;
+        
+        iterator->GetNext(getter_AddRefs(recordSupports));
+        record = do_QueryInterface(recordSupports);
+        recordSupports = 0;
+
+        PRUint32 bytesUsed;
+        record->GetStoredContentLength(&bytesUsed);
+        rv = record->Delete();
+        if (NS_FAILED(rv)) {
+            failed = PR_TRUE;
+            continue;
+        }
+        mOccupancy -= bytesUsed;
+    }
+
+    if (failed)
+        return NS_ERROR_FAILURE;
+    return NS_OK;
+}

mozilla/netwerk/cache/memcache/nsMemCache.h

@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+/**
+ * nsMemCache is the implementation of an in-memory network-data
+ * cache, used to cache the responses to network retrieval commands.
+ * Each cache entry may contain both content, e.g. GIF image data, and
+ * associated metadata, e.g. HTTP headers.  Each entry is indexed by
+ * two different keys: a record id number and an opaque key, which is
+ * created by the cache manager by combining the URI with a "secondary
+ * key", e.g. HTTP post data.
+ */
+
+#ifndef _nsMemCache_h_
+#define _nsMemCache_h_
+
+#include "nsINetDataCache.h"
+
+// Maximum number of URIs that may be resident in the cache
+#define MEM_CACHE_MAX_ENTRIES 1000
+
+#define MEM_CACHE_SEGMENT_SIZE       (1 << 12)
+#define MEM_CACHE_MAX_ENTRY_SIZE     (1 << 20)
+
+class nsHashtable;
+class nsMemCacheRecord;
+
+class nsMemCache : public nsINetDataCache
+{
+public:
+    nsMemCache();
+    virtual ~nsMemCache();
+    nsresult Init();
+
+    // nsISupports methods
+    NS_DECL_ISUPPORTS
+
+    // nsINetDataCache methods
+    NS_DECL_NSINETDATACACHE
+
+    // Factory
+    static NS_METHOD nsMemCacheConstructor(nsISupports *aOuter, REFNSIID aIID,
+                                           void **aResult);
+
+protected:
+
+    PRUint32         mNumEntries;
+    PRUint32         mOccupancy;   // Memory used, in bytes
+    PRBool           mEnabled;     // If false, bypass mem cache
+
+    nsINetDataCache* mNextCache;
+
+    // Mapping from either opaque key or record ID to nsMemCacheRecord
+    nsHashtable*     mHashTable;
+
+    // Used to assign record ID's
+    static PRInt32   gRecordSerialNumber;
+
+    NS_METHOD Delete(nsMemCacheRecord* aRecord);
+
+    friend class nsMemCacheRecord;
+    friend class nsMemCacheChannel;
+};
+
+#endif // _nsMemCache_h_

mozilla/netwerk/cache/memcache/nsMemCacheCID.h

@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+//  XPCOM Class ID for the network data in-memory cache
+
+#ifndef nsMEMCACHECID_h__
+#define nsMEMCACHECID_h__
+
+// {e4710560-7de2-11d3-90cb-0040056a906e}
+#define NS_MEM_CACHE_FACTORY_CID                          \
+    {                                                     \
+        0xe4710560,                                       \
+	    0x7de2,                                           \
+        0x11d3,                                           \
+	    {0x90, 0xcb, 0x00, 0x40, 0x05, 0x6a, 0x90, 0x6e}  \
+    }
+
+#endif // nsMEMCACHECID_h__

mozilla/netwerk/cache/memcache/nsMemCacheChannel.cpp

@@ -0,0 +1,464 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+#include "nsMemCache.h"
+#include "nsMemCacheChannel.h"
+#include "nsIStreamListener.h"
+#include "nsIChannel.h"
+#include "nsIStorageStream.h"
+#include "nsIOutputStream.h"
+#include "nsIServiceManager.h"
+#include "nsIEventQueueService.h"
+#include "nsNetUtil.h"
+#include "nsILoadGroup.h"
+
+static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
+static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID);
+
+NS_IMPL_ISUPPORTS(nsMemCacheChannel, NS_GET_IID(nsIChannel))
+
+void
+nsMemCacheChannel::NotifyStorageInUse(PRInt32 aBytesUsed)
+{
+    mRecord->mCache->mOccupancy += aBytesUsed;
+}
+
+/**
+ * This class acts as an adaptor around a synchronous input stream to add async
+ * read capabilities.  It adds methods for initiating, suspending, resuming and
+ * cancelling async reads. 
+ */
+class AsyncReadStreamAdaptor : public nsIInputStream {
+public:
+    AsyncReadStreamAdaptor(nsMemCacheChannel* aChannel, nsIInputStream *aSyncStream):
+        mSyncStream(aSyncStream), mDataAvailCursor(0),
+        mRemaining(0), mChannel(aChannel), mAvailable(0), mAborted(false), mSuspended(false)
+        {
+            NS_INIT_REFCNT();
+            NS_ADDREF(mChannel);
+        }
+
+    virtual ~AsyncReadStreamAdaptor() { 
+        mChannel->mAsyncReadStream = 0;
+        NS_RELEASE(mChannel);
+    }
+    
+    NS_DECL_ISUPPORTS
+
+    nsresult
+    IsPending(PRBool* aIsPending) {
+        *aIsPending = (mRemaining != 0) && !mAborted;
+        return NS_OK;
+    }
+
+    nsresult
+    Cancel(void) {
+        mAborted = true;
+        return mStreamListener->OnStopRequest(mChannel, mContext, NS_BINDING_ABORTED, nsnull);
+    }
+
+    nsresult
+    Suspend(void) { mSuspended = true; return NS_OK; }
+
+    nsresult
+    Resume(void) {
+        if (!mSuspended)
+            return NS_ERROR_FAILURE;
+        mSuspended = false;
+        return NextListenerEvent();
+    }
+
+    NS_IMETHOD
+    Available(PRUint32 *aNumBytes) { return mAvailable; }
+
+    NS_IMETHOD
+    Read(char* aBuf, PRUint32 aCount, PRUint32 *aBytesRead) {
+        if (mAborted)
+            return NS_ERROR_ABORT;
+
+        *aBytesRead = 0;
+        aCount = PR_MIN(aCount, mAvailable);
+        nsresult rv = mSyncStream->Read(aBuf, aCount, aBytesRead);
+        mAvailable -= *aBytesRead;
+
+        if (NS_FAILED(rv) && (rv != NS_BASE_STREAM_WOULD_BLOCK)) {
+            Fail();
+            return rv;
+        }
+
+        if (!mSuspended && !mAvailable) {
+            rv = NextListenerEvent();
+            if (NS_FAILED(rv)) {
+                Fail();
+                return rv;
+            }
+        }
+
+        return NS_OK;
+    }
+
+    NS_IMETHOD
+    Close() {
+        nsresult rv = mSyncStream->Close();
+        mSyncStream = 0;
+        mContext = 0;
+        mStreamListener = 0;
+        return rv;
+    }
+
+    nsresult
+    AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
+              nsISupports* aContext, nsIStreamListener* aListener) {
+
+        nsresult rv;
+        nsIEventQueue *eventQ;
+
+        mContext = aContext;
+        mStreamListener = aListener;
+        mRemaining = aReadCount;
+
+        NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
+        if (NS_FAILED(rv)) return rv;
+
+        NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv);
+        if (NS_FAILED(rv)) return rv;
+
+        rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQ);
+        if (NS_FAILED(rv)) return rv;
+
+        rv = NS_NewAsyncStreamListener(aListener, eventQ, 
+                                       getter_AddRefs(mStreamListener));
+        NS_RELEASE(eventQ);
+        if (NS_FAILED(rv)) return rv;
+
+        rv = mStreamListener->OnStartRequest(mChannel, aContext);
+        if (NS_FAILED(rv)) return rv;
+
+        return NextListenerEvent();
+    }
+
+protected:
+
+    nsresult
+    Fail(void) {
+        mAborted = true;
+        return mStreamListener->OnStopRequest(mChannel, mContext, NS_BINDING_FAILED, nsnull);
+    }
+
+    nsresult
+    NextListenerEvent() {
+        PRUint32 available;
+        nsresult rv = mSyncStream->Available(&available);
+        if (NS_FAILED(rv)) return rv;
+        available -= mAvailable;
+        available = PR_MIN(available, mRemaining);
+
+        if (available) {
+            PRUint32 size = PR_MIN(available, MEM_CACHE_SEGMENT_SIZE);
+            rv = mStreamListener->OnDataAvailable(mChannel, mContext, this,
+                                                  mDataAvailCursor, size);
+            mDataAvailCursor += size;
+            mRemaining -= size;
+            mAvailable += size;
+            return rv;
+        } else {
+            rv = mStreamListener->OnStopRequest(mChannel, mContext, NS_OK, nsnull);
+            AsyncReadStreamAdaptor* thisAlias = this;
+            NS_RELEASE(thisAlias);
+            return rv;
+        }
+    }
+    
+private:
+    nsCOMPtr<nsISupports>       mContext;        // Opaque context passed to AsyncRead()
+    nsCOMPtr<nsIStreamListener> mStreamListener; // Stream listener that has been proxied
+    nsCOMPtr<nsIInputStream>    mSyncStream;     // Underlying synchronous stream that is
+                                                 //   being converted to an async stream
+    PRUint32                    mDataAvailCursor;
+    PRUint32                    mRemaining;      // Size of AsyncRead request less bytes for
+                                                 //   consumer OnDataAvailable's that were fired
+    PRUint32                    mAvailable;      // Number of bytes for which OnDataAvailable fired
+    nsMemCacheChannel*          mChannel;        // Associated memory cache channel, strong link
+                                                 //   but can not use nsCOMPtr
+    bool                        mAborted;        // Abort() has been called
+    bool                        mSuspended;      // Suspend() has been called
+};
+
+NS_IMPL_ISUPPORTS(AsyncReadStreamAdaptor,  NS_GET_IID(nsIInputStream))
+
+// The only purpose of this output stream wrapper is to adjust the cache's
+// overall occupancy as new data flows into the cache entry.
+class MemCacheWriteStreamWrapper : public nsIOutputStream {
+public:
+    MemCacheWriteStreamWrapper(nsMemCacheChannel* aChannel, nsIOutputStream *aBaseStream):
+        mBaseStream(aBaseStream), mChannel(aChannel)
+        {
+            NS_INIT_REFCNT();
+            NS_ADDREF(mChannel);
+        }
+
+    virtual ~MemCacheWriteStreamWrapper() { NS_RELEASE(mChannel); };
+    
+    static nsresult
+    Create(nsMemCacheChannel* aChannel, nsIOutputStream *aBaseStream, nsIOutputStream* *aWrapper) {
+        MemCacheWriteStreamWrapper *wrapper =
+            new MemCacheWriteStreamWrapper(aChannel, aBaseStream);
+        if (!wrapper) return NS_ERROR_OUT_OF_MEMORY;
+        NS_ADDREF(wrapper);
+        *aWrapper = wrapper;
+        return NS_OK;
+    }
+    
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD
+    Write(const char *aBuffer, PRUint32 aCount, PRUint32 *aNumWritten) {
+        *aNumWritten = 0;
+        nsresult rv = mBaseStream->Write(aBuffer, aCount, aNumWritten);
+        mChannel->NotifyStorageInUse(*aNumWritten);
+        return rv;
+    }
+
+    NS_IMETHOD
+    Flush() { return mBaseStream->Flush(); }
+
+    NS_IMETHOD
+    Close() { return mBaseStream->Close(); }
+
+private:
+    nsCOMPtr<nsIOutputStream>   mBaseStream;
+    nsMemCacheChannel*          mChannel;
+};
+
+NS_IMPL_ISUPPORTS(MemCacheWriteStreamWrapper,  NS_GET_IID(nsIOutputStream))
+
+nsMemCacheChannel::nsMemCacheChannel(nsMemCacheRecord *aRecord, nsILoadGroup *aLoadGroup)
+    : mRecord(aRecord)
+{
+    NS_INIT_REFCNT();
+    mRecord->mNumChannels++;
+}
+
+nsMemCacheChannel::~nsMemCacheChannel()
+{
+    mRecord->mNumChannels--;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::IsPending(PRBool* aIsPending)
+{
+    *aIsPending = PR_FALSE;
+    if (!mAsyncReadStream)
+        return NS_OK;
+    return mAsyncReadStream->IsPending(aIsPending);
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::Cancel(void)
+{
+    if (!mAsyncReadStream)
+        return NS_ERROR_FAILURE;
+    return mAsyncReadStream->Cancel();
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::Suspend(void)
+{
+    if (!mAsyncReadStream)
+        return NS_ERROR_FAILURE;
+    return mAsyncReadStream->Suspend();
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::Resume(void)
+{
+    if (!mAsyncReadStream)
+        return NS_ERROR_FAILURE;
+    return mAsyncReadStream->Resume();
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetOriginalURI(nsIURI * *aURI)
+{
+    // Not required
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetURI(nsIURI * *aURI)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::OpenInputStream(PRUint32 aStartPosition, PRInt32 aReadCount,
+                                   nsIInputStream* *aResult)
+{
+    nsresult rv;
+    NS_ENSURE_ARG(aResult);
+    if (mInputStream)
+        return NS_ERROR_NOT_AVAILABLE;
+
+    rv = mRecord->mStorageStream->NewInputStream(aStartPosition, getter_AddRefs(mInputStream));
+    *aResult = mInputStream;
+    NS_ADDREF(*aResult);
+    return rv;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::OpenOutputStream(PRUint32 startPosition, nsIOutputStream* *aResult)
+{
+    nsresult rv;
+    NS_ENSURE_ARG(aResult);
+
+    nsCOMPtr<nsIOutputStream> outputStream;
+
+    PRUint32 oldLength;
+    mRecord->mStorageStream->GetLength(&oldLength);
+    rv = mRecord->mStorageStream->GetOutputStream(startPosition, getter_AddRefs(outputStream));
+    if (NS_FAILED(rv)) return rv;
+    if (startPosition < oldLength)
+        NotifyStorageInUse(startPosition - oldLength);
+
+    return MemCacheWriteStreamWrapper::Create(this, outputStream, aResult);
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::AsyncOpen(nsIStreamObserver *observer, nsISupports *ctxt)
+{
+    // Not required
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
+                             nsISupports *aContext, nsIStreamListener *aListener)
+{
+    nsCOMPtr<nsIInputStream> inputStream;
+    nsresult rv = OpenInputStream(aStartPosition, aReadCount, getter_AddRefs(inputStream));
+    if (NS_FAILED(rv)) return rv;
+    
+    AsyncReadStreamAdaptor *asyncReadStreamAdaptor;
+    asyncReadStreamAdaptor = new AsyncReadStreamAdaptor(this, inputStream);
+    if (!asyncReadStreamAdaptor)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(asyncReadStreamAdaptor);
+    mAsyncReadStream = asyncReadStreamAdaptor;
+
+    rv = asyncReadStreamAdaptor->AsyncRead(aStartPosition, aReadCount, aContext, aListener);
+    if (NS_FAILED(rv))
+        delete asyncReadStreamAdaptor;
+    return rv;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::AsyncWrite(nsIInputStream *fromStream, PRUint32 startPosition,
+                              PRInt32 writeCount, nsISupports *ctxt,
+                              nsIStreamObserver *observer)
+{
+    // Not required to be implemented
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetContentType(char* *aContentType)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    // NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    // FIXME - lying for the purpose of testing
+    *aContentType = strdup("text/html");
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetContentLength(PRInt32 *aContentLength)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetOwner(nsISupports* *aOwner)
+{
+    *aOwner = mOwner.get();
+    NS_IF_ADDREF(*aOwner);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::SetOwner(nsISupports* aOwner)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    mOwner = aOwner;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}

mozilla/netwerk/cache/memcache/nsMemCacheChannel.h

@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+#ifndef _nsMemCacheChannel_h_
+#define _nsMemCacheChannel_h_
+
+#include "nsMemCacheRecord.h"
+#include "nsIChannel.h"
+#include "nsIInputStream.h"
+#include "nsCOMPtr.h"
+
+
+class AsyncReadStreamAdaptor;
+
+class nsMemCacheChannel : public nsIChannel
+{
+public:
+    // Constructors and Destructor
+    nsMemCacheChannel(nsMemCacheRecord *aRecord, nsILoadGroup *aLoadGroup);
+    virtual ~nsMemCacheChannel();
+
+    // Declare nsISupports methods
+    NS_DECL_ISUPPORTS
+
+    // Declare nsIRequest methods
+    NS_DECL_NSIREQUEST
+
+    // Declare nsIChannel methods
+    NS_DECL_NSICHANNEL
+
+protected:
+    void NotifyStorageInUse(PRInt32 aBytesUsed);
+
+    nsCOMPtr<nsMemCacheRecord>   mRecord;
+    nsCOMPtr<nsIInputStream>     mInputStream;
+    nsCOMPtr<nsISupports>        mOwner;
+    AsyncReadStreamAdaptor*      mAsyncReadStream; // non-owning pointer
+
+    friend class MemCacheWriteStreamWrapper;
+    friend class AsyncReadStreamAdaptor;
+};
+
+#endif // _nsMemCacheChannel_h_

mozilla/netwerk/cache/memcache/nsMemCacheRecord.cpp

@@ -0,0 +1,164 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+#include "nsMemCache.h"
+#include "nsMemCacheRecord.h"
+#include "nsMemCacheChannel.h"
+#include "nsIAllocator.h"
+#include "nsStorageStream.h"
+
+static NS_DEFINE_IID(kINetDataCacheRecord, NS_INETDATACACHERECORD_IID);
+
+nsMemCacheRecord::nsMemCacheRecord()
+    : mKey(0), mKeyLength(0), mMetaData(0), mMetaDataLength(0), mNumChannels(0)
+{
+    NS_INIT_REFCNT();
+}
+
+nsMemCacheRecord::~nsMemCacheRecord()
+{
+    if (mMetaData)
+        delete[] mMetaData;
+    if (mKey)
+        delete[] mKey;
+}	
+     
+NS_IMPL_ISUPPORTS(nsMemCacheRecord, NS_GET_IID(nsINetDataCacheRecord))
+
+NS_IMETHODIMP
+nsMemCacheRecord::GetKey(PRUint32 *aLength, char **aResult)
+{
+    NS_ENSURE_ARG(aResult);
+    *aResult = (char *)nsAllocator::Alloc(mKeyLength);
+    if (!*aResult)
+        return NS_ERROR_OUT_OF_MEMORY;
+    memcpy(*aResult, mKey, mKeyLength);
+    *aLength = mKeyLength;
+    return NS_OK;
+}
+
+nsresult
+nsMemCacheRecord::Init(const char *aKey, PRUint32 aKeyLength,
+                       PRUint32 aRecordID, nsMemCache *aCache)
+{
+    nsresult rv;
+
+    NS_ASSERTION(!mKey, "Memory cache record key set multiple times");
+
+    rv = NS_NewStorageStream(MEM_CACHE_SEGMENT_SIZE, MEM_CACHE_MAX_ENTRY_SIZE,
+                             getter_AddRefs(mStorageStream));
+    if (NS_FAILED(rv)) return rv;
+
+    mKey = new char[aKeyLength];
+    if (!mKey)
+        return NS_ERROR_OUT_OF_MEMORY;
+    memcpy(mKey, aKey, aKeyLength);
+    mKeyLength = aKeyLength;
+    mRecordID = aRecordID;
+    mCache = aCache;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::GetRecordID(PRInt32 *aRecordID)
+{
+    NS_ENSURE_ARG(aRecordID);
+    *aRecordID = mRecordID;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::GetMetaData(PRUint32 *aLength, char **aResult)
+{
+    NS_ENSURE_ARG(aResult);
+
+    *aResult = 0;
+    if (mMetaDataLength) {
+        *aResult = (char*)nsAllocator::Alloc(mMetaDataLength);
+        if (!*aResult)
+            return NS_ERROR_OUT_OF_MEMORY;
+        memcpy(*aResult, mMetaData, mMetaDataLength);
+    }
+    *aLength = mMetaDataLength;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::SetMetaData(PRUint32 aLength, const char *aData)
+{
+    if (mMetaData)
+        delete[] mMetaData;
+    mMetaData = new char[aLength];
+    if (!mMetaData)
+        return NS_ERROR_OUT_OF_MEMORY;
+    memcpy(mMetaData, aData, aLength);
+    mMetaDataLength = aLength;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::GetStoredContentLength(PRUint32 *aStoredContentLength)
+{
+    NS_ENSURE_ARG(aStoredContentLength);
+    return mStorageStream->GetLength(aStoredContentLength);
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::SetStoredContentLength(PRUint32 aStoredContentLength)
+{
+    PRUint32 before, after;
+    mStorageStream->GetLength(&before);
+    nsresult rv = mStorageStream->SetLength(aStoredContentLength);
+    if (NS_FAILED(rv)) return rv;
+    mStorageStream->GetLength(&after);
+    mCache->mOccupancy -= (before - after);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::Delete(void)
+{
+    if (mNumChannels)
+        return NS_ERROR_NOT_AVAILABLE;
+  
+    return mCache->Delete(this);
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::GetFilename(nsIFileSpec* *aFilename)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::NewChannel(nsILoadGroup *aLoadGroup, nsIChannel* *aResult)
+{
+    NS_ENSURE_ARG(aResult);
+
+    nsMemCacheChannel* channel = new nsMemCacheChannel(this, aLoadGroup);
+    if (!channel)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(channel);
+    *aResult = NS_STATIC_CAST(nsIChannel*, channel);
+    return NS_OK;
+
+}

mozilla/netwerk/cache/memcache/nsMemCacheRecord.h

@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+#ifndef _nsMemCacheRecord_h_
+#define _nsMemCacheRecord_h_
+
+#include "nsINetDataCacheRecord.h"
+#include "nsCOMPtr.h"
+
+class nsMemCache;
+class nsIStorageStream;
+
+class nsMemCacheRecord : public nsINetDataCacheRecord
+{
+
+public:
+    // Declare interface methods
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSINETDATACACHERECORD
+
+protected:
+    // Constructors and Destructor
+    nsMemCacheRecord();
+    virtual ~nsMemCacheRecord();
+
+    nsresult Init(const char *aKey, PRUint32 aKeyLength,
+                  PRUint32 aRecordID, nsMemCache *aCache);
+
+    char*       mKey;              // opaque database key for this record
+    PRUint32    mKeyLength;        // length, in bytes, of mKey
+
+    PRInt32     mRecordID;         // An alternate key for this record
+
+    char*       mMetaData;         // opaque URI metadata
+    PRUint32    mMetaDataLength;   // length, in bytes, of mMetaData
+
+    nsMemCache* mCache;            // weak pointer to the cache database
+                                   //  that this record inhabits
+
+    nsCOMPtr<nsIStorageStream> mStorageStream;
+    PRUint32    mNumChannels;      // Count un-Release'ed nsIChannels
+
+    friend class nsMemCache;
+    friend class nsMemCacheChannel;
+};
+
+#endif // _nsMemCacheRecord_h_

mozilla/netwerk/cache/mgr/Makefile.in

@@ -0,0 +1,51 @@
+#
+# 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@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= nkcache 
+LIBRARY_NAME	= nkcachemgr_s
+
+REQUIRES	= nspr
+
+CPPSRCS		= \
+        nsCacheManager.cpp \
+        nsCachedNetData.cpp \
+        nsReplacementPolicy.cpp \
+        nsCacheEntryChannel.cpp \
+		$(NULL)
+
+LOCAL_INCLUDES	= -I$(srcdir)/../public -I$(srcdir)/../include
+
+EXTRA_LIBS	= $(NSPR_LIBS)
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/netwerk/cache/mgr/Makefile.win

@@ -0,0 +1,45 @@
+#!gmake
+#
+# 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=..\..\..
+
+include <$(DEPTH)/config/config.mak>
+
+MODULE = nkcache
+
+LIBRARY_NAME = nkcachemgr_s
+
+CPP_OBJS =                                   \
+	.\$(OBJDIR)\nsCacheManager.obj       \
+	.\$(OBJDIR)\nsCachedNetData.obj      \
+	.\$(OBJDIR)\nsReplacementPolicy.obj  \
+	.\$(OBJDIR)\nsCacheEntryChannel.obj  \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak> 
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -rf $(OBJDIR)
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+

mozilla/netwerk/cache/mgr/nsCacheEntryChannel.cpp

@@ -0,0 +1,260 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#include "nsCacheManager.h"
+#include "nsCacheEntryChannel.h"
+#include "nsIOutputStream.h"
+#include "nsIIOService.h"
+#include "nsIServiceManager.h"
+#include "nsIStreamListener.h"
+
+nsCacheEntryChannel::nsCacheEntryChannel(nsCachedNetData* aCacheEntry, nsIChannel* aChannel,
+                                         nsILoadGroup* aLoadGroup):
+    nsChannelProxy(aChannel), mCacheEntry(aCacheEntry), mLoadGroup(aLoadGroup), mLoadAttributes(0)
+{
+    NS_ASSERTION(aCacheEntry->mChannelCount < 0xFF, "Overflowed channel counter");
+    mCacheEntry->mChannelCount++;
+    NS_INIT_REFCNT();
+}
+
+nsCacheEntryChannel::~nsCacheEntryChannel()
+{
+    mCacheEntry->mChannelCount--;
+}
+
+NS_IMPL_ISUPPORTS3(nsCacheEntryChannel, nsISupports, nsIChannel, nsIRequest)
+
+// A proxy for nsIOutputStream
+class CacheOutputStream : public nsIOutputStream {
+
+public:
+    CacheOutputStream(nsIOutputStream *aOutputStream, nsCachedNetData *aCacheEntry):
+        mOutputStream(aOutputStream), mCacheEntry(aCacheEntry), mStartTime(PR_Now())
+        { NS_INIT_REFCNT(); }
+
+    virtual ~CacheOutputStream() {}
+
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD Close() {
+        mCacheEntry->NoteDownloadTime(mStartTime, PR_Now());
+        mCacheEntry->ClearFlag(nsCachedNetData::UPDATE_IN_PROGRESS);
+        return mOutputStream->Close();
+    }
+
+    NS_IMETHOD Flush() { return mOutputStream->Flush(); }
+
+    NS_IMETHOD
+    Write(const char *aBuf, PRUint32 aCount, PRUint32 *aActualBytes) {
+        nsresult rv;
+    
+        *aActualBytes = 0;
+        rv = mOutputStream->Write(aBuf, aCount, aActualBytes);
+        mCacheEntry->mLogicalLength += *aActualBytes;
+        if (NS_FAILED(rv)) return rv;
+        nsCacheManager::LimitCacheSize();
+        return rv;
+    }
+    
+protected:
+    nsCOMPtr<nsIOutputStream> mOutputStream;
+    nsCOMPtr<nsCachedNetData> mCacheEntry;
+
+    // Time at which stream was opened
+    PRTime mStartTime;
+};
+
+NS_IMPL_ISUPPORTS(CacheOutputStream, NS_GET_IID(nsIOutputStream))
+
+NS_IMETHODIMP
+nsCacheEntryChannel::OpenOutputStream(PRUint32 aStartPosition, nsIOutputStream* *aOutputStream)
+{
+    nsresult rv;
+    nsCOMPtr<nsIOutputStream> baseOutputStream;
+    
+    rv = mChannel->OpenOutputStream(aStartPosition, getter_AddRefs(baseOutputStream));
+    if (NS_FAILED(rv)) return rv;
+
+    mCacheEntry->NoteUpdate();
+    mCacheEntry->NoteAccess();
+    mCacheEntry->mLogicalLength = aStartPosition;
+
+    *aOutputStream = new CacheOutputStream(baseOutputStream, mCacheEntry);
+    if (!*aOutputStream)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(*aOutputStream);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheEntryChannel::OpenInputStream(PRUint32 aStartPosition, PRInt32 aReadCount,
+				     nsIInputStream* *aInputStream)
+{
+    mCacheEntry->NoteAccess();
+    return mChannel->OpenInputStream(aStartPosition, aReadCount, aInputStream);
+}
+
+class CacheManagerStreamListener: public nsIStreamListener  {
+
+    public:
+    
+    CacheManagerStreamListener(nsIStreamListener *aListener,
+                               nsILoadGroup *aLoadGroup, nsIChannel *aChannel):
+        mListener(aListener), mLoadGroup(aLoadGroup), mChannel(aChannel)
+        { NS_INIT_REFCNT(); }
+
+    virtual ~CacheManagerStreamListener() {}
+
+    private:
+
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD
+    OnDataAvailable(nsIChannel *channel, nsISupports *aContext,
+                    nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count) {
+        return mListener->OnDataAvailable(mChannel, aContext, inStr, sourceOffset, count);
+    }
+
+    NS_IMETHOD
+    OnStartRequest(nsIChannel *channel, nsISupports *aContext) {
+        if (mLoadGroup)
+            mLoadGroup->AddChannel(mChannel, aContext);
+        return mListener->OnStartRequest(mChannel, aContext);
+    }
+
+    NS_IMETHOD
+    OnStopRequest(nsIChannel *channel, nsISupports *aContext,
+                  nsresult status, const PRUnichar *errorMsg) {
+        nsresult rv;
+        rv = mListener->OnStopRequest(mChannel, aContext, status, errorMsg);
+        if (mLoadGroup)
+            mLoadGroup->RemoveChannel(mChannel, aContext, status, errorMsg);
+        return rv;
+    }
+
+    private:
+    
+    nsCOMPtr<nsIStreamListener>  mListener;
+    nsCOMPtr<nsILoadGroup>       mLoadGroup;
+    nsCOMPtr<nsIChannel>         mChannel;
+};
+
+NS_IMPL_ISUPPORTS2(CacheManagerStreamListener, nsIStreamListener, nsIStreamObserver)
+
+NS_IMETHODIMP
+nsCacheEntryChannel::AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
+                               nsISupports *aContext, nsIStreamListener *aListener)
+{
+    nsresult rv;
+
+    mCacheEntry->NoteAccess();
+
+    nsCOMPtr<nsIStreamListener> headListener;
+    if (mLoadGroup) {
+        mLoadGroup->GetDefaultLoadAttributes(&mLoadAttributes);
+
+        // Create a load group "proxy" listener...
+        nsCOMPtr<nsILoadGroupListenerFactory> factory;
+        rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
+        if (NS_SUCCEEDED(rv) && factory) {
+            rv = factory->CreateLoadGroupListener(aListener, 
+                                                  getter_AddRefs(headListener));
+            if (NS_FAILED(rv)) return rv;
+        }
+
+    } else {
+        headListener = aListener;
+    }
+
+    CacheManagerStreamListener* cacheManagerStreamListener;
+    nsIChannel *channelForListener;
+
+    channelForListener = mProxyChannel ? mProxyChannel : this;
+    cacheManagerStreamListener =
+        new CacheManagerStreamListener(headListener, mLoadGroup, channelForListener);
+    if (!cacheManagerStreamListener) return NS_ERROR_OUT_OF_MEMORY;
+    
+    NS_ADDREF(cacheManagerStreamListener);
+    rv = mChannel->AsyncRead(aStartPosition, aReadCount, aContext,
+                             cacheManagerStreamListener);
+    NS_RELEASE(cacheManagerStreamListener);
+
+    return rv;
+}
+
+// No async writes allowed to the cache yet
+NS_IMETHODIMP
+nsCacheEntryChannel::AsyncWrite(nsIInputStream *aFromStream, PRUint32 aStartPosition,
+				PRInt32 aWriteCount, nsISupports *aContext,
+				nsIStreamObserver *aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsCacheEntryChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+{
+    *aLoadGroup = mLoadGroup;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheEntryChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
+{
+    *aLoadAttributes = mLoadAttributes;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheEntryChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
+{
+    mLoadAttributes = aLoadAttributes;
+    return NS_OK;
+}
+
+static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
+
+NS_IMETHODIMP
+nsCacheEntryChannel::GetURI(nsIURI * *aURI)
+{
+    char* spec;
+    nsresult rv;
+
+    rv = mCacheEntry->GetUriSpec(&spec);
+    if (NS_FAILED(rv)) return rv;
+
+    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+    
+    rv = serv->NewURI(spec, 0, aURI);
+    nsAllocator::Free(spec);
+    return rv;
+}
+
+NS_IMETHODIMP
+nsCacheEntryChannel::GetOriginalURI(nsIURI * *aURI)
+{
+    // FIXME - should return original URI passed into NewChannel() ?
+    return NS_ERROR_NOT_IMPLEMENTED;
+}

mozilla/netwerk/cache/mgr/nsCacheEntryChannel.h

@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#ifndef _nsCacheEntryChannel_h_
+#define _nsCacheEntryChannel_h_
+
+#include "nsCOMPtr.h"
+#include "nsIChannel.h"
+#include "nsCachedNetData.h"
+#include "nsILoadGroup.h"
+
+class nsIStreamListener;
+
+// A proxy for an nsIChannel, useful when only a few nsIChannel
+// methods must be overridden
+class nsChannelProxy : public nsIChannel {
+
+public:
+    NS_FORWARD_NSICHANNEL(mChannel->)
+    NS_FORWARD_NSIREQUEST(mChannel->)
+
+protected:
+    nsChannelProxy(nsIChannel* aChannel):mChannel(aChannel) {};
+    virtual ~nsChannelProxy() {};
+    nsCOMPtr<nsIChannel>      mChannel;
+};
+
+// Override several nsIChannel methods so that they interact with the cache manager
+class nsCacheEntryChannel : public nsChannelProxy {
+
+public:
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD OpenOutputStream(PRUint32 aStartPosition, nsIOutputStream* *aOutputStream);
+    NS_IMETHOD OpenInputStream(PRUint32 aStartPosition, PRInt32 aReadCount,
+			       nsIInputStream* *aInputStream);
+    NS_IMETHOD AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
+			 nsISupports *aContext, nsIStreamListener *aListener);
+    NS_IMETHOD AsyncWrite(nsIInputStream *aFromStream, PRUint32 aStartPosition,
+			  PRInt32 aWriteCount, nsISupports *aContext,
+			  nsIStreamObserver *aObserver);
+    NS_IMETHOD GetLoadAttributes(nsLoadFlags *aLoadAttributes);
+    NS_IMETHOD SetLoadAttributes(nsLoadFlags aLoadAttributes);
+    NS_IMETHOD GetLoadGroup(nsILoadGroup* *aLoadGroup);
+    NS_IMETHOD GetURI(nsIURI * *aURI);
+    NS_IMETHOD GetOriginalURI(nsIURI * *aURI);
+
+protected:
+    nsCacheEntryChannel(nsCachedNetData* aCacheEntry, nsIChannel* aChannel, nsILoadGroup* aLoadGroup);
+    virtual ~nsCacheEntryChannel();
+
+    friend class nsCachedNetData;
+
+private:
+    nsCOMPtr<nsCachedNetData>    mCacheEntry;
+    nsCOMPtr<nsILoadGroup>       mLoadGroup;
+    nsCOMPtr<nsIChannel>         mProxyChannel;
+    nsLoadFlags                  mLoadAttributes;
+};
+
+#endif // _nsCacheEntryChannel_h_

mozilla/netwerk/cache/mgr/nsCacheManager.cpp

@@ -0,0 +1,496 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#include "nsINetDataCache.h"
+#include "nsCacheManager.h"
+#include "nsCachedNetData.h"
+#include "nsReplacementPolicy.h"
+#include "nsString.h"
+#include "nsIURI.h"
+#include "nsHashtable.h"
+#include "nsIComponentManager.h"
+#include "nsINetDataDiskCache.h"
+
+// Limit the number of entries in the cache to conserve memory space
+// in the nsReplacementPolicy code
+#define MAX_MEM_CACHE_ENTRIES    800
+#define MAX_DISK_CACHE_ENTRIES  3200
+
+// Cache capacities in MB, overridable via APIs
+#define DEFAULT_MEMORY_CACHE_CAPACITY  2000
+#define DEFAULT_DISK_CACHE_CAPACITY   10000
+
+#define CACHE_HIGH_WATER_MARK(capacity) ((PRUint32)(0.98 * (capacity)))
+#define CACHE_LOW_WATER_MARK(capacity)  ((PRUint32)(0.97 * (capacity)))
+
+nsCacheManager* gCacheManager = 0;
+
+NS_IMPL_ISUPPORTS(nsCacheManager, NS_GET_IID(nsINetDataCacheManager))
+
+nsCacheManager::nsCacheManager()
+    : mActiveCacheRecords(0),
+    mDiskCacheCapacity(DEFAULT_DISK_CACHE_CAPACITY),
+    mMemCacheCapacity(DEFAULT_MEMORY_CACHE_CAPACITY)
+{
+    NS_ASSERTION(!gCacheManager, "Multiple cache managers created");
+    gCacheManager = this;
+    NS_INIT_REFCNT();
+}
+
+nsCacheManager::~nsCacheManager()
+{
+    gCacheManager = 0;
+    delete mActiveCacheRecords;
+    delete mMemSpaceManager;
+    delete mDiskSpaceManager;
+}
+
+nsresult
+nsCacheManager::Init()
+{
+    nsresult rv;
+
+    mActiveCacheRecords = new nsHashtable(64);
+    if (!mActiveCacheRecords)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    // Instantiate the memory cache component
+    rv = nsComponentManager::CreateInstance(NS_NETWORK_MEMORY_CACHE_PROGID,
+                                            nsnull,
+                                            NS_GET_IID(nsINetDataCache),
+                                            getter_AddRefs(mMemCache));
+    if (NS_FAILED(rv))
+        return rv;
+
+    rv = nsComponentManager::CreateInstance(NS_NETWORK_FLAT_CACHE_PROGID,
+                                            nsnull,
+                                            NS_GET_IID(nsINetDataCache),
+
+                                            getter_AddRefs(mFlatCache));
+
+    if (NS_FAILED(rv)) {
+        // For now, we don't require a flat cache module to be present
+        if (rv != NS_ERROR_FACTORY_NOT_REGISTERED)
+            return rv;
+    }
+
+#ifdef FILE_CACHE_IS_READY
+    // Instantiate the file cache component
+    rv = nsComponentManager::CreateInstance(NS_NETWORK_FILE_CACHE_PROGID,
+                                            nsnull,
+                                            NS_GET_IID(nsINetDataCache),
+                                            getter_AddRefs(mFileCache));
+    if (NS_FAILED(rv)) {
+        NS_WARNING("No disk cache present");
+    }
+#endif
+
+    // Set up linked list of caches in search order
+    mCacheSearchChain = mMemCache;
+    if (mFlatCache) {
+        mMemCache->SetNextCache(mFlatCache);
+        mFlatCache->SetNextCache(mFileCache);
+    } else {
+        mMemCache->SetNextCache(mFileCache);
+    }
+
+    // TODO - Load any extension caches here
+
+    // Initialize replacement policy for memory cache module
+    mMemSpaceManager = new nsReplacementPolicy;
+    if (!mMemSpaceManager)
+        return NS_ERROR_OUT_OF_MEMORY;
+    rv = mMemSpaceManager->Init(MAX_MEM_CACHE_ENTRIES);
+    if (NS_FAILED(rv)) return rv;
+    rv = mMemSpaceManager->AddCache(mMemCache);
+
+    // Initialize replacement policy for disk cache modules (file
+    // cache and flat cache)
+    mDiskSpaceManager = new nsReplacementPolicy;
+    if (!mDiskSpaceManager)
+        return NS_ERROR_OUT_OF_MEMORY;
+    rv = mDiskSpaceManager->Init(MAX_DISK_CACHE_ENTRIES);
+    if (NS_FAILED(rv)) return rv;
+    if (mFileCache) {
+        rv = mDiskSpaceManager->AddCache(mFileCache);
+        if (NS_FAILED(rv)) return rv;
+    }
+    if (mFlatCache) {
+        rv = mDiskSpaceManager->AddCache(mFlatCache);
+        if (NS_FAILED(rv)) return rv;
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::GetCachedNetData(const char *aUriSpec, const char *aSecondaryKey,
+                                 PRUint32 aSecondaryKeyLength,
+                                 PRUint32 aFlags, nsICachedNetData* *aResult)
+{
+    nsCachedNetData *cachedData;
+    nsresult rv;
+    nsINetDataCache *cache;
+    nsReplacementPolicy *spaceManager;
+
+    if (aFlags & CACHE_AS_FILE) {
+        cache = mFileCache;
+        spaceManager = mDiskSpaceManager;
+
+        // Ensure that cache is initialized
+        if (mDiskCacheCapacity == (PRUint32)-1)
+            return NS_ERROR_NOT_AVAILABLE;
+
+    } else if ((aFlags & BYPASS_PERSISTENT_CACHE) || !mDiskCacheCapacity) {
+        cache = mMemCache;
+        spaceManager = mMemSpaceManager;
+    } else {
+        cache = mFlatCache ? mFlatCache : mFileCache;
+        spaceManager = mDiskSpaceManager;
+    }
+
+    // Construct the cache key by appending the secondary key to the URI spec
+    nsCAutoString cacheKey(aUriSpec);
+
+    // Insert NUL at end of URI spec
+    cacheKey += '\0';
+    if (aSecondaryKey)
+        cacheKey.Append(aSecondaryKey, aSecondaryKeyLength);
+
+    nsStringKey key(cacheKey);
+    cachedData = (nsCachedNetData*)mActiveCacheRecords->Get(&key);
+
+    // There is no existing instance of nsCachedNetData for this URL.
+    // Make one from the corresponding record in the cache module.
+    if (cachedData) {
+        NS_ASSERTION(cache == cachedData->mCache,
+                     "Cannot yet handle simultaneously active requests for the "
+                     "same URL using different caches");
+        NS_ADDREF(cachedData);
+    } else {
+        rv = spaceManager->GetCachedNetData(cacheKey.GetBuffer(), cacheKey.Length(),
+                                            cache, &cachedData);
+        if (NS_FAILED(rv)) return rv;
+
+        mActiveCacheRecords->Put(&key, cachedData);
+    }
+    
+    *aResult = cachedData;
+    return NS_OK;
+}
+
+// Remove this cache entry from the list of active ones
+nsresult
+nsCacheManager::NoteDormant(nsCachedNetData* aEntry)
+{
+    nsresult rv;
+    PRUint32 keyLength;
+    char* key;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsCachedNetData* deletedEntry;
+
+    rv = aEntry->GetRecord(getter_AddRefs(record));
+    if (NS_FAILED(rv)) return rv;
+    
+    rv = record->GetKey(&keyLength, &key);
+    if (NS_FAILED(rv)) return rv;
+    
+    nsStringKey hashTableKey(nsCString(key, keyLength));
+    deletedEntry = (nsCachedNetData*)gCacheManager->mActiveCacheRecords->Remove(&hashTableKey);
+    NS_ASSERTION(deletedEntry == aEntry, "Hash table inconsistency");
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::Contains(const char *aUriSpec, const char *aSecondaryKey,
+                         PRUint32 aSecondaryKeyLength,
+                         PRUint32 aFlags, PRBool *aResult)
+{
+    nsINetDataCache *cache;
+    nsReplacementPolicy *spaceManager;
+    nsCachedNetData *cachedData;
+
+    if (aFlags & CACHE_AS_FILE) {
+        cache = mFileCache;
+        spaceManager = mDiskSpaceManager;
+    } else if ((aFlags & BYPASS_PERSISTENT_CACHE) ||
+               (!mFileCache && !mFlatCache) || !mDiskCacheCapacity) {
+        cache = mMemCache;
+        spaceManager = mMemSpaceManager;
+    } else {
+        cache = mFlatCache ? mFlatCache : mFileCache;
+        spaceManager = mDiskSpaceManager;
+    }
+
+    // Construct the cache key by appending the secondary key to the URI spec
+    nsCAutoString cacheKey(aUriSpec);
+
+    // Insert NUL between URI spec and secondary key
+    cacheKey += '\0';
+    cacheKey.Append(aSecondaryKey, aSecondaryKeyLength);
+
+    // Locate the record using (URI + secondary key)
+    nsStringKey key(cacheKey);
+    cachedData = (nsCachedNetData*)mActiveCacheRecords->Get(&key);
+
+    if (cachedData && (cache == cachedData->mCache)) {
+        *aResult = PR_TRUE;
+        return NS_OK;
+    } else {
+        // No active cache entry, see if there is a dormant one
+        return cache->Contains(cacheKey.GetBuffer(), cacheKey.Length(), aResult);
+    }
+}
+
+NS_IMETHODIMP
+nsCacheManager::GetNumEntries(PRUint32 *aNumEntries)
+{
+    nsresult rv;
+    nsCOMPtr<nsISimpleEnumerator> iterator;
+    nsCOMPtr<nsISupports> cacheSupports;
+    nsCOMPtr<nsINetDataCache> cache;
+
+    PRUint32 totalEntries = 0;
+    
+    rv = NewCacheModuleIterator(getter_AddRefs(iterator));
+    if (NS_FAILED(rv)) return rv;
+    while (1) {
+        PRBool notDone;
+        rv = iterator->HasMoreElements(&notDone);
+        if (NS_FAILED(rv)) return rv;
+        if (!notDone)
+            break;
+        
+        iterator->GetNext(getter_AddRefs(cacheSupports));
+        cache = do_QueryInterface(cacheSupports);
+        
+        PRUint32 numEntries;
+        rv = cache->GetNumEntries(&numEntries);
+        if (NS_FAILED(rv)) return rv;
+        totalEntries += numEntries;
+    }
+    
+    *aNumEntries = totalEntries;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::NewCacheEntryIterator(nsISimpleEnumerator* *aResult)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+class CacheEnumerator : public nsISimpleEnumerator
+{
+public:
+    CacheEnumerator(nsINetDataCache* aFirstCache):mCache(aFirstCache)
+        { NS_INIT_REFCNT(); }
+
+    virtual ~CacheEnumerator() {};
+    
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHODIMP
+    HasMoreElements(PRBool* aMoreElements) {
+        *aMoreElements = (mCache != 0);
+        return NS_OK;
+    }
+
+    NS_IMETHODIMP
+    GetNext(nsISupports* *aSupports) {
+        *aSupports = mCache;
+        if (!mCache)
+            return NS_ERROR_FAILURE;
+        NS_ADDREF(*aSupports);
+
+        nsCOMPtr<nsINetDataCache> nextCache;
+        nsresult rv = mCache->GetNextCache(getter_AddRefs(nextCache));
+        mCache = nextCache;
+        return rv;
+    }
+
+private:
+    nsCOMPtr<nsINetDataCache> mCache;
+};
+
+NS_IMPL_ISUPPORTS(CacheEnumerator, NS_GET_IID(nsISimpleEnumerator))
+
+NS_IMETHODIMP
+nsCacheManager::NewCacheModuleIterator(nsISimpleEnumerator* *aResult)
+{
+    *aResult = new CacheEnumerator(mCacheSearchChain);
+    if (!*aResult)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(*aResult);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::RemoveAll(void)
+{
+    nsresult rv, result;
+    nsCOMPtr<nsISimpleEnumerator> iterator;
+    nsCOMPtr<nsINetDataCache> cache;
+    nsCOMPtr<nsISupports> iSupports;
+
+    result = NS_OK;
+    rv = NewCacheModuleIterator(getter_AddRefs(iterator));
+    if (NS_FAILED(rv)) return rv;
+    while (1) {
+        PRBool notDone;
+        rv = iterator->HasMoreElements(&notDone);
+        if (NS_FAILED(rv)) return rv;
+        if (!notDone)
+            break;
+        
+        iterator->GetNext(getter_AddRefs(iSupports));
+        cache = do_QueryInterface(iSupports);
+
+        PRUint32 cacheFlags;
+        rv = cache->GetFlags(&cacheFlags);
+        if (NS_FAILED(rv)) return rv;
+        
+        if ((cacheFlags & nsINetDataCache::READ_ONLY) == 0) {
+            rv = cache->RemoveAll();
+            if (NS_FAILED(rv))
+                result = rv;
+        }
+    }
+
+    return result;
+}
+
+nsresult
+nsCacheManager::LimitMemCacheSize()
+{
+    nsresult rv;
+    nsReplacementPolicy* spaceManager;
+
+    NS_ASSERTION(gCacheManager, "No cache manager");
+
+    spaceManager = gCacheManager->mMemSpaceManager;
+
+    PRUint32 occupancy;
+    rv = spaceManager->GetStorageInUse(&occupancy);
+    if (NS_FAILED(rv)) return rv;
+
+    PRUint32 memCacheCapacity = gCacheManager->mMemCacheCapacity;
+    if (occupancy > CACHE_HIGH_WATER_MARK(memCacheCapacity))
+        return spaceManager->Evict(CACHE_LOW_WATER_MARK(memCacheCapacity));
+
+    return NS_OK;
+}
+
+nsresult
+nsCacheManager::LimitDiskCacheSize()
+{
+    nsresult rv;
+    nsReplacementPolicy* spaceManager;
+
+    NS_ASSERTION(gCacheManager, "No cache manager");
+
+    spaceManager = gCacheManager->mDiskSpaceManager;
+
+    PRUint32 occupancy;
+    rv = spaceManager->GetStorageInUse(&occupancy);
+    if (NS_FAILED(rv)) return rv;
+
+    PRUint32 diskCacheCapacity = gCacheManager->mDiskCacheCapacity;
+    if (occupancy > CACHE_HIGH_WATER_MARK(diskCacheCapacity))
+        return spaceManager->Evict(CACHE_LOW_WATER_MARK(diskCacheCapacity));
+
+    return NS_OK;
+}
+
+nsresult
+nsCacheManager::LimitCacheSize()
+{
+    nsresult rv;
+
+    rv = LimitDiskCacheSize();
+    if (NS_FAILED(rv)) return rv;
+
+    rv = LimitMemCacheSize();
+    if (NS_FAILED(rv)) return rv;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::SetMemCacheCapacity(PRUint32 aCapacity)
+{
+    mMemCacheCapacity = aCapacity;
+    LimitCacheSize();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::GetMemCacheCapacity(PRUint32* aCapacity)
+{
+    NS_ENSURE_ARG_POINTER(aCapacity);
+    *aCapacity = mMemCacheCapacity;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::SetDiskCacheCapacity(PRUint32 aCapacity)
+{
+    mDiskCacheCapacity = aCapacity;
+    LimitCacheSize();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::GetDiskCacheCapacity(PRUint32* aCapacity)
+{
+    NS_ENSURE_ARG_POINTER(aCapacity);
+    *aCapacity = mDiskCacheCapacity;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::SetDiskCacheFolder(nsIFileSpec* aFolder)
+{
+    NS_ENSURE_ARG(aFolder);
+
+    if (!mFileCache)
+        return NS_ERROR_NOT_AVAILABLE;
+
+    nsCOMPtr<nsINetDataDiskCache> fileCache;
+    fileCache = do_QueryInterface(mFileCache);
+    return fileCache->SetDiskCacheFolder(aFolder);
+}
+
+NS_IMETHODIMP
+nsCacheManager::GetDiskCacheFolder(nsIFileSpec* *aFolder)
+{
+    NS_ENSURE_ARG(aFolder);
+
+    if (!mFileCache)
+        return NS_ERROR_NOT_AVAILABLE;
+
+    nsCOMPtr<nsINetDataDiskCache> fileCache;
+    fileCache = do_QueryInterface(mFileCache);
+    return fileCache->GetDiskCacheFolder(aFolder);
+}

mozilla/netwerk/cache/mgr/nsCacheManager.h

@@ -0,0 +1,99 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#ifndef _nsCacheManager_h_
+#define _nsCacheManager_h_
+
+// 2030f0b0-9567-11d3-90d3-0040056a906e
+#define NS_CACHE_MANAGER_CID                              \
+    {                                                     \
+        0x2030f0b0,                                       \
+        0x9567,                                           \
+        0x11d3,                                           \
+        {0x90, 0xd3, 0x00, 0x40, 0x05, 0x6a, 0x90, 0x6e}  \
+    }
+
+#include "nsINetDataCacheManager.h"
+#include "nsCOMPtr.h"
+
+class nsHashtable;
+class nsReplacementPolicy;
+class nsCachedNetData;
+
+class nsCacheManager : public nsINetDataCacheManager {
+
+public:
+    nsCacheManager();
+    virtual ~nsCacheManager();
+
+    NS_METHOD Init();
+
+    // nsISupports methods
+    NS_DECL_ISUPPORTS
+
+    // nsINetDataCacheManager methods
+    NS_DECL_NSINETDATACACHEMANAGER
+
+private:
+	
+    // Mapping from cache key to nsCachedNetData, but only for those cache
+    // entries with external references, i.e. those referred to outside the
+    // cache manager
+    nsHashtable*              mActiveCacheRecords;
+
+    // Memory cache
+    nsCOMPtr<nsINetDataCache> mMemCache;
+
+    // Flat-file database cache; All content aggregated into single disk file
+    nsCOMPtr<nsINetDataCache> mFlatCache;
+
+    // stream-as-file cache
+    nsCOMPtr<nsINetDataCache> mFileCache;
+
+    // Unified replacement policy for flat-cache and file-cache
+    nsReplacementPolicy*      mDiskSpaceManager;
+    
+    // Replacement policy for memory cache
+    nsReplacementPolicy*      mMemSpaceManager;
+
+    // List of caches in search order
+    nsINetDataCache*          mCacheSearchChain;
+
+    // Combined file/flat cache capacity, in KB
+    PRUint32                  mDiskCacheCapacity;
+
+    // Memory cache capacity, in KB
+    PRUint32                  mMemCacheCapacity;
+
+protected:
+    static nsresult NoteDormant(nsCachedNetData* aEntry);
+    static nsresult LimitCacheSize();
+    static nsresult LimitMemCacheSize();
+    static nsresult LimitDiskCacheSize();
+
+    friend class nsCachedNetData;
+    friend class CacheOutputStream;
+};
+
+#endif // _nsCacheManager_h_

mozilla/netwerk/cache/mgr/nsCachedNetData.h

@@ -0,0 +1,242 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#ifndef _nsCachedNetData_h_
+#define _nsCachedNetData_h_
+
+#include "nsICachedNetData.h"
+#include "nsCOMPtr.h"
+#include "nsINetDataCacheRecord.h"
+
+class nsINetDataCache;
+class nsIStreamAsFileObserver;
+class nsIStreamAsFile;
+class nsIArena;
+class StreamAsFileObserverClosure;
+class CacheMetaData;
+
+// Number of recent access times recorded
+#define MAX_K  3
+
+/**
+ * FIXME - add comment.  There are a lot of these data structures resident in
+ * memory, so be careful about adding members unnecessarily.
+ */
+class nsCachedNetData : public nsICachedNetData {
+
+public:
+    NS_DECL_ISUPPORTS
+
+    // nsICachedNetData methods
+    NS_DECL_NSICACHEDNETDATA
+
+    NS_METHOD Init(nsINetDataCacheRecord *aRecord, nsINetDataCache *aCache);
+
+protected:
+
+    // Bits for mFlags, below
+    typedef enum {
+        DIRTY               = 1 << 0, // Cache entry data needs to be flushed to database
+
+    // ==== Flags that can be set by the protocol handler ====
+        ALLOW_PARTIAL       = 1 << 1, // Protocol handler supports partial fetching
+        UPDATE_IN_PROGRESS  = 1 << 2, // Protocol handler now modifying cache data
+
+    // ==== Cache-entry state flags.  At most one of these flags can be set ====
+        TRUNCATED_CONTENT   = 1 << 4, // Entry contains valid content, but it has
+                                      //   been truncated by cache manager
+
+        // A previously-used cache entry, which has been purged of all cached
+        // content and protocol-private data.  This cache entry can be refilled
+        // with new content or it may be retained in this vestigial state
+        // because the usage statistics it contains will be used by the
+        // replacement policy if the same URI is ever cached again.
+        VESTIGIAL           = 1 << 5,
+
+    // ==== Memory usage status bits.  At most one of these flags can be set ====
+        RECYCLED            = 1 << 8, // Previously associated database record has
+                                      //   been deleted; This cache entry is available
+                                      //   for recycling.
+
+        DORMANT             = 1 << 9, // No references to this cache entry, except by
+                                      //   the cache manager itself
+        
+    // ==== Setter bits ====
+        LAST_MODIFIED_KNOWN = 1 <<12, // Protocol handler called SetLastModifiedTime()
+        EXPIRATION_KNOWN    = 1 <<13, // Protocol handler called SetExpirationTime()
+        STALE_TIME_KNOWN    = 1 <<14, // Protocol handler called SetStaleTime()
+
+    // ==== Useful flag combinations ====
+        // Cache entry not eligible for eviction
+        UNEVICTABLE         = VESTIGIAL | RECYCLED | UPDATE_IN_PROGRESS,
+        
+        // State flags that are in-memory only, i.e. not persistent 
+        TRANSIENT_FLAGS     = DIRTY | RECYCLED | DORMANT
+    } Flag;
+
+    PRBool GetFlag(Flag aFlag) { return (mFlags & aFlag) != 0; }
+    nsresult GetFlag(PRBool *aResult, Flag aFlag) { *aResult = GetFlag(aFlag); return NS_OK; }
+
+    // Set a boolean flag for the cache entry
+    nsresult SetFlag(PRBool aValue, Flag aFlag);
+    nsresult SetFlag(Flag aFlag)   { return SetFlag(PR_TRUE,  aFlag); }
+    nsresult ClearFlag(Flag aFlag) { return SetFlag(PR_FALSE, aFlag); }
+
+    void ComputeProfit(PRUint32 aCurrentTime);
+    static int Compare(const void *a, const void *b, void *unused);
+
+    void NoteAccess();
+    void NoteUpdate();
+
+    // Get underlying raw cache database record.
+    nsresult GetRecord(nsINetDataCacheRecord* *aRecord);
+
+    nsresult GetRecordID(PRInt32 *aRecordID);
+
+    nsresult Evict(PRUint32 aTruncatedContentLength);
+    
+    nsresult GetFileSpec(nsIFileSpec* *aFileSpec);
+
+    void NoteDownloadTime(PRTime start, PRTime end);
+
+    // placement new for arena-allocation
+    void *operator new (size_t aSize, nsIArena *aArena);
+
+    friend class nsReplacementPolicy;
+    friend class nsCacheManager;
+    friend class StreamAsFile;
+    friend class nsCacheEntryChannel;
+    friend class CacheOutputStream;
+    friend class InterceptStreamListener;
+
+private:
+
+    nsCachedNetData() {};
+    virtual ~nsCachedNetData() {};
+
+    // Initialize internal fields of this nsCachedNetData instance from the
+    // underlying raw cache database record.
+    nsresult Deserialize(bool aDeserializeFlags);
+
+    // Notify stream-as-file observers about change in cache entry status
+    nsresult Notify(PRUint32 aMessage, nsresult aError);
+
+    // Add/Remove stream-as-file observers
+    nsresult AddObserver(nsIStreamAsFile *aStreamAsFile, nsIStreamAsFileObserver* aObserver);
+    nsresult RemoveObserver(nsIStreamAsFileObserver* aObserver);
+
+    // Mark cache entry to indicate a write out to the cache database is required
+    void SetDirty() { mFlags |= DIRTY; }
+
+    nsresult Resurrect(nsINetDataCacheRecord *aRecord);
+
+    nsresult CommitFlags();
+
+    CacheMetaData* FindTaggedMetaData(const char* aTag, PRBool aCreate);
+
+private:
+    
+    // List of nsIStreamAsFileObserver's that will receive notification events
+    // when the cache manager or a client desires to delete/truncate a cache
+    // entry file.
+    StreamAsFileObserverClosure* mObservers;
+
+    // Protocol-specific meta-data, opaque to the cache manager
+    CacheMetaData *mMetaData;
+
+    // Next in chain for a single bucket in the replacement policy hash table
+    // that maps from record ID to nsCachedNetData
+    nsCachedNetData* mNext;
+    
+    // See flag bits, above
+    // NOTE: 16 bit member is combined with members below for
+    //       struct packing efficiency.  Do not change order of members!
+    PRUint16    mFlags;
+
+protected:
+
+    // Number of nsCacheEntryChannels referring to this record
+    PRUint8     mChannelCount;
+
+    // Below members are statistics kept per cache-entry, used to decide how
+    // profitable it will be to evict a record from the cache relative to other
+    // existing records.  Note: times are measured in *seconds* since the
+    // 1/1/70 epoch, same as a unix time_t.
+
+    // Number of accesses for this cache record
+    // NOTE: 8 bit member is combined with members above for
+    //       struct packing efficiency.  Do not change order of members!
+    PRUint8     mNumAccesses;
+
+    // A reference to the underlying, raw cache database record, either as a
+    // pointer to an in-memory object or as a database record identifier
+    union {
+        nsINetDataCacheRecord* mRecord;
+
+        // Database record ID of associated cache record.  See
+        // nsINetDataCache::GetRecordByID().
+        PRInt32  mRecordID;
+    };
+
+    // Weak link to parent cache
+    nsINetDataCache* mCache;
+
+    // Length of stored content, which may be less than storage consumed if
+    // compression is used
+    PRUint32 mLogicalLength;
+
+    // Most recent cache entry access times, used to compute access frequency
+    PRUint32 mAccessTime[MAX_K];
+    
+    // We use modification time of the original document for replacement policy
+    // computations, i.e. to compute a document's age, but if we don't know it,
+    // we use the time that the document was last written to the cache.
+    union {
+        // Document modification time, if known.
+        PRUint32 mLastModifiedTime;
+
+        // Time of last cache update for this doc
+        PRUint32 mLastUpdateTime;
+    };
+
+    union {
+      // Time until which document is fresh, i.e. does not have to be validated
+      // with server and, therefore, data in cache is guaranteed usable
+      PRUint32 mExpirationTime;
+
+      // Heuristic time at which cached document is likely to be out-of-date
+      // with respect to canonical copy on server.  Used for cache replacement
+      // policy, not for validation.
+      PRUint32 mStaleTime;
+    };
+
+    // Download time per byte, measure roughly in units of KB/s
+    float mDownloadRate;
+    
+    // Heuristic estimate of cache entry future benefits, based on above values
+    float mProfit;
+};
+
+#endif // _nsCachedNetData_h_
+

mozilla/netwerk/cache/mgr/nsReplacementPolicy.cpp

@@ -0,0 +1,658 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#include "nsReplacementPolicy.h"
+#include "nsCachedNetData.h"
+
+#include "nsQuickSort.h"
+#include "nsIAllocator.h"
+#include "nsIEnumerator.h"
+#include "prtime.h"
+#include "prbit.h"
+#include "nsCOMPtr.h"
+#include <math.h>
+
+// Constant used to estimate frequency of access to a document based on size
+#define CACHE_CONST_B   1.35
+
+// A cache whose space is managed by this replacement policy
+class nsReplacementPolicy::CacheInfo {
+public:
+    CacheInfo(nsINetDataCache* aCache):mCache(aCache),mNext(0) {}
+
+    nsINetDataCache* mCache;
+    CacheInfo*       mNext;
+};
+
+nsReplacementPolicy::nsReplacementPolicy()
+    : mRankedEntries(0), mCaches(0), mRecordsRemovedSinceLastRanking(0),
+      mNumEntries(0), mCapacityRankedEntriesArray(0), mLastRankTime(0) {}
+
+nsReplacementPolicy::~nsReplacementPolicy()
+{
+    if (mRankedEntries)
+        nsAllocator::Free(mRankedEntries);
+    if (mMapRecordIdToEntry)
+        nsAllocator::Free(mMapRecordIdToEntry);
+}
+
+nsresult
+nsReplacementPolicy::Init(PRUint32 aMaxCacheEntries)
+{
+    nsresult rv;
+
+    rv = NS_NewHeapArena(getter_AddRefs(mArena), sizeof(nsCachedNetData) * 32);
+    if (NS_FAILED(rv)) return rv;
+
+    mMaxEntries = aMaxCacheEntries;
+
+    mHashArrayLength = PR_CeilingLog2(aMaxCacheEntries) >> 3;
+    size_t numBytes = mHashArrayLength * sizeof(*mMapRecordIdToEntry);
+    mMapRecordIdToEntry = (nsCachedNetData**)nsAllocator::Alloc(numBytes);
+    if (!mMapRecordIdToEntry)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    nsCRT::zero(mMapRecordIdToEntry, numBytes);
+
+    return NS_OK;
+}
+
+nsresult
+nsReplacementPolicy::AddCache(nsINetDataCache *aCache)
+{
+    CacheInfo *cacheInfo = new CacheInfo(aCache);
+    if (!cacheInfo)
+        return NS_ERROR_OUT_OF_MEMORY;
+    cacheInfo->mNext = mCaches;
+    mCaches = cacheInfo;
+    return NS_OK;
+}
+
+PRUint32
+nsReplacementPolicy::HashRecordID(PRInt32 aRecordID)
+{
+    return ((aRecordID >> 16) ^ aRecordID) & (mHashArrayLength - 1);
+}
+
+nsCachedNetData*
+nsReplacementPolicy::FindCacheEntryByRecordID(PRInt32 aRecordID, nsINetDataCache *aCache)
+{
+    nsresult rv;
+    nsCachedNetData* cacheEntry;
+    PRUint32 bucket = HashRecordID(aRecordID);
+
+    cacheEntry = mMapRecordIdToEntry[bucket];
+    for (;cacheEntry; cacheEntry = cacheEntry->mNext) {
+
+        PRInt32 recordID;
+        rv = cacheEntry->GetRecordID(&recordID);
+        if (NS_FAILED(rv))
+            continue;
+
+        if ((recordID == aRecordID) && (cacheEntry->mCache == aCache))
+            return cacheEntry;
+    }
+
+    return 0;
+}
+
+// Add a cache entry to the hash table that maps record ID to entries
+void
+nsReplacementPolicy::AddCacheEntry(nsCachedNetData* aCacheEntry, PRInt32 aRecordID)
+{
+    nsCachedNetData** cacheEntryp;
+    PRUint32 bucket = HashRecordID(aRecordID);
+
+    cacheEntryp = &mMapRecordIdToEntry[bucket];
+    while (*cacheEntryp)
+        cacheEntryp = &(*cacheEntryp)->mNext;
+    *cacheEntryp = aCacheEntry;
+    aCacheEntry->mNext = 0;
+}
+
+// Delete a cache entry from the hash table that maps record ID to entries
+nsresult
+nsReplacementPolicy::DeleteCacheEntry(nsCachedNetData* aCacheEntry)
+{
+    nsresult rv;
+    PRInt32 recordID;
+    rv = aCacheEntry->GetRecordID(&recordID);
+    if (NS_FAILED(rv)) return rv;
+
+    PRUint32 bucket = HashRecordID(recordID);
+
+    nsCachedNetData** cacheEntryp;
+    cacheEntryp = &mMapRecordIdToEntry[bucket];
+    while (*cacheEntryp) {
+        if (*cacheEntryp == aCacheEntry) {
+            *cacheEntryp = aCacheEntry->mNext;
+            return NS_OK;
+        }
+        cacheEntryp = &(*cacheEntryp)->mNext;
+    }
+    
+    NS_ASSERTION(0, "hash table inconsistency");
+    return NS_ERROR_FAILURE;
+}
+
+nsresult
+nsReplacementPolicy::AddAllRecordsInCache(nsINetDataCache *aCache)
+{
+    nsresult rv;
+    nsCOMPtr<nsISimpleEnumerator> iterator;
+    nsCOMPtr<nsISupports> iSupports;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    rv = aCache->NewCacheEntryIterator(getter_AddRefs(iterator));
+    if (!NS_SUCCEEDED(rv)) return rv;
+
+    while (1) {
+        PRBool notDone;
+
+        rv = iterator->HasMoreElements(&notDone);
+        if (NS_FAILED(rv)) return rv;
+        if (!notDone)
+            break;
+
+        rv = iterator->GetNext(getter_AddRefs(iSupports));
+        if (!NS_SUCCEEDED(rv)) return rv;
+        record = do_QueryInterface(iSupports);
+        
+        rv = AssociateCacheEntryWithRecord(record, aCache, 0);
+        if (!NS_SUCCEEDED(rv)) return rv;
+    }
+
+    return NS_OK;
+}
+
+// Get current time and convert to seconds since the epoch
+static PRUint32
+now32()
+{
+    double nowFP;
+    PRInt64 now64 = PR_Now();
+    LL_L2D(nowFP, now64);
+    PRUint32 now = (PRUint32)(nowFP * 1e-6);
+    return now;
+}
+
+void
+nsCachedNetData::NoteDownloadTime(PRTime start, PRTime end)
+{
+    double startFP, endFP, rate, duration;
+
+    LL_L2D(startFP, start);
+    LL_L2D(endFP, end);
+
+    duration = endFP - startFP;
+    // Sanity-check
+    if (!duration)
+        return;
+
+    // Compute download rate in kB/s
+    rate = mLogicalLength / (duration * (1e-6 /1024.0));
+    
+    // Exponentially smooth download rate
+    const double alpha = 0.5;
+    mDownloadRate = (float)(mDownloadRate * alpha + rate * (1.0 - alpha));
+}
+
+// 1 hour
+#define MIN_HALFLIFE (60 * 60)
+
+// 1 week
+#define TYPICAL_HALFLIFE (7 * 24 * 60 * 60)
+
+/**
+ * Estimate the profit that would be lost if the given cache entry was evicted
+ * from the cache.  Profit is defined as the future expected download delay per
+ * byte of cached content.  The profit computation is made based on projected
+ * frequency of access, prior download performance and a heuristic staleness
+ * criteria.  The technique used is a variation of that described in the
+ * following paper:
+ *
+ *    "A Case for Delay-Conscious Caching of Web Documents"
+ *    http://www.bell-labs.com/user/rvingral/www97.html
+ *
+ * Briefly, expected profit is:
+ *
+ *   (projected frequency of access) * (download time per byte) * (probability freshness)
+ */
+void
+nsCachedNetData::ComputeProfit(PRUint32 aNow)
+{
+    PRUint32 K, now;
+
+    if (aNow)
+        now = aNow;
+    else
+        now = now32();
+    
+    K = PR_MIN(MAX_K, mNumAccesses);
+    if (!K) {
+        mProfit = 0;
+        return;
+    }
+
+    // Compute time, in seconds, since k'th most recent access
+    double timeSinceKthAccess = now - mAccessTime[K - 1];
+    if (timeSinceKthAccess <= 0.0)    // Sanity check
+        timeSinceKthAccess = 1.0;
+
+    // Estimate frequency of future document access based on past
+    //  access frequency
+    double frequencyAccess = K / timeSinceKthAccess;
+
+    // If we don't have much historical data on access frequency
+    //   use a heuristic based on document size as an estimate
+    if (mLogicalLength) {
+        if (K == 1) {
+            frequencyAccess /= pow(mLogicalLength, CACHE_CONST_B);
+        } else if (K == 2) {
+            frequencyAccess /= pow(mLogicalLength, CACHE_CONST_B / 2);
+        }
+    }
+
+    // Estimate likelihood that data in cache is fresh, i.e.
+    //  that it corresponds to the document on the server
+    double probabilityFreshness;
+    PRInt32 halfLife, age, docTime;
+    bool potentiallyStale;
+
+    docTime = GetFlag(LAST_MODIFIED_KNOWN) ? mLastModifiedTime : mLastUpdateTime;
+    age = now - docTime;
+
+    probabilityFreshness = 1.0; // Optimistic
+
+    if (GetFlag(EXPIRATION_KNOWN)) {
+        potentiallyStale = now > mExpirationTime;
+        halfLife = mExpirationTime - mLastModifiedTime;
+    } else if (GetFlag(STALE_TIME_KNOWN)) {
+        potentiallyStale = true;
+        halfLife = mStaleTime - docTime;
+    } else {
+        potentiallyStale = true;
+        halfLife = TYPICAL_HALFLIFE;
+    }
+    
+    if (potentiallyStale) {
+        if (halfLife < MIN_HALFLIFE)
+            halfLife = MIN_HALFLIFE;
+
+        probabilityFreshness = pow(0.5, (double)age / (double)halfLife);
+    }
+
+    mProfit = (float)(frequencyAccess * probabilityFreshness * mDownloadRate);
+}
+
+// Number of entries to grow mRankedEntries array when it's full
+#define STATS_GROWTH_INCREMENT  256
+
+
+// Sorting predicate for NS_Quicksort
+int
+nsCachedNetData::Compare(const void *a, const void *b, void *unused)
+{
+    nsCachedNetData* entryA = (nsCachedNetData*)a;
+    nsCachedNetData* entryB = (nsCachedNetData*)b;
+
+    // Percolate deleted or empty entries to the end of the mRankedEntries
+    // array, so that they can be recycled.
+    if (!entryA || entryA->GetFlag(RECYCLED)) {
+        if (!entryB || entryB->GetFlag(RECYCLED))
+            return 0;
+        else 
+            return +1;
+    } 
+    if (!entryB || entryB->GetFlag(RECYCLED))
+        return -1;
+
+    // Evicted entries (those with no content data) and active entries (those
+    // currently being updated) are collected towards the end of the sorted
+    // array just prior to the deleted cache entries, since evicted entries
+    // can't be re-evicted.
+    if (entryA->GetFlag(UPDATE_IN_PROGRESS)) {
+        if (entryB->GetFlag(UPDATE_IN_PROGRESS))
+            return 0;
+        else 
+            return +1;
+    } 
+    if (entryB->GetFlag(UPDATE_IN_PROGRESS))
+        return -1;
+
+    PRUint16 Ka = PR_MIN(MAX_K, entryA->mNumAccesses);
+    PRUint16 Kb = PR_MIN(MAX_K, entryB->mNumAccesses);
+
+    // Order cache entries by the number of times they've been accessed
+    if (Ka < Kb)
+        return -1;
+    if (Ka > Kb)
+        return +1;
+
+    /*
+     * Among records that have been accessed an equal number of times, order
+     * them by profit.
+     */
+    if (entryA->mProfit > entryB->mProfit)
+        return +1;
+    if (entryA->mProfit < entryB->mProfit)
+        return -1;
+    return 0;
+}
+
+/**
+ * Rank cache entries in terms of their elegibility for eviction.
+ */
+nsresult
+nsReplacementPolicy::RankRecords()
+{
+    PRUint32 i, now;
+
+    // Add all cache records if this is the first ranking
+    if (!mLastRankTime) {
+        nsresult rv;
+        CacheInfo *cacheInfo;
+
+        cacheInfo = mCaches;
+        while (cacheInfo) {
+            rv = AddAllRecordsInCache(cacheInfo->mCache);
+            if (NS_FAILED(rv)) return rv;
+
+            cacheInfo = cacheInfo->mNext;
+        }
+    }
+
+    // Get current time and convert to seconds since the epoch
+    now = now32();
+
+    // Recompute profit for every known cache record, except deleted ones
+    for (i = 0; i < mNumEntries; i++) {
+        nsCachedNetData* entry = mRankedEntries[i];
+        if (entry && !entry->GetFlag(nsCachedNetData::RECYCLED))
+            entry->ComputeProfit(now);
+    }
+    NS_QuickSort(mRankedEntries, mNumEntries, sizeof *mRankedEntries, 
+                 nsCachedNetData::Compare, 0);
+
+    mNumEntries -= mRecordsRemovedSinceLastRanking;
+    mRecordsRemovedSinceLastRanking = 0;
+    mLastRankTime = now;
+    return NS_OK;
+}
+
+// A heuristic policy to avoid the cost of re-ranking cache records by
+// profitability every single time space must be made available in the cache.
+void
+nsReplacementPolicy::MaybeRerankRecords()
+{
+    // Rank at most once per minute
+    PRUint32 now = now32();
+    if ((now - mLastRankTime) >= 60)
+        RankRecords();
+}
+
+void
+nsReplacementPolicy::CompactRankedEntriesArray()
+{
+    if (mRecordsRemovedSinceLastRanking || !mLastRankTime)
+        RankRecords();
+}
+
+nsresult
+nsReplacementPolicy::CheckForTooManyCacheEntries()
+{
+    if (mCapacityRankedEntriesArray == mMaxEntries) {
+        return DeleteOneEntry(0);
+    } else {
+        nsresult rv;
+        CacheInfo *cacheInfo;
+
+        cacheInfo = mCaches;
+        while (cacheInfo) {
+            PRUint32 numEntries, maxEntries;
+
+            rv = cacheInfo->mCache->GetNumEntries(&numEntries);
+            if (NS_FAILED(rv)) return rv;
+
+            rv = cacheInfo->mCache->GetMaxEntries(&maxEntries);
+            if (NS_FAILED(rv)) return rv;
+
+            if (numEntries == maxEntries)
+                return DeleteOneEntry(cacheInfo->mCache);
+
+            cacheInfo = cacheInfo->mNext;
+        }
+    }
+    return NS_OK;
+}
+
+
+/** 
+ * Create a new association between a low-level cache database record and a
+ * cache entry.  Add the entry to the set of entries eligible for eviction from
+ * the cache.  This would typically be done when the cache entry is created.
+ */
+nsresult
+nsReplacementPolicy::AssociateCacheEntryWithRecord(nsINetDataCacheRecord *aRecord,
+                                                   nsINetDataCache* aCache,
+                                                   nsCachedNetData** aResult)
+{
+    nsCachedNetData* cacheEntry;
+    nsresult rv;
+
+    // First, see if the record is already known to the replacement policy
+    PRInt32 recordID;
+    rv = aRecord->GetRecordID(&recordID);
+    if (NS_FAILED(rv)) return rv;
+    cacheEntry = FindCacheEntryByRecordID(recordID, aCache);
+    if (cacheEntry) {
+        if (aResult) {
+            if (cacheEntry->GetFlag(nsCachedNetData::DORMANT))
+                cacheEntry->Resurrect(aRecord);
+            NS_ADDREF(cacheEntry);
+            *aResult = cacheEntry;
+        }
+        return NS_OK;
+    }
+
+    // Compact the array of cache entry statistics, so that free entries appear
+    // at the end, for possible reuse.
+    if (mNumEntries && (mNumEntries == mCapacityRankedEntriesArray))
+        CompactRankedEntriesArray();
+
+    // If compaction doesn't yield available entries in the
+    // mRankedEntries array, then extend the array.
+    if (mNumEntries == mCapacityRankedEntriesArray) {
+        PRUint32 newCapacity;
+
+        rv = CheckForTooManyCacheEntries();
+        if (NS_FAILED(rv)) return rv;
+
+        newCapacity = mCapacityRankedEntriesArray + STATS_GROWTH_INCREMENT;
+        if (newCapacity > mMaxEntries)
+            newCapacity = mMaxEntries;
+
+        nsCachedNetData** newRankedEntriesArray; 
+        PRUint32 numBytes = sizeof(nsCachedNetData*) * newCapacity;
+        newRankedEntriesArray = 
+            (nsCachedNetData**)nsAllocator::Realloc(mRankedEntries, numBytes);
+        if (!newRankedEntriesArray)
+            return NS_ERROR_OUT_OF_MEMORY;
+        
+        mRankedEntries = newRankedEntriesArray;
+        mCapacityRankedEntriesArray = newCapacity;
+
+        PRUint32 i;
+        for (i = mNumEntries; i < newCapacity; i++)
+            mRankedEntries[i] = 0;
+    }
+
+    // Recycle the record after the last in-use record in the array
+    nsCachedNetData *entry = mRankedEntries[mNumEntries];
+    NS_ASSERTION(!entry || !entry->GetFlag(nsCachedNetData::RECYCLED),
+                 "Only deleted cache entries should appear at end of array");
+
+    if (!entry) {
+        entry = new(mArena) nsCachedNetData;
+        if (!entry)
+            return NS_ERROR_OUT_OF_MEMORY;
+        mRankedEntries[mNumEntries] = entry;
+    } else {
+        // Clear out recycled data structure
+        nsCRT::zero(entry, sizeof(*entry));
+    }
+
+    entry->Init(aRecord, aCache);
+    AddCacheEntry(entry, recordID);
+    
+    // Add one reference to the cache entry from the cache manager
+    NS_ADDREF(entry);
+
+    if (aResult) {
+        // And one reference from our caller
+        NS_ADDREF(entry);
+        *aResult = entry;
+    }
+
+    mNumEntries++;
+    return NS_OK;
+}
+
+nsresult
+nsReplacementPolicy::GetCachedNetData(const char* cacheKey, PRUint32 cacheKeyLength,
+                                      nsINetDataCache* aCache,
+                                      nsCachedNetData** aResult)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+
+    rv = aCache->GetCachedNetData(cacheKey, cacheKeyLength,
+                                  getter_AddRefs(record));
+    if (NS_FAILED(rv)) return rv;
+    return AssociateCacheEntryWithRecord(record, aCache, aResult);
+}
+
+/**
+ * Delete the least desirable record from the cache database.  This is used
+ * when the addition of another record would exceed either the cache manager or
+ * the cache's maximum permitted number of records.
+ */
+nsresult
+nsReplacementPolicy::DeleteOneEntry(nsINetDataCache *aCache)
+{
+    PRUint32 i;
+    nsresult rv;
+    nsCachedNetData *entry;
+
+    i = 0;
+    while (1) {
+        MaybeRerankRecords();
+        for (; i < mNumEntries; i++) {
+            entry = mRankedEntries[i];
+            if (!entry || entry->GetFlag(nsCachedNetData::RECYCLED))
+                continue;
+            if (!aCache || (entry->mCache == aCache))
+                break;
+        }
+
+        // Report error if no record found to delete
+        if (i == mNumEntries)
+            return NS_ERROR_FAILURE;
+        rv = entry->Delete();
+        if (NS_SUCCEEDED(rv)) {
+            rv = DeleteCacheEntry(entry);
+            return rv;
+        }
+    }
+}
+
+nsresult
+nsReplacementPolicy::GetStorageInUse(PRUint32* aStorageInUse)
+{
+    nsresult rv;
+    CacheInfo *cacheInfo;
+
+    *aStorageInUse = 0;
+    cacheInfo = mCaches;
+    while (cacheInfo) {
+        PRUint32 cacheStorage;
+        rv = cacheInfo->mCache->GetStorageInUse(&cacheStorage);
+        if (NS_FAILED(rv)) return rv;
+
+        *aStorageInUse += cacheStorage;
+        cacheInfo = cacheInfo->mNext;
+    }
+    return NS_OK;
+}
+
+/**
+ * Delete the least desirable records from the cache until the occupancy of the
+ * cache has been reduced by the given number of KB.  This is used when the
+ * addition of more cache data would exceed the cache's capacity. 
+ */
+nsresult
+nsReplacementPolicy::Evict(PRUint32 aTargetOccupancy)
+{
+    PRUint32 i;
+    nsCachedNetData *entry;
+    nsresult rv;
+    PRUint32 occupancy;
+    PRInt32 truncatedLength;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+
+    MaybeRerankRecords();
+    for (i = 0; i < mNumEntries; i++) {
+        rv = GetStorageInUse(&occupancy);
+        if (!NS_SUCCEEDED(rv)) return rv;
+        
+        if (occupancy <= aTargetOccupancy)
+            return NS_OK;
+
+        entry = mRankedEntries[i];
+
+        // Skip deleted/empty cache entries and ones that have already been evicted
+        if (!entry || entry->GetFlag(nsCachedNetData::UNEVICTABLE))
+            continue;
+
+        if (entry->GetFlag(nsCachedNetData::ALLOW_PARTIAL)) {
+            rv = entry->GetRecord(getter_AddRefs(record));
+            if (NS_FAILED(rv))
+                continue;
+
+            PRUint32 contentLength;
+            rv = record->GetStoredContentLength(&contentLength);
+            if (NS_FAILED(rv))
+                continue;
+            
+            // Additional cache storage required, in KB
+            PRUint32 storageToReclaim = (occupancy - aTargetOccupancy) << 10;
+            
+            truncatedLength = (PRInt32)(contentLength - storageToReclaim);
+            if (truncatedLength < 0)
+                truncatedLength = 0;
+        } else {
+            truncatedLength = 0;
+        }
+        rv = entry->Evict(truncatedLength);
+    }
+    return NS_ERROR_FAILURE;
+}

mozilla/netwerk/cache/mgr/nsReplacementPolicy.h

@@ -0,0 +1,136 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+/**
+ * This class manages one or more caches that share a storage resource, e.g. a
+ * file cache and a flat-database cache might each occupy space on the disk and
+ * they would share a single instance of nsReplacementPolicy.  The replacement
+ * policy heuristically chooses which cache entries to evict when storage is
+ * required to accommodate incoming cache data.
+ */
+
+#ifndef _nsReplacementPolicy_h_
+#define _nsReplacementPolicy_h_
+
+#include "nscore.h"
+#include "nsISupportsUtils.h"
+#include "nsINetDataCache.h"
+#include "nsICachedNetData.h"
+#include "nsIArena.h"
+#include "nsCOMPtr.h"
+#include "nsHashtable.h"
+
+class nsCachedNetData;
+struct PL_HashTable;
+
+/**
+ * This private class is responsible for implementing the network data cache's
+ * replacement policy, i.e. it decides which cache data should be evicted to
+ * make room for new incoming data.
+ */
+class nsReplacementPolicy {
+
+public:
+
+    nsReplacementPolicy();
+    ~nsReplacementPolicy();
+
+protected:
+
+    nsresult Init(PRUint32 aMaxCacheEntries);
+    nsresult AddCache(nsINetDataCache *aCache);
+    nsresult GetCachedNetData(const char* cacheKey, PRUint32 cacheKeyLength,
+                              nsINetDataCache* aCache,
+                              nsCachedNetData** aResult);
+    nsresult GetStorageInUse(PRUint32* aNumKBytes);
+
+    friend class nsCacheManager;
+
+private:
+    nsresult RankRecords();
+    void MaybeRerankRecords();
+    void CompactRankedEntriesArray();
+    nsresult DeleteOneEntry(nsINetDataCache* aCache);
+    nsresult Evict(PRUint32 aTargetOccupancy);
+
+    nsCachedNetData* FindCacheEntryByRecordID(PRInt32 aRecordID, nsINetDataCache *aCache);
+    void AddCacheEntry(nsCachedNetData* aCacheEntry, PRInt32 aRecordID);
+    nsresult DeleteCacheEntry(nsCachedNetData* aCacheEntry);
+    PRUint32 HashRecordID(PRInt32 aRecordID);
+    nsresult AssociateCacheEntryWithRecord(nsINetDataCacheRecord *aRecord,
+                                           nsINetDataCache* aCache,
+                                           nsCachedNetData** aResult);
+
+    nsresult AddAllRecordsInCache(nsINetDataCache *aCache);
+    nsresult CheckForTooManyCacheEntries();
+
+    class CacheInfo;
+
+private:
+
+    // Growable array of pointers to individual cache entries; It is sorted by
+    // profitability, such that low-numbered array indices refer to cache
+    // entries that are the least profitable to retain.  New cache entries are
+    // added to the end of the array.  Deleted cache entries are specially
+    // marked and percolate to the end of the array for recycling whenever
+    // mRankedEntries is sorted.  Evicted cache entries (those with no
+    // associated content data) are retained for the purpose of improving the
+    // replacement policy efficacy, and are percolated towards the end of the
+    // array, just prior to the deleted cache entries.
+    //
+    // The array is not in sorted order 100% of the time; For efficiency
+    // reasons, sorting is only done when heuristically deemed necessary.
+    nsCachedNetData**   mRankedEntries;
+
+    // Hash table buckets to map Record ID to cache entry.  We use this instead
+    // of a PL_HashTable to reduce storage requirements
+    nsCachedNetData**   mMapRecordIdToEntry;
+
+    // Length of mMapRecordIdToEntry array
+    PRUint32            mHashArrayLength;
+
+    // Linked list of caches that share this replacement policy
+    CacheInfo*          mCaches;
+
+    // Allocation area for cache entry (nsCachedNetData) instances
+    nsCOMPtr<nsIArena>  mArena;
+
+    // Bookkeeping
+    PRUint32            mRecordsRemovedSinceLastRanking;
+
+    // Maximum permitted length of mRankedEntries array
+    PRUint32            mMaxEntries;
+
+    // Number of occupied slots in mRankedEntries array
+    PRUint32            mNumEntries;
+
+    // Capacity of mRankedEntries array
+    PRUint32            mCapacityRankedEntriesArray;
+
+    // Time at which cache entries were last ranked by profitability
+    PRUint32            mLastRankTime;
+};
+
+
+#endif // _nsReplacementPolicy_h_

mozilla/netwerk/cache/public/Makefile.in

@@ -0,0 +1,39 @@
+#
+# 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@
+
+include $(DEPTH)/config/autoconf.mk
+
+EXPORTS		= \
+		nsICacheManager.h \
+		nsICacheObject.h \
+		nsICachePref.h \
+		nsICacheModule.h \
+		$(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/netwerk/cache/public/Makefile.win

@@ -0,0 +1,41 @@
+#!gmake
+#
+# 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): 
+
+MODULE = nkcache
+
+DEPTH = ..\..\..
+include <$(DEPTH)/config/config.mak>
+
+
+EXPORTS =                   \
+        $(NULL)
+
+XPIDLSRCS =                             \
+        .\nsICachedNetData.idl          \
+        .\nsINetDataCacheManager.idl    \
+        .\nsINetDataCache.idl           \
+        .\nsINetDataCacheRecord.idl     \
+        .\nsINetDataDiskCache.idl       \
+        .\nsIStreamAsFile.idl           \
+        $(NULL)
+
+include <$(DEPTH)/config/rules.mak>
+

mozilla/netwerk/cache/public/nsICachedNetData.idl

@@ -0,0 +1,229 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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): 
+ */
+
+#include "nsrootidl.idl"
+#include "nsISupports.idl"
+
+interface nsIFileSpec;
+interface nsIURI;
+interface nsIObserver;
+interface nsIChannel;
+interface nsINetDataCache;
+interface nsINetDataCacheRecord;
+interface nsILoadGroup;
+interface nsIStreamListener;
+
+/**
+ * The nsICachedNetData interface represents a single entry in a database that
+ * caches data retrieved from the network. This interface is implemented by the
+ * cache manager on top of the low-level nsINetDataCacheRecord and
+ * nsINetDataCache interfaces that are implemented by the database.
+ *
+ * Each cache record may contain both content and metadata.  The content may
+ * be, for example, GIF image data or HTML, and it is accessed through
+ * nsIChannel's streaming API.  The opaque metadata, which may contain HTTP
+ * headers among other things, is stored as a byte array.  Each entry in the
+ * cache is indexed by two different keys: a record id number and a key created
+ * by combining the URI with a "secondary key", e.g. HTTP post data.
+ *
+ * @See nsINetDataCacheRecord
+ * @See nsINetDataCache
+ * @See nsINetDataDiskCache
+ * @See nsINetDataCacheManager
+ */
+[scriptable, uuid(6aeb2a40-6d43-11d3-90c8-000064657374)]
+interface nsICachedNetData : nsISupports
+{
+    /**
+     * String form of the URI provided as an argument to the call to
+     * nsINetDataCacheManager::GetCachedNetData() that created this record.
+     */
+    readonly attribute string uriSpec;
+    
+    /**
+     * Getter for the opaque secondary database key provided as an argument to
+     * the call to nsINetDataCacheManager::GetCachedNetData() that created this
+     * record.
+     */
+    void getSecondaryKey(out unsigned long length,
+                         [retval, size_is(length)] out string secondaryKey);
+
+    /**
+     * This flag may be set by a protocol handler to indicate that it supports
+     * partial fetching of data.  In that case, the cache manager is permitted
+     * to truncate the entry's content to accommodate incoming data for other
+     * cache entries rather than deleting it wholesale.
+     */
+    attribute boolean allowPartial;
+    
+    /**
+     * This flag indicates that the write stream supplying content data for the
+     * cache did not complete normally and, therefore, the content may be
+     * truncated.
+     */
+    readonly attribute boolean partialFlag;
+
+    /**
+     * This flag can be set and cleared by a protocol handler as a form of
+     * self-notification, so as to avoid race conditions in which a protocol
+     * handler issues two identical network requests to fill the same cache
+     * entry.  The cache manager itself largely ignores this flag.
+     */
+    attribute boolean updateInProgress;
+
+    /**
+     * inUse is set if any existing channels are associated with this cache
+     * entry or if the updateInProgess flag is set.  This can be used to
+     * prevent writing to a cache entry by a protocol handler if it's being
+     * read or written elsewhere.
+     */
+    readonly attribute boolean inUse;
+
+    /**
+     * Date/time that the document was last stored on the origin server, as
+     * supplied by the protocol handler.  This value is used as input to the
+     * cache replacement policy, i.e. it is not used for validation.  If the
+     * protocol can't supply a last-modified time, this attribute should remain
+     * unset.  When unset, the value of this attribute is zero.
+     *
+     * FIXME: Should use nsIDateTime interface, once it's created
+     * instead of PRTime, for improved scriptability ? 
+     */
+    attribute PRTime lastModifiedTime;
+
+    /**
+     * Supplied by the protocol handler, the expirationTime attribute specifies
+     * the time until which the document is guaranteed fresh, i.e. the document
+     * does not have to be validated with the server and, therefore, any data
+     * in cache is definitely usable.  The value of this attribute serves as a
+     * hint to the cache replacement policy.  Only one of either staleTime or
+     * expirationTime may be set for a single cache record.  When unset, the
+     * value of this attribute is zero. 
+     */
+    attribute PRTime expirationTime;
+
+    /**
+     * Date/time supplied by the protocol handler, at which point the content
+     * is *likely* to be stale, i.e. the data in the cache may be out-of-date
+     * with respect to the data on the server.  This heuristic date does not
+     * necessarily correspond to the HTTP Expires header, as it does not
+     * determine when cached network data must be validated with the origin
+     * server, but only serves as a hint to the cache replacement policy.  Only
+     * one of either staleTime or expirationTime may be set for a single cache
+     * record.  When unset, the value of this attribute is zero.
+     */
+    attribute PRTime staleTime;
+
+    /**
+     * Date/time of last access of the data in this cache record, as determined
+     * by the cache manager.
+     */
+    readonly attribute PRTime lastAccessTime;
+
+    /**
+     * Number of times this record has been accessed since it was first stored.
+     */
+    readonly attribute PRUint16 numberAccesses;
+
+    /**
+     * Accessor methods for opaque meta-data which can be read and updated
+     * independently of the content data.
+     *
+     * The aTag argument can be used to accommodate multiple clients of the
+     * cache API, each of which wants to store its own private meta-data into
+     * the cache.  For example, there could be a "headers" tag that the HTTP
+     * protocol handler uses to store http response headers and a "image size"
+     * tag used to store the image dimensions of a GIF file.  The aData
+     * argument refers to an opaque blob of arbitrary bytes.
+     *
+     * IMPORTANT: If aData does not contain byte-oriented data, i.e. it's not a
+     *            string, the contents of aData must be byte-swapped by the,
+     *            caller, so as to make the cache files endian-independent.
+     */
+    void getAnnotation(in string aTag, 
+                       out PRUint32 aLength, [size_is(aLength), retval] out string aData);
+    void setAnnotation(in string aTag,
+                       in  PRUint32 aLength, [size_is(aLength)] in string aData);
+
+    /**
+     * As a getter, return the number of content bytes stored in the cache,
+     * i.e. via the nsIChannel streaming APIs.  This may be less than the
+     * complete content length if a partial cache fill occurred.  The cached
+     * content can be truncated by setting the value of this attribute.  The
+     * value of the attribute represents a logical, not a physical, length.  If
+     * compression has been used, the content may consume less storage than
+     * indicated by this attribute.
+     *
+     * When this attribute is set to zero the associated cache disk file, if
+     * any, should be deleted.
+     */
+    attribute PRUint32 storedContentLength;
+
+    /** 
+     * Notify any observers associated with this cache entry of the deletion
+     * request.  If all observers drop their reference to the cache entry,
+     * proceed to delete the underlying cache database record and associated
+     * content storage.
+     */
+    void delete();
+
+    /**
+     * Flush any changes in this entry's data to the cache database.  This
+     * method will automatically be called when the last reference to the cache
+     * is dropped, but it can also be called explicitly for a synchronous
+     * effect.
+     */
+    void commit();
+
+    /**
+     * Parent container cache for this entry.
+     */
+    readonly attribute nsINetDataCache cache;
+
+    /**
+     * Create a channel for reading or writing a stream of content into the
+     * entry.  It is expected that many of the nsIChannel methods return
+     * NS_NOT_IMPLEMENTED, including:
+     *
+     *    + GetURI()
+     *    + GetContentType()
+     *    + GetContentLength()
+     *
+     * Though nsIChannel provides for both async and synchronous I/O APIs, both
+     * may not be implemented.  Only AsyncRead() and OpenOutputStream() is
+     * required.  The aProxyChannel argument allows another channel to be
+     * specified as the proffered argument to nsIStreamListener methods rather
+     * than the cache's own channel.
+     */
+    nsIChannel newChannel(in nsILoadGroup aLoadGroup,
+                          in nsIChannel aProxyChannel);
+
+    /**
+     * This method can be used by a caching protocol handler to store data in
+     * the cache by forking an asynchronous read stream so that it is
+     * simultaneously sent to a requester and written into the cache.  This
+     * method implicitly sets the updateInProgress flag, if it has not already
+     * been set.
+     */
+    nsIStreamListener interceptAsyncRead(in nsIStreamListener aOriginalListener,
+                                         in PRUint32 aStartOffset);
+};

mozilla/netwerk/cache/public/nsINetDataCache.idl

@@ -0,0 +1,143 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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): 
+ */
+
+#include "nsISupports.idl"
+
+interface nsIURI;
+interface nsINetDataCacheRecord;
+interface nsISimpleEnumerator;
+interface nsIFileSpec;
+
+/**
+ * The nsINetDataCache defines the low-level API for a network-data
+ * cache, used to cache the responses to network retrieval commands.
+ * This interface, along with nsINetDataCacheRecord, is implemented by
+ * the memory cache, the file cache and, optionally, by some extension
+ * caches.  This interface is essentially a pseudo-private API for the
+ * cache manager.  Other clients should never use this interface.
+ *
+ * Each cache entry may contain both content, e.g. GIF image data, and
+ * associated metadata, e.g. HTTP headers.  Each entry is indexed by two
+ * different keys: a record id number and a key created by combining the URI
+ * with a "secondary key", e.g. HTTP post data.
+ *
+ * The nsINetDataCache interface is agnostic as to where the data is
+ * stored and whether the storage is volatile or persistent.  The
+ * memory cache, any disk caches and any extension caches must all
+ * implement this interface.
+ *
+ */
+[scriptable, uuid(ccfc58c0-6dde-11d3-90c8-000064657374)]
+interface nsINetDataCache : nsISupports
+{
+	/**
+	 * Human-readable description of the cache module, e.g. "Disk Cache"
+	 */
+	readonly attribute wstring description;
+  
+    /**
+     * Returns true if cached data is available for the given opaque key,
+     * even if only partial data is stored.
+     */
+    boolean contains([size_is(length)] in string key, in PRUint32 length);
+
+    /**
+     * Fetch the cache entry record for the given opaque key.  If one does not
+     * exist, create a new, empty record.
+     */
+    nsINetDataCacheRecord getCachedNetData([size_is(length)] in string key,
+                                           in PRUint32 length);
+
+    /**
+     * Fetch the cache entry record for the given URI using the record ID as a key.
+     */
+    nsINetDataCacheRecord getCachedNetDataByID(in PRInt32 RecordID);
+
+	/**
+	 * False indicates that this cache is entirely bypassed.
+	 */
+    attribute boolean enabled;
+
+    /**
+     * Constants for flags attribute, below
+     */
+
+    // Used for extension caches, e.g. a CD-ROM cache
+    const long READ_ONLY          = 1 << 0;
+
+    // One of these bits must be set
+    const long MEMORY_CACHE       = 1 << 1;
+    const long FLAT_FILE_CACHE    = 1 << 2;
+    const long FILE_PER_URL_CACHE = 1 << 3;
+
+	/**
+	 * See constants defined above.
+	 */
+	readonly attribute PRUint32 flags;
+
+    /**
+     * Total number of URI entries stored in the cache.
+     */
+    readonly attribute PRUint32 numEntries;
+
+    /**
+     * Maximum number of URI entries that may be stored in the cache.
+     */
+    readonly attribute PRUint32 maxEntries;
+
+    /**
+     * Enumerate the URI entries stored in the cache.
+     */
+    nsISimpleEnumerator newCacheEntryIterator();
+
+	/**
+	 * Contains a reference to the next cache in search order.  For the memory
+	 * cache, this attribute always references the disk cache.  For the disk
+	 * cache, it contains a reference to the first extension cache.
+	 */
+    attribute nsINetDataCache nextCache;
+
+    /**
+     * An estimate of the amount of storage occupied by the cache, in kB.
+     * Actual use may be slightly higher than reported due to cache overhead
+     * and heap fragmentation (in the memory cache) or block quantization (in
+     * the disk cache).
+	 */
+    readonly attribute PRUint32 storageInUse;
+
+    /**
+     * Remove all entries from a writable cache.  This could be used, for
+     * example, after a guest ends a browser session.  This is equivalent to
+     * setting the cache's Capacity to zero, except that all cache entries,
+     * even those in active use, will be deleted.  Also, any global cache
+     * database files will be deleted.
+	 */
+    void removeAll();
+};
+
+%{ C++
+// ProgID prefix for Components that implement this interface
+#define NS_NETWORK_CACHE_PROGID "component://netscape/network/cache"
+#define NS_NETWORK_MEMORY_CACHE_PROGID NS_NETWORK_CACHE_PROGID "?name=memory-cache"
+#define NS_NETWORK_FLAT_CACHE_PROGID   NS_NETWORK_CACHE_PROGID "?name=flat-cache"
+#define NS_NETWORK_FILE_CACHE_PROGID   NS_NETWORK_CACHE_PROGID "?name=file-cache"
+%}

mozilla/netwerk/cache/public/nsINetDataCacheManager.idl

@@ -0,0 +1,163 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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): 
+ */
+
+#include "nsISupports.idl"
+
+interface nsISimpleEnumerator;
+interface nsICachedNetData;
+interface nsINetDataCache;
+interface nsINetDataDiskCache;
+interface nsIURI;
+interface nsIFileSpec;
+
+/**
+ * The network-response cache manager is partly responsible for the caching of
+ * content and associated metadata that has been retrieved via the network.
+ * (The remaining responsibility for caching lies with individual network
+ * protocol handlers.)
+ *
+ * The cache manager supervises the actions of individual cache components,
+ * such as the memory cache, the disk cache and any extension caches, e.g. a
+ * read-only CD-ROM cache.
+ *
+ * @See nsINetDataCache
+ * @See nsICachedNetData
+ */
+[scriptable, uuid(71c8ab00-6d5c-11d3-90c8-000064657374)]
+interface nsINetDataCacheManager : nsISupports
+{
+    /**
+     * Flag for the GetCachedNetData() method: If set, the memory cache is
+     * neither searched nor will any data be stored into it.  This might be
+     * appropriate, for example, with images, because they have their own
+     * cache for storing *decoded* images.
+     */
+    const unsigned long BYPASS_MEMORY_CACHE       = 1 << 0;
+
+    /**
+     * Flag for the GetCachedNetData() method: If set, the disk cache
+     * is neither searched nor will any be data stored into it.
+     * However, read-only extension caches may be searched.  This
+     * might be used to avoid leaving persistent records of secure
+     * data.
+     */
+    const unsigned long BYPASS_PERSISTENT_CACHE   = 1 << 1;
+
+    /**
+     * Flag for the GetCachedNetData() method: If set, any stream
+     * content is stored in the cache as a single disk file.  Content
+     * will not be cached in the memory cache nor is it cached in a
+     * flat-file cache database.  This is used to implement the jar
+     * protocol handler and to provide the stream-as-file semantics
+     * required by the classic bowser plugin API.
+     */
+    const unsigned long CACHE_AS_FILE             = 1 << 2;
+
+    /**
+     * Fetch the cache entry record for the given URI.  If one does not exist,
+     * create a new, empty record.  The normal search order for caches is:
+     *   + Memory cache
+     *   + Disk cache
+     *   + File cache (stream-as-file cache)
+     *   + All extension caches
+     *
+     * When writing, data is typically stored in both the memory cache and the
+     * disk cache.  Both the search order and this write policy can be modified by
+     * setting one or more of the flag argument bits, as defined above.
+     *
+     * The optionally-NULL secondaryKey argument can be used, e.g. for form
+     * post data or for HTTP headers in the case of HTTP.
+     */
+    nsICachedNetData getCachedNetData(in string uri,
+                                      [size_is(secondaryKeyLength)] in string secondaryKey,
+                                      in PRUint32 secondaryKeyLength,
+                                      in PRUint32 flags);
+
+    /**
+     * Returns true if cached content is available for the given URI, even if
+     * only partial data is stored.  The flags argument behaves the same as for
+     * the GetCachedNetData() method, above.
+     */
+    boolean contains(in string uri,
+                     [size_is(secondaryKeyLength)] in string secondaryKey,
+                     in PRUint32 secondaryKeyLength,
+                     in PRUint32 flags);
+
+    /**
+     * Total number of unexpired URI entries stored in all caches.  This number
+     * does not take into account duplicate URIs, e.g. because the memory cache
+     * and the disk cache might each contain an entry for the same URI.
+     */
+    readonly attribute PRUint32 numEntries;
+
+    /**
+     * Enumerate the unexpired URI entries stored in all caches.  Some URIs may
+     * be enumerated more than once, e.g.  because the the memory cache and the
+     * disk cache might each contain an entry for the same URI.
+     */
+    nsISimpleEnumerator newCacheEntryIterator();
+
+    /*
+     * Enumerate all the loaded nsINetDataCache-implementing cache modules.
+     * The first module enumerated will be the memory cache, the second will be
+     * the disk cache, then the file cache, followed by all the extension
+     * caches, in search order. 
+     */
+    nsISimpleEnumerator newCacheModuleIterator();
+
+    /**
+     * Remove all entries from all writable caches.  This could be used, for
+     * example, after a guest ends a browser session.  This is equivalent to
+     * setting the DiskCacheCapacity to zero, except that all cache entries,
+     * even those in active use, will be deleted.  Also, any global cache
+     * database files will be deleted.
+     */
+    void RemoveAll();
+
+    /**
+     * The disk cache is made up of the file cache (for stream-as-file
+     * requests) and a (possibly independent) persistent cache that handles all
+     * other cache requests.  This attribute sets/gets the combined capacity of
+     * these caches, measured in KBytes.  Setting the capacity lower than the
+     * current amount of space currently in use may cause cache entries to be
+     * evicted from the cache to accomodate the requested capacity.
+     */
+    attribute PRUint32 diskCacheCapacity;
+
+    /**
+     * This attribute sets/gets the capacity of the memory cache, measured in
+     * KBytes.  Setting the capacity lower than the current amount of space
+     * currently in use may cause cache entries to be evicted from the cache to
+     * accomodate the requested capacity.
+     */
+    attribute PRUint32 memCacheCapacity;
+
+	/**
+	 * This attribute must be set before attempting to store into the disk cache.
+	 */
+    attribute nsIFileSpec diskCacheFolder;
+};
+
+%{ C++
+// ProgID prefix for Components that implement this interface
+#define NS_NETWORK_CACHE_MANAGER_PROGID NS_NETWORK_CACHE_PROGID "?name=manager"
+%}

mozilla/netwerk/cache/public/nsINetDataCacheRecord.idl

@@ -0,0 +1,125 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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): 
+ */
+
+#include "nsISupports.idl"
+#include "nsrootidl.idl"
+
+interface nsIFileSpec;
+interface nsIChannel;
+interface nsINetDataCache;
+
+/**
+ * The nsINetDataCacheRecord represents a single entry in a database that
+ * caches data retrieved from the network. On top of this low-level interface
+ * to the raw record data, the cache manager implements a higher-level record
+ * interface, nsICachedNetData.  Each instance of nsINetDataCacheRecord is
+ * (internally) associated with a parent database, an instance of the
+ * nsINetDataCache interface.  This interface is essentially a pseudo-private
+ * API for the cache manager.  Other clients should never use this interface.
+ *
+ * Each cache record may contain both content and metadata.  The content may
+ * be, for example, GIF image data or HTML, and it is accessed through
+ * nsIChannel's streaming API.  The opaque metadata, which may contain HTTP
+ * headers among other things, is accessed as a contiguous byte array.  Each
+ * entry in the cache is indexed by two different keys: a unique record id
+ * number, generated by the cache, and an opaque string.  The latter contains
+ * the URI and other secondary key information, e.g. HTTP form post key/value
+ * pairs.
+ *
+ * The nsINetDataCacheRecord interface is agnostic as to where the data is
+ * stored and whether the storage is volatile or persistent.  The memory cache,
+ * the disk cache, a flat-file cache and any read-only extension caches must
+ * all implement this interface.
+ *
+ * @See nsICachedNetData
+ * @See nsINetDataCache
+ * @See nsINetDataDiskCache
+ * @See nsINetDataCacheManager
+ */
+
+interface nsILoadGroup;
+
+[scriptable, uuid(fdcdd6a0-7461-11d3-90ca-0040056a906e)]
+interface nsINetDataCacheRecord : nsISupports
+{
+    /**
+     * As far as the nsINetDataCacheRecord implementation is concerned, the
+     * cache entry database key is an opaque blob, but it's intended to contain
+     * both the URI and any secondary keys, such as HTTP post data.
+     */
+    void getKey(out unsigned long length, [size_is(length), retval] out string key);
+
+    /**
+     * A persistent record number assigned by the cache which must be unique
+     * among all entries stored within the same cache.  The record ID serves as
+     * an alternate key to the cache record.  Providing that they satisfy the
+     * afforementioned uniqueness requirement, record IDs can be assigned any
+     * value by the database except that they may never be zero.
+     */
+    readonly attribute PRInt32 recordID;
+
+    /**
+     * Opaque data which can be updated for each cache entry independently of
+     * the content data.  This data is a combination of protocol-independent
+     * data provided by the cache manager and protocol-specific meta-data,
+     * e.g. HTTP headers.
+     */
+    void getMetaData(out PRUint32 length, [size_is(length), retval] out string metaData);
+    void setMetaData(in  PRUint32 length, [size_is(length)] in string data);
+
+    /**
+     * Number of content bytes stored in the cache, i.e. via the nsIChannel
+     * streaming APIs.  This may be less than the complete content length if a
+     * partial cache fill occurred.  Additionally, the cached content can be
+     * truncated by reducing the value of this attribute.  When this attribute
+     * is set to zero the associated cache disk file, if any, should be
+     * deleted.
+     */
+    attribute PRUint32 storedContentLength;
+
+    /** 
+     * Delete this cache entry and its associated content.
+     */
+    void delete();
+
+    /**
+     * Create a channel for reading or writing a stream of content into the
+     * entry.  However, many of the nsIChannel methods may return
+     * NS_NOT_IMPLEMENTED, including:
+     *
+     *    + GetURI()
+     *    + GetContentType()
+     *    + GetContentLength()
+     */
+    nsIChannel newChannel(in nsILoadGroup loadGroup);
+
+    /**
+     * If a cache is implemented such that it stores each URI's content in an
+     * individual disk file, this method will identify the file corresponding
+     * to this record.  This may be used to implement the "stream-as-file"
+     * semantics required by some plugins and by the 'jar:' protocol handler.
+     * However, not all cache implementations are *required* to store the data
+     * from each URI in an individual file, so it is acceptable for an
+     * implementation of this method to signal NS_NOT_IMPLEMENTED.
+     */
+    readonly attribute nsIFileSpec filename;
+};

mozilla/netwerk/cache/public/nsINetDataDiskCache.idl

@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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): 
+ */
+
+#include "nsINetDataCache.idl"
+
+interface nsIFileSpec;
+
+/**
+/**
+ * A network-data disk cache is used to persistently cache the responses to
+ * network retrieval commands.  Each cache entry may contain both content,
+ * e.g. GIF image data, and associated metadata, e.g. HTTP headers.
+ */
+[scriptable, uuid(6408e390-6f13-11d3-90c8-000064657374)]
+interface nsINetDataDiskCache : nsINetDataCache
+{
+	/**
+	 * This attribute must be set before calling any other methods of this
+	 * interface.
+	 */
+    attribute nsIFileSpec diskCacheFolder;
+};
+

mozilla/netwerk/cache/public/nsIStreamAsFile.idl

@@ -0,0 +1,106 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+#include "nsrootidl.idl"
+#include "nsISupports.idl"
+
+interface nsIFileSpec;
+interface nsIStreamAsFileObserver;
+
+/**
+ * In addition to enhancing effective network response time via caching, the
+ * cache manager serves a second purpose by providing the stream-as-file
+ * service required by traditional browser plugins and the jar: protocol
+ * handler.  The interface below provides a means for a client to determine the
+ * filename associated with a stream and to detect modification/deletion of
+ * that file.
+ */
+[scriptable, uuid(0eedbbf0-92d9-11d3-90d3-0040056a906e)]
+interface nsIStreamAsFile : nsISupports
+{
+    /**
+     * Filename containing stream-as-file
+     */
+    readonly attribute nsIFileSpec fileSpec;
+
+    /**
+     * Add an observer for this cache record.  When the cache wants to delete
+     * or truncate a record, so as to make space for another cache entry's
+     * content data, it will call <code>aObserver</code>'s Observe() method,
+     * passing the nsIStreamAsFile instance as the <code>aSubject</code>
+     * argument and an appropriate message.  If the observer does not wish to
+     * inhibit deletion/truncation, it should Release() any references it has to the
+     * cache record.
+     *
+     * @See nsIStreamAsFileObserver
+     */
+    void addObserver(in nsIStreamAsFileObserver aObserver);
+
+    /**
+     * Delete an observer that was added by the AddObserver() method.
+     */
+    void removeObserver(in nsIStreamAsFileObserver aObserver);
+};
+
+/**
+ * This interface can be implemented by a client to receive notifications of
+ * either modification or deletion of a file created by the cache manager using
+ * the stream-as-file semantics.
+ */
+[scriptable, uuid(a26e27c0-92da-11d3-90d3-0040056a906e)]
+interface nsIStreamAsFileObserver : nsISupports
+{
+    /**
+     * Flag bits for argument to Observe() method.
+     */
+    const long NOTIFY_AVAILABLE    = 1 << 0; // Stream-as-file now available for reading
+    const long NOTIFY_ERROR        = 1 << 1; // Error while loading stream / creating file
+    const long REQUEST_DELETION    = 1 << 2; // Cache manager wishes to delete/truncate file
+    const long INVALIDATE          = 1 << 3; // File is out-of-date
+
+    // Convenience value
+    const long MAKE_UNAVAILABLE    = REQUEST_DELETION | INVALIDATE;
+    
+    /**
+     * Receive either a notification or a request concerning a file that has
+     * been opened using stream-as-file.  The aMessage and aError arguments
+     * have varying values depending on the nature of the notification.
+     * aMessage is set to NOTIFY_AVAILABLE when a complete stream has been read
+     * and stored on disk in a file.  At that point, and no sooner, may the
+     * filename attribute of the associated nsIStreamAsFile be accessed via the
+     * associated nsIStreamAsFile interface.  If the aMessage argument is
+     * NOTIFY_ERROR, the aError argument contains the relevant error code.  If
+     * the aMessage argument is either REQUEST_DELETION or REQUEST_TRUNCATION,
+     * the callee should immediately Release() all references to the
+     * nsIStreamAsFile (and any references to its associated nsICachedNetData
+     * instances), unless it wishes to inhibit the requested file modification.
+     * If the aMessage argument is INVALIDATE, the cache manager is replacing
+     * the file with a more recent version.  If a client wants to continue
+     * using the (now out-of-date) file, it must delete it when it has finished,
+     * as the cache manager will effectively relinquished ownership of the
+     * file.
+     */
+    void ObserveStreamAsFile(in nsIStreamAsFile aStreamAsFile,
+			     in PRUint32 aMessage,
+			     in nsresult aError);
+};

mozilla/security/psm/lib/Makefile

@@ -1,74 +0,0 @@
-#! 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/client/MANIFEST

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

mozilla/security/psm/lib/client/Makefile

@@ -1,74 +0,0 @@
-#! 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

@@ -1,70 +0,0 @@
-#! 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)
-
-EXTRA_DSO_LDOPTS	+= -L$(DIST)/bin -lprotocol
-
-include $(topsrcdir)/config/rules.mk
-

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

@@ -1,99 +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 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

@@ -1,111 +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 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

@@ -1,480 +0,0 @@
-/* -*- 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

@@ -1,216 +0,0 @@
-/* -*- 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.
- */
-#ifdef XP_UNIX
-#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

@@ -1,56 +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 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

@@ -1,484 +0,0 @@
-/* -*- 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.
- */
-#ifdef XP_UNIX
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/stat.h>
-#include <netinet/tcp.h>
-#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>
-
-#ifdef XP_UNIX
-#define DIRECTORY_SEPARATOR '/'
-#elif defined WIN32
-#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
-    return getcwd(buf, maxLen);
-#else
-    return NULL;
-#endif
-}
-
-static void
-setWorkingDir(char *path)
-{
-#if defined WIN32
-    _chdir(path);
-#elif defined XP_UNIX
-    chdir(path);
-#else
-    return;
-#endif
-}
-
-static CMTStatus
-launch_psm(char *executable)
-{
-    char command[MAX_PATH_LEN];
-#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
-    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;
-    char *executable;
-    char *newWorkingDir;
-    char oldWorkingDir[MAX_PATH_LEN];
-    int i;
-    char *path = NULL;
-    size_t stringLen;
-
-    /*	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
-    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

@@ -1,556 +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 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

@@ -1,555 +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 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

@@ -1,75 +0,0 @@
-/* -*- 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

@@ -1,40 +0,0 @@
-/* -*- 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

@@ -1,119 +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 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

@@ -1,636 +0,0 @@
-/* -*- 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.
- */
-#ifdef XP_UNIX
-#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];
-
-    /* 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.
-     */
-#ifndef XP_MAC
-    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;
-                }
-                priv->cb(priv->cb_arg, buf, nbytes);
-            }
-        }
-    }
-    
-    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;
-
-    /* Do some parameter checking */
-    if (!control || !scertRID || !ecertRID || !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;
-    }
-
-    /* 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 (CMT_DecodeMessage(CreateContentInfoReplyTemplate, &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;
-    unsigned long 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

@@ -1,479 +0,0 @@
-/* -*- 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.
- */
-#ifdef XP_UNIX
-#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

@@ -1,270 +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 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

@@ -1,237 +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 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

@@ -1,467 +0,0 @@
-/* -*- 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.
- */
-#ifdef XP_UNIX
-#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

@@ -1,636 +0,0 @@
-/* -*- 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.
- */
-#ifdef XP_UNIX
-#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_SendMessage(PCMT_CONTROL control, CMTItem* message)
-{
-	CMTStatus status;
-    CMUint32 msgCategory;
-    CMBool done = CM_FALSE;
-#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;
-	}
-
-    /* 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;
-        }
-    }
-
-    /* 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, rv;
-
-    /* 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, rv;
-
-    /* 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;
-
-    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

@@ -1,75 +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 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);
-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

@@ -1,44 +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 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

@@ -1,125 +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 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)
-
-#//------------------------------------------------------------------------
-#//
-#// 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

@@ -1,64 +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 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

@@ -1,128 +0,0 @@
-#! 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

@@ -1,250 +0,0 @@
-/* -*- 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

@@ -1,69 +0,0 @@
-/* -*- 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

@@ -1,44 +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 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

@@ -1,52 +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 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

@@ -1,346 +0,0 @@
-/* -*- 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)
-    profile = getenv("LOGNAME");
-    sprintf(profileDir, "%s/.netscape", getenv("HOME"));
-#else
-#error Teach me how to fill in the user profile.
-#endif
-    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

@@ -1,99 +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 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

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

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

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

mozilla/security/psm/lib/manifest.mn

@@ -1,43 +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 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/protocol/MANIFEST

@@ -1,3 +0,0 @@
-obscure.h
-rsrcids.h
-ssmdefs.h

mozilla/security/psm/lib/protocol/Makefile

@@ -1,74 +0,0 @@
-#! 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/protocol/Makefile.in

@@ -1,64 +0,0 @@
-#! 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 = protocol
-MODULE = security
-
-EXPORTS = \
-	protocol.h \
-	protocolf.h \
-	protocolport.h \
-	protocolnspr20.h \
-	protocolshr.h \
-	ssmdefs.h \
-	rsrcids.h \
-	messages.h \
-	newproto.h \
-	$(NULL)
-
-
-CSRCS  = newproto.c \
-	 templates.c \
-	 protocolshr.c \
-	 $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

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

@@ -1,44 +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 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/protocol/makefile.win

@@ -1,124 +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 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=protocol
-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)\newproto.obj  \
-    .\$(OBJDIR)\templates.obj \
-    .\$(OBJDIR)\protocolshr.obj \
-    $(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= protocol.h \
-   protocolf.h \
-   protocolport.h \
-   protocolnspr20.h \
-   protocolshr.h \
-   ssmdefs.h \
-   rsrcids.h \
-   messages.h \
-   newproto.h \
-   $(NULL)
-
-#//------------------------------------------------------------------------
-#//
-#// Include the common makefile rules
-#//
-#//------------------------------------------------------------------------
-include <$(DEPTH)/config/rules.mak>
-
-install:: $(LIBRARY)
-    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-export:: INSTALL_FILES
-

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

@@ -1,65 +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 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 = ../../..
-
-EXPORTS = \
-	protocol.h \
-	protocolf.h \
-	protocolport.h \
-	protocolnspr20.h \
-	protocolshr.h \
-	ssmdefs.h \
-	rsrcids.h \
-	messages.h \
-	newproto.h \
-	$(NULL)
-
-MODULE = security
-CSRCS  = newproto.c \
-	 protocolshr.c \
-	 templates.c \
-	 $(NULL)
-
-ifeq ($(subst /,_,$(shell uname -s)),OS2)
-	CSRCS += os2_rand.c
-endif
-
-#	mac_rand.c
-#	unix_rand.c
-#	win_rand.c
-#	prelib.c
-
-REQUIRES = security dbm nspr
-
-LIBRARY_NAME = protocol

mozilla/security/psm/lib/protocol/messages.h

@@ -1,620 +0,0 @@
-/* -*- 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 __MESSAGES_H__
-#define __MESSAGES_H__
-
-#include "newproto.h"
-
-typedef struct SingleNumMessage {
-  CMInt32 value;
-} SingleNumMessage;
-
-extern CMTMessageTemplate SingleNumMessageTemplate[];
-
-typedef struct SingleStringMessage {
-  char *string;
-} SingleStringMessage;
-
-extern CMTMessageTemplate SingleStringMessageTemplate[];
-
-typedef struct SingleItemMessage {
-  CMTItem item;
-} SingleItemMessage;
-
-extern CMTMessageTemplate SingleItemMessageTemplate[];
-
-typedef struct HelloRequest {
-  CMInt32 version;
-  CMInt32 policy;
-  CMBool doesUI;
-  char *profile;
-  char* profileDir;
-} HelloRequest;
-
-extern CMTMessageTemplate HelloRequestTemplate[];
-
-typedef struct HelloReply {
-  CMInt32 result;
-  CMInt32 sessionID;
-  CMInt32 version;
-  CMInt32 httpPort;
-  CMInt32 policy;
-  CMTItem nonce;
-  char *stringVersion;
-} HelloReply;
-
-extern CMTMessageTemplate HelloReplyTemplate[];
-
-typedef struct SSLDataConnectionRequest {
-  CMInt32 flags;
-  CMInt32 port;
-  char *hostIP;
-  char *hostName;
-  CMBool forceHandshake;
-  CMTItem clientContext;
-} SSLDataConnectionRequest;
-
-extern CMTMessageTemplate SSLDataConnectionRequestTemplate[];
-
-typedef struct TLSDataConnectionRequest {
-    CMInt32 port;
-    char* hostIP;
-    char* hostName;
-} TLSDataConnectionRequest;
-
-extern CMTMessageTemplate TLSDataConnectionRequestTemplate[];
-
-typedef struct TLSStepUpRequest {
-    CMUint32 connID;
-    CMTItem clientContext;
-} TLSStepUpRequest;
-
-extern CMTMessageTemplate TLSStepUpRequestTemplate[];
-
-typedef struct ProxyStepUpRequest {
-    CMUint32 connID;
-    CMTItem clientContext;
-    char* url;
-} ProxyStepUpRequest;
-
-extern CMTMessageTemplate ProxyStepUpRequestTemplate[];
-
-typedef struct PKCS7DataConnectionRequest {
-    CMUint32 resID;
-    CMTItem clientContext;
-} PKCS7DataConnectionRequest;
-
-extern CMTMessageTemplate PKCS7DataConnectionRequestTemplate[];
-
-typedef struct DataConnectionReply {
-  CMInt32 result;
-  CMInt32 connID;
-  CMInt32 port;
-} DataConnectionReply;
-
-extern CMTMessageTemplate DataConnectionReplyTemplate[];
-
-typedef struct UIEvent {
-  CMInt32 resourceID;
-  CMInt32 width;
-  CMInt32 height;
-  CMBool isModal;
-  char *url;
-  CMTItem clientContext;
-} UIEvent;
-
-extern CMTMessageTemplate UIEventTemplate[];
-extern CMTMessageTemplate OldUIEventTemplate[];
-
-typedef struct TaskCompletedEvent {
-  CMInt32 resourceID;
-  CMInt32 numTasks;
-  CMInt32 result;
-} TaskCompletedEvent;
-
-extern CMTMessageTemplate TaskCompletedEventTemplate[];
-
-typedef struct VerifyDetachedSigRequest {
-  CMInt32 pkcs7ContentID;
-  CMInt32 certUsage;
-  CMInt32 hashAlgID;
-  CMBool keepCert;
-  CMTItem hash;
-} VerifyDetachedSigRequest;
-
-extern CMTMessageTemplate VerifyDetachedSigRequestTemplate[];
-
-typedef struct CreateSignedRequest {
-  CMInt32 scertRID;
-  CMInt32 ecertRID;
-  CMInt32 dig_alg;
-  CMTItem digest;
-} CreateSignedRequest;
-
-extern CMTMessageTemplate CreateSignedRequestTemplate[];
-
-typedef struct CreateContentInfoReply {
-  CMInt32 ciRID;
-  CMInt32 result;
-  CMInt32 errorCode;
-} CreateContentInfoReply;
-
-extern CMTMessageTemplate CreateContentInfoReplyTemplate[];
-
-typedef struct CreateEncryptedRequest {
-  CMInt32 scertRID;
-  CMInt32 nrcerts;
-  CMInt32 *rcertRIDs;
-} CreateEncryptedRequest;
-
-extern CMTMessageTemplate CreateEncryptedRequestTemplate[];
-
-typedef struct CreateResourceRequest {
-  CMInt32 type;
-  CMTItem params;
-} CreateResourceRequest;
-
-extern CMTMessageTemplate CreateResourceRequestTemplate[];
-
-typedef struct CreateResourceReply {
-  CMInt32 result;
-  CMInt32 resID;
-} CreateResourceReply;
-
-extern CMTMessageTemplate CreateResourceReplyTemplate[];
-
-typedef struct GetAttribRequest {
-  CMInt32 resID;
-  CMInt32 fieldID;
-} GetAttribRequest;
-
-extern CMTMessageTemplate GetAttribRequestTemplate[];
-
-typedef struct GetAttribReply {
-  CMInt32 result;
-  SSMAttributeValue value;
-} GetAttribReply;
-
-extern CMTMessageTemplate GetAttribReplyTemplate[];
-
-typedef struct SetAttribRequest {
-  CMInt32 resID;
-  CMInt32 fieldID;
-  SSMAttributeValue value;
-} SetAttribRequest;
-
-extern CMTMessageTemplate SetAttribRequestTemplate[];
-
-typedef struct PickleResourceReply {
-    CMInt32 result;
-    CMTItem blob;
-} PickleResourceReply;
-
-extern CMTMessageTemplate PickleResourceReplyTemplate[];
-
-typedef struct UnpickleResourceRequest {
-  CMInt32 resourceType;
-  CMTItem resourceData;
-} UnpickleResourceRequest;
-
-extern CMTMessageTemplate UnpickleResourceRequestTemplate[];
-
-typedef struct UnpickleResourceReply {
-    CMInt32 result;
-    CMInt32 resID;
-} UnpickleResourceReply;
-
-extern CMTMessageTemplate UnpickleResourceReplyTemplate[];
-
-typedef struct PickleSecurityStatusReply {
-    CMInt32 result;
-    CMInt32 securityLevel;
-    CMTItem blob;
-} PickleSecurityStatusReply;
-
-extern CMTMessageTemplate PickleSecurityStatusReplyTemplate[];
-
-typedef struct DupResourceReply {
-    CMInt32 result;
-    CMUint32 resID;
-} DupResourceReply;
-
-extern CMTMessageTemplate DupResourceReplyTemplate[];
-
-typedef struct DestroyResourceRequest {
-  CMInt32 resID;
-  CMInt32 resType;
-} DestroyResourceRequest;
-
-extern CMTMessageTemplate DestroyResourceRequestTemplate[];
-
-typedef struct VerifyCertRequest {
-  CMInt32 resID;
-  CMInt32 certUsage;
-} VerifyCertRequest;
-
-extern CMTMessageTemplate VerifyCertRequestTemplate[];
-
-typedef struct AddTempCertToDBRequest {
-  CMInt32 resID;
-  char *nickname;
-  CMInt32 sslFlags;
-  CMInt32 emailFlags;
-  CMInt32 objSignFlags;
-} AddTempCertToDBRequest;
-
-extern CMTMessageTemplate AddTempCertToDBRequestTemplate[];
-
-typedef struct MatchUserCertRequest {
-  CMInt32 certType;
-  CMInt32 numCANames;
-  char **caNames;
-} MatchUserCertRequest;
-
-extern CMTMessageTemplate MatchUserCertRequestTemplate[];
-
-typedef struct MatchUserCertReply {
-  CMInt32 numCerts;
-  CMInt32 *certs;
-} MatchUserCertReply;
-
-extern CMTMessageTemplate MatchUserCertReplyTemplate[];
-
-typedef struct EncodeCRMFReqRequest {
-    CMInt32 numRequests;
-    CMInt32 * reqIDs;
-} EncodeCRMFReqRequest;
-
-extern CMTMessageTemplate EncodeCRMFReqRequestTemplate[];
-
-typedef struct CMMFCertResponseRequest {
-    char *nickname;
-    char *base64Der;
-    CMBool doBackup;
-    CMTItem clientContext;
-} CMMFCertResponseRequest;
-
-extern CMTMessageTemplate CMMFCertResponseRequestTemplate[];
-
-typedef struct PasswordRequest {
-    CMInt32 tokenKey;
-    char *prompt;
-    CMTItem clientContext;
-} PasswordRequest;
-
-extern CMTMessageTemplate PasswordRequestTemplate[];
-
-typedef struct PasswordReply {
-    CMInt32 result;
-    CMInt32 tokenID;
-    char * passwd;
-} PasswordReply;
-
-extern CMTMessageTemplate PasswordReplyTemplate[];
-
-typedef struct KeyPairGenRequest {
-    CMInt32 keyGenCtxtID;
-    CMInt32 genMechanism;
-    CMInt32 keySize;
-    CMTItem params;
-} KeyPairGenRequest;
-
-extern CMTMessageTemplate KeyPairGenRequestTemplate[];
-
-typedef struct DecodeAndCreateTempCertRequest {
-    CMInt32 type;
-    CMTItem cert;
-} DecodeAndCreateTempCertRequest;
-
-extern CMTMessageTemplate DecodeAndCreateTempCertRequestTemplate[];
-
-typedef struct GenKeyOldStyleRequest {
-    char *choiceString;
-    char *challenge;
-    char *typeString;
-    char *pqgString;
-} GenKeyOldStyleRequest;
-
-extern CMTMessageTemplate GenKeyOldStyleRequestTemplate[];
-
-typedef struct GenKeyOldStyleTokenRequest {
-    CMInt32 rid;
-    CMInt32 numtokens;
-    char ** tokenNames;
-} GenKeyOldStyleTokenRequest;
-
-extern CMTMessageTemplate GenKeyOldStyleTokenRequestTemplate[];
-
-typedef struct GenKeyOldStyleTokenReply {
-    CMInt32 rid;
-    CMBool cancel;
-    char * tokenName;
-} GenKeyOldStyleTokenReply;
-
-extern CMTMessageTemplate GenKeyOldStyleTokenReplyTemplate[];
-
-typedef struct GenKeyOldStylePasswordRequest {
-    CMInt32 rid;
-    char * tokenName;
-    CMBool internal;
-    CMInt32 minpwdlen;
-    CMInt32 maxpwdlen;
-} GenKeyOldStylePasswordRequest;
-
-extern CMTMessageTemplate GenKeyOldStylePasswordRequestTemplate[];
-
-typedef struct GenKeyOldStylePasswordReply {
-    CMInt32 rid;
-    CMBool cancel;
-    char * password;
-} GenKeyOldStylePasswordReply;
-
-extern CMTMessageTemplate GenKeyOldStylePasswordReplyTemplate[];
-
-typedef struct GetKeyChoiceListRequest {
-    char *type;
-    char *pqgString;
-} GetKeyChoiceListRequest;
-
-extern CMTMessageTemplate GetKeyChoiceListRequestTemplate[];
-
-typedef struct GetKeyChoiceListReply {
-    CMInt32 nchoices;
-    char **choices;
-} GetKeyChoiceListReply;
-
-extern CMTMessageTemplate GetKeyChoiceListReplyTemplate[];
-
-typedef struct AddNewSecurityModuleRequest {
-    char *moduleName;
-    char *libraryPath;
-    CMInt32 pubMechFlags;
-    CMInt32 pubCipherFlags;
-} AddNewSecurityModuleRequest;
-
-extern CMTMessageTemplate AddNewSecurityModuleRequestTemplate[];
-
-typedef struct FilePathRequest {
-    CMInt32 resID;
-    char *prompt;
-    CMBool getExistingFile;
-    char *fileRegEx;
-} FilePathRequest;
-
-extern CMTMessageTemplate FilePathRequestTemplate[];
-
-typedef struct FilePathReply {
-    CMInt32 resID;
-    char *filePath;
-} FilePathReply;
-
-extern CMTMessageTemplate FilePathReplyTemplate[];
-
-typedef struct PasswordPromptReply {
-    CMInt32 resID;
-    char *promptReply;
-} PasswordPromptReply;
-
-extern CMTMessageTemplate PasswordPromptReplyTemplate[];
-
-typedef struct SignTextRequest {
-    CMInt32 resID;
-    char *stringToSign;
-    char *hostName;
-    char *caOption;
-    CMInt32 numCAs;
-    char** caNames;
-} SignTextRequest;
-
-extern CMTMessageTemplate SignTextRequestTemplate[];
-
-typedef struct GetLocalizedTextReply {
-    CMInt32 whichString;
-    char *localizedString;
-} GetLocalizedTextReply;
-
-extern CMTMessageTemplate GetLocalizedTextReplyTemplate[];
-
-typedef struct ImportCertReply {
-    CMInt32 result;
-    CMInt32 resID;
-} ImportCertReply;
-
-extern CMTMessageTemplate ImportCertReplyTemplate[];
-
-typedef struct PromptRequest {
-    CMInt32 resID;
-    char *prompt;
-    CMTItem clientContext;
-} PromptRequest;
-
-extern CMTMessageTemplate PromptRequestTemplate[];
-
-typedef struct PromptReply {
-    CMInt32 resID;
-    CMBool cancel;
-    char *promptReply;
-} PromptReply;
-
-extern CMTMessageTemplate PromptReplyTemplate[];
-
-typedef struct RedirectCompareReqeust {
-    CMTItem socketStatus1Data;
-    CMTItem socketStatus2Data;
-} RedirectCompareRequest;
-
-extern CMTMessageTemplate RedirectCompareRequestTemplate[];
-
-typedef struct DecodeAndAddCRLRequest {
-    CMTItem  derCrl;
-    CMUint32 type;
-    char *url;
-} DecodeAndAddCRLRequest;
-
-extern CMTMessageTemplate DecodeAndAddCRLRequestTemplate[];
-
-typedef struct SecurityAdvisorRequest {
-    CMInt32 infoContext;
-    CMInt32 resID;
-    char * hostname;
-	char * senderAddr;
-    CMUint32 encryptedP7CInfo;
-    CMUint32 signedP7CInfo;
-    CMInt32 decodeError;
-    CMInt32 verifyError;
-	CMBool encryptthis;
-	CMBool signthis;
-	CMInt32 numRecipients;
-	char ** recipients;
-} SecurityAdvisorRequest;
-
-extern CMTMessageTemplate SecurityAdvisorRequestTemplate[];
-
-/* "SecurityConfig" javascript related message templates */
-typedef struct SCAddTempCertToPermDBRequest {
-    CMTItem certKey;
-    char* trustStr;
-    char* nickname;
-} SCAddTempCertToPermDBRequest;
-
-extern CMTMessageTemplate SCAddTempCertToPermDBRequestTemplate[];
-
-typedef struct SCDeletePermCertsRequest {
-    CMTItem certKey;
-    CMBool deleteAll;
-} SCDeletePermCertsRequest;
-
-extern CMTMessageTemplate SCDeletePermCertsRequestTemplate[];
-
-typedef struct TimeMessage {
-    CMInt32 year;
-    CMInt32 month;
-    CMInt32 day;
-    CMInt32 hour;
-    CMInt32 minute;
-    CMInt32 second;
-} TimeMessage;
-
-extern CMTMessageTemplate TimeMessageTemplate[];
-
-typedef struct CertEnumElement {
-    char* name;
-    CMTItem certKey;
-} CertEnumElement;
-
-typedef struct SCCertIndexEnumReply {
-      int length;
-      CertEnumElement* list;
-} SCCertIndexEnumReply;
-
-extern CMTMessageTemplate SCCertIndexEnumReplyTemplate[];
-
-/* Test message */
-typedef struct TestListElement {
-	char * name;
-	char * value;
-} TestListElement;
-
-typedef struct TestList {
-	char *listName;
-	int numElements;
-	TestListElement *elements;
-} TestList;
-
-extern CMTMessageTemplate TestListTemplate[];
-
-/* Preference-related structs */
-typedef struct SetPrefElement {
-    char* key;
-    char* value;
-    CMInt32 type;
-} SetPrefElement;
-
-typedef struct SetPrefListMessage {
-    int length;
-    SetPrefElement* list;
-} SetPrefListMessage;
-
-extern CMTMessageTemplate SetPrefListMessageTemplate[];
-
-typedef struct GetPrefElement {
-    char* key;
-    CMInt32 type;
-} GetPrefElement;
-
-typedef struct GetPrefListRequest {
-    int length;
-    GetPrefElement* list;
-} GetPrefListRequest;
-
-extern CMTMessageTemplate GetPrefListRequestTemplate[];
-
-typedef struct GetCertExtension {
-    CMUint32 resID;
-    CMUint32 extension;
-} GetCertExtension;
-
-extern CMTMessageTemplate GetCertExtensionTemplate[];
-
-typedef struct HTMLCertInfoRequest {
-    CMUint32 certID;
-    CMUint32 showImages;
-    CMUint32 showIssuer;
-} HTMLCertInfoRequest;
-
-extern CMTMessageTemplate HTMLCertInfoRequestTemplate[];
-
-typedef struct EncryptRequestMessage
-{
-  CMTItem keyid;  /* May have length 0 for default */
-  CMTItem data;
-  CMTItem ctx;  /* serialized void* ptr */
-} EncryptRequestMessage;
-
-extern CMTMessageTemplate EncryptRequestTemplate[];
-
-typedef struct SingleItemMessage EncryptReplyMessage;
-#define EncryptReplyTemplate SingleItemMessageTemplate
-
-typedef struct DecryptRequestMessage
-{
-  CMTItem data;
-  CMTItem ctx;  /* serialized void* ptr */
-} DecryptRequestMessage;
-extern CMTMessageTemplate DecryptRequestTemplate[];
-
-typedef struct SingleItemMessage DecryptReplyMessage;
-#define DecryptReplyTemplate SingleItemMessageTemplate
-
-#endif /* __MESSAGES_H__ */

mozilla/security/psm/lib/protocol/newproto.c

@@ -1,602 +0,0 @@
-/* -*- 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 <string.h>
-#include <assert.h>
-#ifdef WIN32
-#include <winsock.h>
-#endif
-#ifdef XP_MAC
-#include "macsocket.h"
-#endif
-
-#include "newproto.h"
-
-char SSMVersionString[] = "1.1";
-
-CMT_Alloc_fn cmt_alloc = malloc;
-CMT_Free_fn cmt_free = free;
-
-#define ASSERT(x) assert(x)
-
-#define CM_ntohl ntohl
-#define CM_htonl htonl
-
-
-/*************************************************************
- *
- * CMT_Init
- *
- *
- ************************************************************/
-void
-CMT_Init(CMT_Alloc_fn allocfn, CMT_Free_fn freefn)
-{
-    cmt_alloc = allocfn;
-    cmt_free = freefn;
-}
-
-static CMTStatus
-decode_int(unsigned char **curptr, void *dest, CMInt32 *remaining)
-{
-    CMInt32 datalen = sizeof(CMInt32);
-
-    if (*remaining < datalen)
-        return CMTFailure;
-    *(CMInt32 *)dest = ntohl(**(CMInt32 **)curptr);
-    *remaining -= datalen;
-    *curptr += datalen;
-    return CMTSuccess;
-}
-
-static CMTStatus
-decode_string(unsigned char **curptr, CMInt32 *len,
-              unsigned char **data, CMInt32 *remaining)
-{
-    CMTStatus rv;
-    CMInt32 datalen;
-
-    rv = decode_int(curptr, len, remaining);
-    if (rv != CMTSuccess)
-        return CMTFailure;
-
-    /* NULL string */
-    if (*len == 0) {
-        *data = NULL;
-        goto done;
-    }
-
-    datalen = (*len + 3) & ~3;
-    if (*remaining < datalen)
-        return CMTFailure;
-
-    *data = (unsigned char *) cmt_alloc(*len + 1);
-    if (*data == NULL)
-        return CMTFailure;
-
-    memcpy(*data, *curptr, *len);
-    (*data)[*len] = 0;
-    *remaining -= datalen;
-    *curptr += datalen;
-done:
-    return CMTSuccess;
-}
-
-/*************************************************************
- * CMT_DecodeMessage
- *
- * Decode msg into dest as specified by tmpl.
- *
- ************************************************************/
-CMTStatus
-CMT_DecodeMessage(CMTMessageTemplate *tmpl, void *dest, CMTItem *msg)
-{
-    unsigned char *curptr, *destptr, *list;
-	void ** ptr;
-    CMInt32 remaining, len, choiceID = 0, listSize, listCount = 0;
-    CMBool inChoice = CM_FALSE, foundChoice = CM_FALSE, inList = CM_FALSE;
-    CMInt32 listItemSize = 0;
-    CMTStatus rv = CMTSuccess;
-	CMTMessageTemplate *startOfList, *p;
-	CMBool inStructList = CM_FALSE;
-
-    curptr = msg->data;
-    remaining = msg->len;
-
-    while(tmpl->type != CMT_DT_END) {
-        /* XXX Maybe this should be a more formal state machine? */
-        if (inChoice) {
-            if (tmpl->type == CMT_DT_END_CHOICE) {
-                if (!foundChoice)
-                    goto loser;
-                inChoice = CM_FALSE;
-                foundChoice = CM_FALSE;
-                tmpl++;
-                continue;
-            }
-            if (choiceID != tmpl->choiceID) {
-                tmpl++;
-                continue;  /* Not this option */
-            } else {
-                foundChoice = CM_TRUE;
-            }
-        }
-        if (inList) {
-            destptr = &list[listCount * listItemSize];
-            listCount++;
-        } else {
-			if (inStructList) {
-				destptr = tmpl->offset + list;
-			} else {
-				destptr = tmpl->offset + (unsigned char *)dest;
-			}
-        }
-        switch (tmpl->type) {
-          case CMT_DT_RID:
-          case CMT_DT_INT:
-          case CMT_DT_BOOL:
-            rv = decode_int(&curptr, destptr, &remaining);
-            if (rv != CMTSuccess)
-                goto loser;
-            break;
-          case CMT_DT_STRING:
-            rv = decode_string(&curptr, &len, (unsigned char **)destptr,
-                               &remaining);
-            if (rv != CMTSuccess)
-                goto loser;
-            break;
-          case CMT_DT_ITEM:
-            rv = decode_string(&curptr, (long *) &((CMTItem *)destptr)->len,
-                               &((CMTItem *)destptr)->data, &remaining);
-            if (rv != CMTSuccess)
-                goto loser;
-            break;
-          case CMT_DT_LIST:
-            /* XXX This is too complicated */
-            rv = decode_int(&curptr, destptr, &remaining);
-            if (rv != CMTSuccess)
-                goto loser;
-            listSize = *(CMInt32 *)destptr;
-            tmpl++;
-            if (tmpl->type == CMT_DT_STRING) {
-                listItemSize = sizeof(unsigned char *);
-            } else if (tmpl->type == CMT_DT_ITEM) {
-                listItemSize = sizeof(CMTItem);
-            } else {
-                listItemSize = sizeof(CMInt32);
-            }
-            if (listSize == 0) {
-                list = NULL;
-            } else {
-                list = (unsigned char *) cmt_alloc(listSize * listItemSize);
-            }
-            *(void **)(tmpl->offset + (unsigned char *)dest) = list;
-            inList = CM_TRUE;
-            listCount = 0;
-            break;
-          case CMT_DT_STRUCT_LIST:
-            /* XXX This is too complicated */
-            rv = decode_int(&curptr, destptr, &remaining);
-            if (rv != CMTSuccess)
-                goto loser;
-            listSize = *(CMInt32 *)destptr;
-            tmpl++;
-			if (tmpl->type != CMT_DT_STRUCT_PTR) {
-				goto loser;
-			}
-			ptr = (void**)(tmpl->offset + (unsigned char *)dest);
-			startOfList = tmpl;
-			p = tmpl;
-			listItemSize = 0;
-			while (p->type != CMT_DT_END_STRUCT_LIST) {
-				if (p->type == CMT_DT_STRING) {
-					listItemSize += sizeof(unsigned char *);
-				} else if (p->type == CMT_DT_ITEM) {
-					listItemSize += sizeof(CMTItem);
-				} else if (p->type == CMT_DT_INT) {
-	                listItemSize += sizeof(CMInt32);
-		        }
-				p++;
-			}
-            if (listSize == 0) {
-                list = NULL;
-            } else {
-                list = (unsigned char *) cmt_alloc(listSize * listItemSize);
-            }
-            *ptr = list;
-            inStructList = CM_TRUE;
-            listCount = 0;
-            break;
-		  case CMT_DT_END_STRUCT_LIST:
-			listCount++;
-			if (listCount == listSize) {
-				inStructList = CM_FALSE;
-			} else {
-				list += listItemSize;
-				tmpl = startOfList;
-			}
-			break;
-          case CMT_DT_CHOICE:
-            rv = decode_int(&curptr, destptr, &remaining);
-            if (rv != CMTSuccess)
-                goto loser;
-            choiceID = *(CMInt32 *)destptr;
-            inChoice = CM_TRUE;
-            foundChoice = CM_FALSE;
-            break;
-          case CMT_DT_END_CHOICE: /* Loop should exit before we see these. */
-          case CMT_DT_END:
-          default:
-            ASSERT(0);
-            break;
-        }
-        if (inList) {
-            if (listCount == listSize) {
-                inList = CM_FALSE;
-                tmpl++;
-            }
-        } else {
-            tmpl++;
-        }
-    }
-loser:
-    /* Free the data buffer */
-    if (msg->data) {
-        cmt_free(msg->data);
-        msg->data = NULL;
-    }
-    return rv;
-}
-
-static CMTStatus
-calc_msg_len(CMTMessageTemplate *tmpl, void *src, CMInt32 *len_out)
-{
-    CMInt32 len = 0, choiceID = 0, listSize, listItemSize, listCount;
-    unsigned char *srcptr, *list;
-    CMBool inChoice = CM_FALSE, inList = CM_FALSE, foundChoice = CM_FALSE;
-	CMTMessageTemplate *startOfList, *p;
-	CMBool inStructList = CM_FALSE;
-
-    while(tmpl->type != CMT_DT_END) {
-        if (inChoice) {
-            if (tmpl->type == CMT_DT_END_CHOICE) {
-                if (!foundChoice)
-                    goto loser;
-                inChoice = CM_FALSE;
-                foundChoice = CM_FALSE;
-                tmpl++;
-                continue;
-            }
-            if (choiceID != tmpl->choiceID) {
-                tmpl++;
-                continue;  /* Not this option */
-            } else {
-                foundChoice = CM_TRUE;
-            }
-        }
-        if (inList) {
-            srcptr = &list[listCount * listItemSize];
-            listCount++;
-        } else if (inStructList) {
-			srcptr = tmpl->offset + list;
-		} else {
-            srcptr = tmpl->offset + (unsigned char *)src;
-        }
-        switch(tmpl->type) {
-          case CMT_DT_RID:
-          case CMT_DT_INT:
-          case CMT_DT_BOOL:
-            len += sizeof(CMInt32);
-            break;
-          case CMT_DT_STRING:
-            len += sizeof(CMInt32);
-            /* Non NULL string */
-            if (*(char**)srcptr) {
-                len += (strlen(*(char**)srcptr) + 4) & ~3;
-            }
-            break;
-          case CMT_DT_ITEM:
-            len += sizeof(CMInt32);
-            len += (((CMTItem *)srcptr)->len + 3) & ~3;
-            break;
-          case CMT_DT_LIST:
-            len += sizeof(CMInt32);
-            listSize = *(CMInt32 *)srcptr;
-            tmpl++;
-            if (tmpl->type == CMT_DT_STRING) {
-                listItemSize = sizeof(unsigned char *);
-            } else if (tmpl->type == CMT_DT_ITEM) {
-                listItemSize = sizeof(CMTItem);
-            } else {
-                listItemSize = sizeof(CMInt32);
-            }
-            list = *(unsigned char **)(tmpl->offset + (unsigned char *)src);
-            listCount = 0;
-            inList = CM_TRUE;
-            break;
-		  case CMT_DT_STRUCT_LIST:
-			len += sizeof(CMInt32);
-			listSize = *(CMInt32 *)srcptr;
-			tmpl++;
-			if (tmpl->type != CMT_DT_STRUCT_PTR) {
-				goto loser;
-			}
-			list = *(unsigned char**)(tmpl->offset + (unsigned char*)src);
-			startOfList = tmpl;
-			p = tmpl;
-			listItemSize = 0;
-			while (p->type != CMT_DT_END_STRUCT_LIST) {
-				if (p->type == CMT_DT_STRING) {
-					listItemSize += sizeof(unsigned char *);
-				} else if (p->type == CMT_DT_ITEM) {
-					listItemSize += sizeof(CMTItem);
-				} else if (p->type == CMT_DT_INT) {
-					listItemSize += sizeof(CMInt32);
-				}
-				p++;
-			}
-			listCount = 0;
-			inStructList = CM_TRUE;
-			break;
-		  case CMT_DT_END_STRUCT_LIST:
-			listCount++;
-			if (listCount == listSize) {
-				inStructList = CM_FALSE;
-			} else {
-				list += listItemSize;
-				tmpl = startOfList;
-			}
-			break;
-          case CMT_DT_CHOICE:
-            len += sizeof(CMInt32);
-            choiceID = *(CMInt32 *)srcptr;
-            inChoice = CM_TRUE;
-            foundChoice = CM_FALSE;
-            break;
-          case CMT_DT_END_CHOICE: /* Loop should exit before we see these. */
-          case CMT_DT_END:
-          default:
-            ASSERT(0);
-            break;
-        }
-        if (inList) {
-            if (listCount == listSize) {
-                inList = CM_FALSE;
-                tmpl++;
-            }
-        } else {
-            tmpl++;
-        }
-    }
-    *len_out = len;
-    return CMTSuccess;
-loser:
-    return CMTFailure;
-}
-
-static CMTStatus
-encode_int(unsigned char **curptr, void *src, CMInt32 *remaining)
-{
-    CMInt32 datalen = sizeof(CMInt32);
-
-    if (*remaining < datalen)
-        return CMTFailure;
-    **(CMInt32 **)curptr = CM_htonl(*(CMInt32 *)src);
-    *remaining -= datalen;
-    *curptr += datalen;
-    return CMTSuccess;
-}
-
-static CMTStatus
-encode_string(unsigned char **curptr, CMInt32 len,
-              unsigned char *data, CMInt32 *remaining)
-{
-    CMTStatus rv;
-    CMInt32 datalen;
-
-    rv = encode_int(curptr, &len, remaining);
-    if (rv != CMTSuccess)
-        return CMTFailure;
-
-    /* NULL string */
-    if (len == 0) {
-        goto done;
-    }
-
-    datalen = (len + 3) & ~3;
-    if (*remaining < datalen)
-        return CMTFailure;
-
-    memcpy(*curptr, data, len);
-    *remaining -= datalen;
-    *curptr += datalen;
-done:
-    return CMTSuccess;
-}
-
-/*************************************************************
- * CMT_EncodeMessage
- *
- * Encode src into msg as specified by tmpl.
- *
- ************************************************************/
-CMTStatus
-CMT_EncodeMessage(CMTMessageTemplate *tmpl, CMTItem *msg, void *src)
-{
-    CMInt32 choiceID = 0, listSize, listItemSize, listCount, remaining;
-    unsigned char *srcptr, *curptr, *list;
-    CMBool inChoice = CM_FALSE, inList = CM_FALSE, foundChoice = CM_FALSE;
-    CMTStatus rv = CMTSuccess;
-	CMTMessageTemplate *startOfList, *p;
-	CMBool inStructList = CM_FALSE;
-
-    rv = calc_msg_len(tmpl, src, (long *) &msg->len);
-    if (rv != CMTSuccess)
-        goto loser;
-    curptr = msg->data = (unsigned char *) cmt_alloc(msg->len);
-    if(msg->data == NULL)
-        goto loser;
-    remaining = msg->len;
-
-    while(tmpl->type != CMT_DT_END) {
-        if (inChoice) {
-            if (tmpl->type == CMT_DT_END_CHOICE) {
-                if (!foundChoice)
-                    goto loser;
-                inChoice = CM_FALSE;
-                foundChoice = CM_FALSE;
-                tmpl++;
-                continue;
-            }
-            if (choiceID != tmpl->choiceID) {
-                tmpl++;
-                continue;  /* Not this option */
-            } else {
-                foundChoice = CM_TRUE;
-            }
-        }
-        if (inList) {
-            srcptr = &list[listCount * listItemSize];
-            listCount++;
-        } else {
-			if (inStructList) {
-				srcptr = tmpl->offset + list;
-			} else {
-				srcptr = tmpl->offset + (unsigned char *)src;
-			}
-        }
-        switch(tmpl->type) {
-          case CMT_DT_RID:
-          case CMT_DT_INT:
-          case CMT_DT_BOOL:
-            rv = encode_int(&curptr, srcptr, &remaining);
-            if (rv != CMTSuccess)
-                goto loser;
-            break;
-          case CMT_DT_STRING:
-             if (*(char**)srcptr) {
-                 /* Non NULL string */
-                 rv = encode_string(&curptr, (long) strlen(*(char**)srcptr), 
-                 	                *(unsigned char**)srcptr, &remaining);
-             } else {
-                 /* NULL string */
-                 rv = encode_string(&curptr, 0L, *(unsigned char**)srcptr, &remaining);
-             }
-             if (rv != CMTSuccess)
-                goto loser;
-             break;
-          case CMT_DT_ITEM:
-            rv = encode_string(&curptr, ((CMTItem *)srcptr)->len,
-                               ((CMTItem *)srcptr)->data, &remaining);
-            if (rv != CMTSuccess)
-                goto loser;
-            break;
-          case CMT_DT_LIST:
-            rv = encode_int(&curptr, srcptr, &remaining);
-            if (rv != CMTSuccess)
-                goto loser;
-            listSize = *(CMInt32 *)srcptr;
-            tmpl++;
-            if (tmpl->type == CMT_DT_STRING) {
-                listItemSize = sizeof(unsigned char *);
-            } else if (tmpl->type == CMT_DT_ITEM) {
-                listItemSize = sizeof(CMTItem);
-            } else {
-                listItemSize = sizeof(CMInt32);
-            }
-            list = *(unsigned char **)(tmpl->offset + (unsigned char *)src);
-            listCount = 0;
-            inList = CM_TRUE;
-            break;
-		  case CMT_DT_STRUCT_LIST:
-            rv = encode_int(&curptr, srcptr, &remaining);
-            if (rv != CMTSuccess)
-                goto loser;
-            listSize = *(CMInt32 *)srcptr;
-			tmpl++;
-			if (tmpl->type != CMT_DT_STRUCT_PTR) {
-				goto loser;
-			}
-			list = *(unsigned char**)(tmpl->offset + (unsigned char*)src);
-			startOfList = tmpl;
-			p = tmpl;
-			listItemSize = 0;
-			while (p->type != CMT_DT_END_STRUCT_LIST) {
-				if (p->type == CMT_DT_STRING) {
-					listItemSize += sizeof(unsigned char *);
-				} else if (p->type == CMT_DT_ITEM) {
-					listItemSize += sizeof(CMTItem);
-				} else if (p->type == CMT_DT_INT) {
-					listItemSize += sizeof(CMInt32);
-				}
-				p++;
-			}
-			listCount = 0;
-			inStructList = CM_TRUE;
-			break;
-		  case CMT_DT_END_STRUCT_LIST:
-			listCount++;
-			if (listCount == listSize) {
-				inStructList = CM_FALSE;
-			} else {
-				list += listItemSize;
-				tmpl = startOfList;
-			}
-			break;
-          case CMT_DT_CHOICE:
-            rv = encode_int(&curptr, srcptr, &remaining);
-            if (rv != CMTSuccess)
-                goto loser;
-            choiceID = *(CMInt32 *)srcptr;
-            inChoice = CM_TRUE;
-            foundChoice = CM_FALSE;
-            break;
-          case CMT_DT_END_CHOICE: /* Loop should exit before we see these. */
-          case CMT_DT_END:
-          default:
-            ASSERT(0);
-            break;
-        }
-        if (inList) {
-            if (listCount == listSize) {
-                inList = CM_FALSE;
-                tmpl++;
-            }
-        } else {
-            tmpl++;
-        }
-    }
-    return CMTSuccess;
-loser:
-    return CMTFailure;
-}

mozilla/security/psm/lib/protocol/newproto.h

@@ -1,102 +0,0 @@
-/* -*- 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 __NEWPROTO_H__
-#define __NEWPROTO_H__
-
-#include <stdlib.h>
-#include "ssmdefs.h"
-
-typedef enum CMTDataType {
-    CMT_DT_END,
-    CMT_DT_RID,
-    CMT_DT_INT,
-    CMT_DT_BOOL,
-    CMT_DT_STRING,
-    CMT_DT_ITEM,
-    CMT_DT_LIST,
-    CMT_DT_CHOICE,
-    CMT_DT_END_CHOICE,
-	CMT_DT_STRUCT_LIST,
-	CMT_DT_END_STRUCT_LIST,
-	CMT_DT_STRUCT_PTR
-} CMTDataType;
-
-typedef struct CMTMessageTemplate {
-    CMTDataType type;
-    CMUint32 offset;
-    CMInt32 validator;
-    CMInt32 choiceID;
-} CMTMessageTemplate;
-
-typedef struct CMTMessageHeader {
-    CMInt32 type;
-    CMInt32 len;
-} CMTMessageHeader;
-
-typedef void *(* CMT_Alloc_fn) (size_t size);
-typedef void (* CMT_Free_fn)(void * ptr);
-
-extern CMT_Alloc_fn cmt_alloc;
-extern CMT_Free_fn cmt_free;
-
-/*************************************************************
- *
- * CMT_Init
- *
- *
- ************************************************************/
-void
-CMT_Init(CMT_Alloc_fn allocfn, CMT_Free_fn freefn);
-
-/*************************************************************
- * CMT_DecodeMessage
- *
- * Decode msg into dest as specified by tmpl.
- *
- ************************************************************/
-CMTStatus
-CMT_DecodeMessage(CMTMessageTemplate *tmpl, void *dest, CMTItem *msg);
-
-
-/*************************************************************
- * CMT_EncodeMessage
- *
- * Encode src into msg as specified by tmpl.
- *
- ************************************************************/
-CMTStatus
-CMT_EncodeMessage(CMTMessageTemplate *tmpl, CMTItem *msg, void *src);
-
-
-#endif /* __NEWPROTO_H__ */

mozilla/security/psm/lib/protocol/obsample.c

@@ -1,187 +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 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.
- */
-/* SAMPLE CODE
-** Illustrates use of SSMObscure object methods.
-**
-** Author:  Nelson Bolyard	June 1999
-*/
-
-#include <stdio.h>
-#include "obscure.h"
-
-
-/* On error, returns -1.
-** On success, returns non-negative number of unobscured bytes in buf
-int
-RecvInitObscureData(int fd, SSMObscureObject * obj, void * buf, int bufSize )
-{
-    SSMObscureBool done = 0;
-
-    do {
-	int cc;
-	int rv;
-	cc = read(fd, buf, bufSize);
-	if (cc <= 0)
-	    return -1;
-	rv = SSMObscure_RecvInit(obj, buf, cc, &done);
-    } while (!done);
-    return rv;
-}
-
-
-/* returns -1 on error, 0 on success. */
-int
-SendInitObscureData(int fd, SSMObscureObject * obj)
-{
-    unsigned char * initBuf = NULL;
-    int             rv      = -1;
-
-    do {
-	int bufLen;
-	int len;
-	int cc;
-
-	bufLen = SSMObscure_SendInit(obj, NULL);
-	if (bufLen <= 0)
-	    break;
-
-	initBuf = malloc(bufLen);
-	if (!initBuf)
-	    break;
-
-	len = SSMObscure_SendInit(obj, initBuf);
-	if (len != bufLen)
-	    break;
-
-	cc = write(fd, initBuf, len);
-
-	/* Note, this code assumes a blocking socket, 
-	** and hence doesn't deal with short writes.
-	*/
-	if (cc < len) 
-	    break;
-
-    	rv = 0;
-
-    } while (0);
-
-    if (initBuf) {
-	free(initBuf);
-    	initBuf = NULL;
-    }
-    return rv;
-}
-
-/* This is like write, but it obscures the data first. */
-/* This code assumes a blocking socket, and so it doesn't handle short 
-** writes.
-*/
-int 
-obscuredWrite(SSMObscureObject * obj, int fd, void * buf, int len)
-{
-    int rv;
-    int cc;
-
-    cc = SSMObscure_Send(obj, buf, len);
-    if (cc <= 0)
-    	return cc;
-    rv = write(fd, buf, cc);
-    ASSERT(rv == cc || rv < 0);
-    return rv;
-}
-
-/* This is like read, but it unobscures the data after reading it. */
-int 
-obscuredRead(SSMObscureObject * obj, int fd, void * buf, int len)
-{
-    int rv;
-    int cc;
-
-    do {
-	cc = read(fd, buf, len);
-	if (cc <= 0)
-	    return cc;
-	rv = SSMObscure_Recv(obj, buf, len);
-    } while (rv == 0);
-    return rv;
-}
-
-SSMObscureObject * sobj;
-unsigned char buf[8192];
-
-/* Call this with fd for socket that has just been accepted.
-** returns -1 on error, 
-** On success, returns non-negative number of bytes received in buf. 
-*/
-int
-InitClientObscureObject(int fd) 
-{
-    int rv;
-
-    sobj = SSMObscure_Create(0);
-    if (!sobj)
-    	return -1;
-
-    rv = SendInitObscureData(fd, sobj);
-    if (rv < 0)
-    	return rv;
-
-    rv = RecvInitObscureData(fd, sobj, buf, sizeof buf);
-    return rv;
-}
-
-/* Call this with fd for socket that has just been connected.
-** returns -1 on error, 
-** On success, returns non-negative number of bytes received in buf. 
-*/
-int
-InitServerObscureObject(int fd)
-{
-    int cc;
-
-    sobj = SSMObscure_Create(1);
-    if (!sobj)
-    	return -1;
-
-    cc = RecvInitObscureData(fd, sobj, buf, sizeof buf);
-    if (cc < 0) 
-    	return cc;
-
-
-    rv = SendInitObscureData(fd, sobj);
-    if (rv < 0)
-    	return rv;
-
-    return cc;
-}
-

mozilla/security/psm/lib/protocol/obscure.c

@@ -1,136 +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 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 <stdlib.h>
-#include "obspriv.h"
-#include "newproto.h"
-
-
-/* 
-** Create a new Obscuring object 
-*/
-SSMObscureObject * 
-SSMObscure_Create(SSMObscureBool IsServer)
-{
-    SSMObscureObject * obj;
-    void *             priv;
-
-    obj = (SSMObscureObject *) cmt_alloc(sizeof *obj);
-    if (!obj)
-    	return obj;
-    /* This needs to be a little more elegant */
-    priv = SSMObscure_InitPrivate(obj, IsServer);
-    if (!priv) {
-    	cmt_free(obj);
-	return NULL;
-    }
-    obj->privData = priv;
-    return obj;
-}
-
-
-/* Prepare initial buffer with initial message to send to other side to 
-** establish cryptographic * synchronization.
-**
-** If buf is NULL, function returns the size of the buffer that 
-** the caller needs to allocate for sending the initial message.
-** 
-** If buf is non-null, function returns the number of bytes of data filled 
-** into buf, the amount that the caller should then send to the other side.
-**
-*/
-int 
-SSMObscure_SendInit( SSMObscureObject * obj, void * buf)
-{
-    int rv;
-    rv = obj->sendInit(obj->privData, buf);
-    return rv;
-}
-
-/* 
-** Obscure "len" bytes in "buf" before sending it. 
-*/
-int 
-SSMObscure_Send(	SSMObscureObject * obj, 
-			void *             buf, 
-			unsigned int       len)
-{
-    int rv;
-    rv = obj->send(obj->privData, buf, len);
-    return rv;
-}
-
-/* 
-** UnObscure "len" bytes in "buf" after receiving it. 
-** This function may absorb some or all of the received bytes, leaving 
-** fewer bytes (possibly none) in the buffer for the application to use 
-** than were in the buffer when the function was called.
-** Function returns the number of bytes of unobscured data remaining in
-** buf.  Zero means all data was used internally and no data remains 
-** for application use. Negative number means error occurred.
-*/
-int 
-SSMObscure_Recv(	SSMObscureObject * obj, 
-			void *             buf, 
-			unsigned int       len)
-{
-    int rv;
-    rv = obj->recv(obj->privData, buf, len);
-    return rv;
-}
-
-/* like _Recv, but returns a flag telling when all initialization info has
-** been received.
-*/
-int 
-SSMObscure_RecvInit(	SSMObscureObject * obj, 
-			void *             buf, 
-			unsigned int       len,
-			SSMObscureBool   * done)
-{
-    int rv;
-    rv = obj->recvInit(obj->privData, buf, len, done);
-    return rv;
-}
-
-/* 
-** Destroy the Obscure Object 
-*/
-int 
-SSMObscure_Destroy(SSMObscureObject * obj)
-{
-    int rv;
-    rv = obj->destroy(obj->privData);
-    cmt_free(obj);
-    return rv;
-}
-

mozilla/security/psm/lib/protocol/obscure.h

@@ -1,98 +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 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 __obscure_h__
-#define __obscure_h__ 1
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef unsigned char SSMObscureBool;
-
-typedef struct SSMObscureObjectStr 	SSMObscureObject;
-
-/* 
-** Create a new Obscuring object 
-*/
-extern SSMObscureObject * SSMObscure_Create(SSMObscureBool IsServer);
-
-
-/* Prepare initial buffer with initial message to send to other side to 
-** establish cryptographic * synchronization.
-**
-** If buf is NULL, function returns the size of the buffer that 
-** the caller needs to allocate for sending the initial message.
-** 
-** If buf is non-null, function returns the number of bytes of data filled 
-** into buf, the amount that the caller should then send to the other side.
-**
-*/
-extern int SSMObscure_SendInit( SSMObscureObject * obj,
-				void *             buf);
-
-/* 
-** Obscure "len" bytes in "buf" before sending it. 
-*/
-extern int SSMObscure_Send(	SSMObscureObject * obj, 
-                            	void *             buf, 
-				unsigned int       len);
-
-/* 
-** UnObscure "len" bytes in "buf" after receiving it. 
-** This function may absorb some or all of the received bytes, leaving 
-** fewer bytes (possibly none) in the buffer for the application to use 
-** than were in the buffer when the function was called.
-** Function returns the number of bytes of unobscured data remaining in
-** buf.  Zero means all data was used internally and no data remains 
-** for application use. Negative number means error occurred.
-*/
-extern int SSMObscure_Recv(	SSMObscureObject * obj, 
-                                void *             buf, 
-				unsigned int       len);
-
-/* like _Recv, but returns a flag telling when all initialization info has
-** been received.
-*/
-extern int SSMObscure_RecvInit(	SSMObscureObject * obj, 
-                                void *             buf, 
-				unsigned int       len,
-				SSMObscureBool   * done);
-
-/* 
-** Destroy the Obscure Object 
-*/
-extern int SSMObscure_Destroy(SSMObscureObject * obj);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __obscure_h__ */

mozilla/security/psm/lib/protocol/obspriv.c

@@ -1,115 +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 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 "obspriv.h"
-#include "newproto.h"
-#include <string.h>
-#include <assert.h>
-#include <time.h>
-
-/* 
-   Originally this code was used to obscure the control messages
-   traveling between processes. With the relaxation of export rules,
-   this whole step is no longer necessary, and is included for
-   informational purposes only. (We need to finish removing the 
-   obscuring code.)
-*/
-struct obscureNOPStr {
-    SSMObscureObject * obj;
-};
-
-typedef struct obscureNOPStr obscureV1;
-
-static int 
-ssmObscure_Destroy(void * privData)
-{
-    obscureV1 * priv = (obscureV1 *)privData;
-
-    memset(priv, 0, sizeof *priv);
-    cmt_free(priv);
-    return 0;
-}
-
-static int
-ssmObscure_Send(void * privData, void * buf, unsigned int len)
-{
-    /* obscureV1 *  priv 		= (obscureV1 *)privData;*/
-
-    /* NOP */
-    return len;
-}
-
-static int    
-ssmObscure_Recv(void * privData, void * buf, unsigned int len)
-{
-    /*obscureV1 *  priv 		= (obscureV1 *)privData;*/
-
-    /* NOP */
-    return len;
-}
-
-static int    
-ssmObscure_SendInit(void * privData, void * buf)
-{
-    /*obscureV1 *      priv = (obscureV1 *)privData;*/
-
-    return 0;
-}
-
-static int    
-ssmObscure_RecvInit(void * privData, void * buf, unsigned int len,
-                    SSMObscureBool * pDone)
-{
-    return 0;
-}
-
-static void *
-ssmObscure_InitPrivate(SSMObscureObject * obj, SSMObscureBool IsServer)
-{
-    obscureV1 *   priv 		= (obscureV1 *) cmt_alloc(sizeof (obscureV1));
-
-    if (!priv)
-    	return NULL;
-
-    priv->obj        = obj;
-
-    obj->privData  = (void *)priv;
-    obj->destroy  = ssmObscure_Destroy;
-    obj->send     = ssmObscure_Send;
-    obj->recv     = ssmObscure_Recv;
-    obj->sendInit = ssmObscure_SendInit;
-    obj->recvInit = ssmObscure_RecvInit;
-    
-    return priv;
-}
-
-obsInitFn SSMObscure_InitPrivate = ssmObscure_InitPrivate;