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

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

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/Makefile.in

@@ -1,32 +0,0 @@
-#
-# 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
-
-DIRS		= protocol client
-
-include $(topsrcdir)/config/rules.mk
-

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/makefile.win

@@ -1,27 +0,0 @@
-#!nmake
-#
-# 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>
-
-DIRS = client protocol
-
-include <$(DEPTH)\config\rules.mak>

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;

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

@@ -1,63 +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 "obscure.h"
-
-typedef void * (* obsInitFn)    (SSMObscureObject * instance, 
-                                 SSMObscureBool     IsServer);
-typedef int    (* obsDestroyFn) (void * priv);
-typedef int    (* obsSendFn)    (void * priv, void * buf, unsigned int len);
-typedef int    (* obsRecvFn)    (void * priv, void * buf, unsigned int len);
-typedef int    (* obsSendInitFn)(void * priv, void * buf);
-typedef int    (* obsRecvInitFn)(void * priv, void * buf, unsigned int len,
-                                 SSMObscureBool * done);
-
-struct SSMObscureObjectStr {
-    void *	  privData;
-    obsDestroyFn  destroy;
-    obsSendFn     send;
-    obsRecvFn     recv;
-    obsSendInitFn sendInit;
-    obsRecvInitFn recvInit;
-};
-
-
-/* This is common to the beginning of all versions of the obscuring protocol */
-struct SSMInitMsgHdrStr {
-    short	version;
-    short	length;
-};
-
-typedef struct SSMInitMsgHdrStr SSMInitMsgHdr;
-
-extern obsInitFn SSMObscure_InitPrivate;
-

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

@@ -1,141 +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.
- */
-/*
-  protocol.h - Definitions of various items to support the PSM protocol.
- */
-
-#ifndef __PROTOCOL_H__
-#define __PROTOCOL_H__
-
-
-#include "rsrcids.h"
-
-#define SSMPRStatus SSMStatus
-#define SSMPR_SUCCESS SSM_SUCCESS
-#define SSMPR_FAILURE SSM_FAILURE
-
-#define SSMPR_INVALID_ARGUMENT_ERROR PR_INVALID_ARGUMENT_ERROR
-#define SSMPR_OUT_OF_MEMORY_ERROR    PR_OUT_OF_MEMORY_ERROR
-
-#define SSMPRInt32 PRInt32
-#define SSMPRUint32 PRUint32
-
-#define SSMPR_ntohl  PR_ntohl
-#define SSMPR_htonl  PR_htonl
-#define SSMPORT_Free   PORT_Free
-#define SSMPORT_ZAlloc PORT_ZAlloc
-
-#define SSMPR_SetError PR_SetError
-#define SSMPR_GetError PR_GetError
-#define SSMPORT_SetError PORT_SetError
-#define SSMPORT_GetError PORT_GetError
-
-/* 
-   Current version of PSM protocol. 
-   Increment this value when the protocol changes. 
-*/
-
-#define SSMSTRING_PADDED_LENGTH(x) ((((x)+3)/4)*4)
-#define SSMPORT_ZNEW(type) (type*)SSMPORT_ZAlloc(sizeof(type))
-#define SSMPORT_ZNewArray(type,size) (type*)SSMPORT_ZAlloc(sizeof(type)*(size))
-/* Various message structs */
-
-struct _SSMHelloRequest {
-  CMUint32          m_version; /* Protocol version supported by client */
-  struct _SSMString m_profileName; /* Name of user profile (where to find 
-				 certs etc) */
-};
-
-struct _SSMHelloReply {
-  CMInt32           m_result; /* Error, if any, which occurred 
-				 (0 == success) */
-  CMUint32          m_version; /* Protocol version supported by PSM */
-  struct _SSMString m_nonce; /* Session nonce -- must be written to data channels */
-};
-
-struct _SSMRequestSSLDataConnection
-{
-  CMUint32          m_flags; /* Flags to indicate to SSM what to do with
-				the connection */
-  CMUint32          m_port; /* Port number to connect to */
-  struct _SSMString m_hostIP; /* IP address of final target machine (not proxy) */
-  /* struct _SSMString m_hostName; Host name of target machine (for server auth) -- not accessed directly */
-};
-
-struct _SSMReplySSLDataConnection {
-  CMInt32 m_result; /* Error, if any, which occurred (0 == success) */
-  CMUint32 m_connectionID; /* Connection ID of newly opened channel */
-  CMUint32 m_port; /* Port number to which to connect on PSM */
-};
-
-
-struct _SSMRequestSecurityStatus {
-  CMUint32 m_connectionID; /* ID of connection of which to stat */
-};
-
-struct _SSMReplySecurityStatus {
-  CMInt32 m_result; /* Error, if any, which occurred (0 == success) */
-  CMUint32 m_keySize; /* Key size */
-  CMUint32 m_secretKeySize; /* Secret key size */
-  struct _SSMString m_cipherName; /* Name of cipher in use */
-  /* SSMString m_certificate; -- DER encoded cert
-     We do not access this as a field, we have to skip over m_cipherName */
-};
-
-/* 
-   Use this macro to jump over strings.
-   For example, if you wanted to access m_certificate above, 
-   use a line like the following:
-
-   char *ptr = &(reply->m_cipherName) + SSM_SIZEOF_STRING(reply->m_cipherName);
-*/
-#define SSM_SIZEOF_STRING(str) (SSMSTRING_PADDED_LENGTH(PR_ntohl((str).m_length)) + sizeof(CMUint32))
-
-
-typedef struct _SSMHelloRequest SSMHelloRequest;
-typedef struct _SSMHelloReply SSMHelloReply;
-typedef struct _SSMRequestSSLDataConnection SSMRequestSSLDataConnection;
-typedef struct _SSMReplySSLDataConnection SSMReplySSLDataConnection;
-typedef struct _SSMRequestSecurityStatus SSMRequestSecurityStatus;
-typedef struct _SSMReplySecurityStatus SSMReplySecurityStatus;
-
-/* 
-   Functions to convert between an SSMString and a C string.
-   Return values are allocated using PR_Malloc (which means that
-   SSMPR_Free must be used to free up the memory after use). 
-*/
-CMTStatus SSM_StringToSSMString(SSMString ** ssmString, int len, char * string);
-CMTStatus SSM_SSMStringToString(char ** string,int *len, SSMString * ssmString);
-
-
-#endif /* __PROTOCOL_H__ */

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

@@ -1,359 +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 __PROTOCOLF_H__
-#define __PROTOCOLF_H__
-/*************************************************************************
- * For each type of message, parse and pack function is provided. 
- *
- * Parse functions accept a ptr to the "blob" of data received from the 
- * network and fill in fields of the message, numbers in host-order, strings
- * as C-style NULL-terminated strings. Return SSMPRStatus. 
- *
- * Pack functions take all the info to construct a message and fill in a 
- * ptr to the "blob" of data to be sent. Return length of the data blob, or 
- * a zero in case of an error
- *
- * All functions set NSPR errors when necessary.
- ************************************************************************/
-#include "protocol.h"
-#include "cert.h"
-
-SSMPRStatus SSM_ParseHelloRequest(void * helloRequest, 
-				  SSMPRUint32 * version, 
-				  PRBool * doesUI,
-				  PRInt32 * policyType,
-				  SSMPRUint32 * profileLen,
-				  char ** profile);
-SSMPRInt32 SSM_PackHelloReply(void ** helloReply, SSMPRInt32 result, 
-			      SSMPRUint32 sessionID, SSMPRUint32 version, 
-			      SSMPRUint32 httpPort, SSMPRUint32 nonceLen, 
-			      char * nonce, SSMPolicyType policy);
-
-/* Parse data connections requests */
-SSMPRStatus SSM_ParseSSLDataConnectionRequest(void *sslRequest, 
-					      SSMPRUint32 * flags, 
-					      SSMPRUint32 * port,
-					      SSMPRUint32 * hostIPLen,
-					      char ** hostIP, 
-					      SSMPRUint32 * hostNameLen,
-					      char ** hostName);
-SSMPRStatus SSM_ParseHashStreamRequest(void * hashStreamRequest,
-                                       SSMPRUint32 * type);
-SSMPRStatus SSM_ParseP7EncodeConnectionRequest(void *request,
-					       SSMPRUint32 *ciRID);
-/* Messages to initiate PKCS7 data connection */
-/* PKCS7DecodeRequest message has no data */ 
-
-/* Single data connection reply */
-SSMPRInt32 SSM_PackDataConnectionReply(void ** sslReply, 
-				       SSMPRInt32 result, 
-				       SSMPRUint32 connID, 
-				       SSMPRUint32 port);
-
-SSMPRStatus SSM_ParseSSLSocketStatusRequest(void * statusRequest, 
-					    SSMPRUint32 * connID);
-SSMPRInt32 SSM_PackSSLSocketStatusReply(void ** statusReply, 
-					SSMPRInt32 result, 
-					SSMPRUint32 resourceID);
-
-/* 
- * UI event is an asynchroneous message sent from PSM server to the client
- * NOTE: (context) is the actual context pointer, it is NOT a ptr-to-ptr.
- * The value of (context) is copied into the packet.
- */
-SSMPRInt32 SSM_PackUIEvent(void ** eventRequest, SSMPRUint32 resourceID, 
-			   SSMPRUint32 width, SSMPRUint32 height,
-			   SSMPRUint32 urlLen, char * url);
-
-SSMPRInt32 SSM_PackTaskCompletedEvent(void **event, SSMPRUint32 resourceID,
-                                     SSMPRUint32 numTasks, SSMPRUint32 result);
-
-/* Verify raw signature */
-
-SSMPRStatus SSM_ParseVerifyRawSigRequest(void * verifyRawSigRequest, 
-					 SSMPRUint32 * algorithmID,
-					 SSMPRUint32 * paramsLen, 
-					 unsigned char ** params,
-					 SSMPRUint32 * pubKeyLen,
-					 unsigned char ** pubKey,
-					 SSMPRUint32 * hashLen,
-					 unsigned char ** hash,
-					 SSMPRUint32 * signatureLen,
-					 unsigned char ** signature);
-SSMPRInt32 SSM_PackVerifyRawSigReply(void ** verifyRawSigReply, 
-				     SSMPRInt32 result);
-
-/* Verify detached signature */
-SSMPRStatus SSM_ParseVerifyDetachedSigRequest(void * request, 
-											  SSMPRInt32 * pkcs7ContentID,
-											  SSMPRInt32 * certUsage,
-											  SSMPRInt32 * hashAlgID,
-											  SSMPRUint32 * keepCert,
-											  SSMPRUint32 * digestLen,
-											  unsigned char ** hash);
-
-SSMPRInt32 SSM_PackVerifyDetachedSigReply(void ** verifyDetachedSigReply, 
-										  SSMPRInt32 result);
-
-/* PKCS#7 functions */
-SSMPRStatus SSM_ParseCreateSignedRequest(void *request,
-                                         SSMPRInt32 *scertRID,
-                                         SSMPRInt32 *ecertRID,
-                                         SSMPRUint32 *dig_alg,
-                                         SECItem **digest);
-
-SSMPRInt32 SSM_PackCreateSignedReply(void **reply, SSMPRInt32 ciRID,
-                                     SSMPRUint32 result);
-
-SSMPRStatus SSM_ParseCreateEncryptedRequest(void *request,
-					    SSMPRInt32 *scertRID,
-                                            SSMPRInt32 *nrcerts,
-					    SSMPRInt32 **rcertRIDs);
-
-SSMPRInt32 SSM_PackCreateEncryptedReply(void **reply, SSMPRInt32 ciRID,
-					SSMPRUint32 result);
-
-/* Resource functions */
-SSMPRStatus SSM_ParseCreateResourceRequest(void *request,
-                                           SSMPRUint32 *type,
-                                           unsigned char **params,
-                                           SSMPRUint32 *paramLen);
-
-SSMPRStatus SSM_PackCreateResourceReply(void **reply, SSMPRStatus rv,
-                                        SSMPRUint32 resID);
-
-SSMPRStatus SSM_ParseGetAttribRequest(void * getAttribRequest, 
-				      SSMPRUint32 * resourceID, 
-				      SSMPRUint32 * fieldID);
-
-void SSM_DestroyAttrValue(SSMAttributeValue *value, PRBool freeit);
-
-SSMPRInt32 SSM_PackGetAttribReply(void **getAttribReply,
-				  SSMPRInt32 result,
-				  SSMAttributeValue *value);
-SSMPRStatus SSM_ParseSetAttribRequest(SECItem *msg,
-				      SSMPRInt32 *resourceID,
-				      SSMPRInt32 *fieldID,
-				      SSMAttributeValue *value);
-/* Currently, there is no need for a pack version.  There is nothing to send
- * back except for the notice that the operation was successful.
- */
-				  
-				       
-				       
-/* Pickle and unpickle resources. */
-SSMPRStatus SSM_ParsePickleResourceRequest(void * pickleResourceRequest, 
-					  SSMPRUint32 * resourceID);
-SSMPRInt32 SSM_PackPickleResourceReply(void ** pickleResourceReply, 
-				       SSMPRInt32 result,
-				       SSMPRUint32 resourceLen,
-				       void * resource);
-SSMPRStatus SSM_ParseUnpickleResourceRequest(void * unpickleResourceRequest,
-					     SSMPRUint32 blobSize,
-					     SSMPRUint32 * resourceType,
-					     SSMPRUint32 * resourceLen,
-					     void ** resource);
-SSMPRInt32 SSM_PackUnpickleResourceReply(void ** unpickleResourceReply, 
-					   SSMPRInt32 result, 
-					   SSMPRUint32 resourceID);
-
-/* Destroy resource */
-SSMPRStatus SSM_ParseDestroyResourceRequest(void * destroyResourceRequest, 
-					    SSMPRUint32 * resourceID, 
-					    SSMPRUint32 * resourceType);
-SSMPRInt32 SSM_PackDestroyResourceReply(void ** destroyResourceReply, 
-                                        SSMPRInt32 result);
-
-/* Duplicate resource */
-SSMPRStatus SSM_ParseDuplicateResourceRequest(void * request, 
-					      SSMPRUint32 * resourceID);
-SSMPRInt32 SSM_PackDuplicateResourceReply(void ** reply, SSMPRInt32 result,
-					  SSMPRUint32 resID);
-
-/* Cert actions */
-typedef struct MatchUserCertRequestData {
-    PRUint32 certType;
-    PRInt32 numCANames;
-    char ** caNames;
-} MatchUserCertRequestData;
-
-typedef struct SSMCertList {
-    PRCList certs;
-    PRInt32 count;
-} SSMCertList;
-
-typedef struct SSMCertListElement {
-    PRCList links;
-    PRUint32 certResID;
-} SSMCertListElement;
-
-#define SSM_CERT_LIST_ELEMENT_PTR(_q) (SSMCertListElement*)(_q);
-
-SSMPRStatus SSM_ParseVerifyCertRequest(void * verifyCertRequest, 
-				       SSMPRUint32 * resourceID, 
-				       SSMPRInt32 * certUsage);
-SSMPRInt32 SSM_PackVerifyCertReply(void ** verifyCertReply, 
-			           SSMPRInt32 result);
-
-SSMPRStatus SSM_ParseImportCertRequest(void * importCertRequest, 
-				       SSMPRUint32 * blobLen, 
-				       void ** certBlob);
-SSMPRInt32 SSM_PackImportCertReply(void ** importCertReply, SSMPRInt32 result, 
-				   SSMPRUint32 resourceID);
-PRStatus SSM_ParseFindCertByNicknameRequest(void *request, char ** nickname);
-PRInt32 SSM_PackFindCertByNicknameReply(void ** reply, PRUint32 resourceID);
-PRStatus SSM_ParseFindCertByKeyRequest(void *request, SECItem ** key);
-PRInt32 SSM_PackFindCertByKeyReply(void ** reply, PRUint32 resourceID);
-PRStatus SSM_ParseFindCertByEmailAddrRequest(void *request, char ** emailAddr);
-PRInt32 SSM_PackFindCertByEmailAddrReply(void ** reply, PRUint32 resourceID);
-PRStatus SSM_ParseAddTempCertToDBRequest(void *request, PRUint32 *resourceID, char ** nickname, PRInt32 *ssl, PRInt32 *email, PRInt32 *objectSigning);
-PRInt32 SSM_PackAddTempCertToDBReply(void ** reply);
-PRStatus SSM_ParseMatchUserCertRequest(void *request, MatchUserCertRequestData** data);
-PRInt32 SSM_PackMatchUserCertReply(void **reply, SSMCertList * certList);
-
-SSMPRInt32 SSM_PackErrorMessage(void ** errorReply, SSMPRInt32 result);
-
-
-/* PKCS11 actions */
-SSMPRStatus SSM_ParseKeyPairGenRequest(void *keyPairGenRequest, 
-				       SSMPRInt32 requestLen,
-				       SSMPRUint32 *keyPairCtxtID,
-				       SSMPRUint32 *genMechanism,
-				       SSMPRUint32 *keySize,
-				       unsigned char **params, 
-				       SSMPRUint32 *paramLen);
-
-SSMPRInt32 SSM_PackKeyPairGenResponse(void ** keyPairGenResponse, 
-				      SSMPRUint32 keyPairId);
-
-PRStatus
-SSM_ParseFinishKeyGenRequest(void    *finishKeyGenRequest,
-                             PRInt32  requestLen,
-                             PRInt32 *keyGenContext);
-
-/* CMMF/CRMF Actions */
-SSMPRStatus SSM_ParseCreateCRMFReqRequest(void        *crmfReqRequest,
-					  SSMPRInt32   requestLen,
-					  SSMPRUint32 *keyPairId);
-
-SSMPRInt32 SSM_PackCreateCRMFReqReply(void        **crmfReqReply,
-				      SSMPRUint32   crmfReqId);
-
-SSMPRStatus SSM_ParseEncodeCRMFReqRequest(void         *encodeReq,
-					  SSMPRInt32    requestLen,
-					  SSMPRUint32 **crmfReqId,
-					  SSMPRInt32   *numRequests);
-
-SSMPRInt32 SSM_PackEncodeCRMFReqReply(void        **encodeReply,
-				      char         *crmfDER,
-				      SSMPRUint32   derLen);
-
-SSMPRStatus SSM_ParseCMMFCertResponse(void        *encodedRes,
-				      SSMPRInt32   encodeLen,
-				      char       **nickname,
-				      char       **base64Der,
-				      PRBool      *doBackup);
-
-PRStatus SSM_ParsePOPChallengeRequest(void     *challenge,
-				      PRInt32   len,
-				      char    **responseString);
-PRInt32 SSM_PackPOPChallengeResponse(void   **response,
-				     char    *responseString,
-				     PRInt32  responseStringLen);
-
-PRInt32 SSM_PackPasswdRequest(void ** passwdRequest, PRInt32 tokenID,
-                              char * prompt, PRInt32 promptLen);
-PRStatus SSM_ParsePasswordReply(void * passwdReply, PRInt32 * result, 
-                                PRInt32 * tokenID,
-                                char ** passwd, PRInt32 * passwdLen);
-
-/* Sign Text Actions */
-typedef struct {
-    char *stringToSign;
-    char *hostName;
-    char *caOption;
-    PRInt32 numCAs;
-    char **caNames;
-} signTextRequestData;
-
-PRStatus SSM_ParseSignTextRequest(void* signTextRequest, PRInt32 len, PRUint32* resID, signTextRequestData ** data);
-
-PRStatus SSM_ParseGetLocalizedTextRequest(void               *data,
-                                          SSMLocalizedString *whichString);  
-
-PRInt32 SSM_PackGetLocalizedTextResponse(void               **data,
-					 SSMLocalizedString   whichString,
-					 char                *retString);
-
-PRStatus SSM_ParseAddNewSecurityModuleRequest(void          *data, 
-					      char         **moduleName,
-					      char         **libraryPath, 
-					      unsigned long *pubMechFlags,
-					      unsigned long *pubCipherFlags);
-
-PRInt32 SSM_PackAddNewModuleResponse(void **data, PRInt32 rv);
-
-PRStatus SSM_ParseDeleteSecurityModuleRequest(void *data, char **moduleName);
-
-PRInt32 SSM_PackDeleteModuleResponse(void **data, PRInt32 moduleType);
-
-PRInt32 SSM_PackFilePathRequest(void **data, PRInt32 resID, char *prompt,
-				PRBool shouldFileExist, char *fileSuffix);
-
-PRStatus SSM_ParseFilePathReply(void *message, char **filePath,
-				PRInt32 *rid);
-
-PRInt32 SSM_PackPromptRequestEvent(void **data, PRInt32 resID, char *prompt);
-PRStatus SSM_ParsePasswordPromptReply(void *data, PRInt32 *resID, 
-				      char **reply);
-
-/* messages for importing certs *the traditional way* */
-PRInt32 SSM_PackDecodeCertReply(void ** data, PRInt32 certID);
-PRStatus SSM_ParseDecodeCertRequest(void * data, PRInt32 * len, 
-					char ** buffer);
-PRStatus SSM_ParseGetKeyChoiceListRequest(void * data, PRUint32 dataLen, 
-					  char ** type, PRUint32 *typeLen, 
-					  char ** pqgString, PRUint32 *pqgLen);
-PRInt32 SSM_PackGetKeyChoiceListReply(void **data, char ** list);
-
-PRStatus SSM_ParseGenKeyOldStyleRequest(void * data, PRUint32 datalen, 
-					char ** choiceString, 
-					char ** challenge, 
-					char ** typeString, 
-					char ** pqgString);
-PRInt32 SSM_PackGenKeyOldStyleReply(void ** data, char * keydata);
-
-PRStatus SSM_ParseDecodeAndCreateTempCertRequest(void * data, 
-			char ** certbuf, PRUint32 * certlen, int * certClass);
-
-#endif /*PROTOCOLF_H_*/

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

@@ -1,74 +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 NULL
-#define NULL 0x00000000
-#endif
-
-#define SSMPR_BYTES_PER_INT  4
-#define SSMPR_BYTES_PER_LONG  4
-
-/******************************************************************
- *  No NSPR - define all the SSMPR values and functions here   
- ******************************************************************
- */
-
-#define SSMPRStatus PRStatus
-#define SSMPR_SUCCESS PR_SUCCESS
-#define SSMPR_FAILURE PR_FAILURE
-
-#define SSMPR_INVALID_ARGUMENT_ERROR PR_INVALID_ARGUMENT_ERROR
-#define SSMPR_OUT_OF_MEMORY_ERROR    PR_OUT_OF_MEMORY_ERROR
-
-#define SSMPRInt32 PRInt32
-#define SSMPRUint32 PRUint32
-
-#define SSMPR_ntohl  PR_ntohl
-#define SSMPR_htonl  PR_htonl
-#define SSMPORT_Free   PORT_Free
-#define SSMPORT_ZAlloc PORT_ZAlloc
-
-#define SSMPR_SetError PR_SetError
-#define SSMPR_GetError PR_GetError
-#define SSMPORT_SetError PORT_SetError
-#define SSMPORT_GetError PORT_GetError
-
-
-
-

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

@@ -1,49 +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.
- */
-/*************************************************************************
- *
- * PSM portable run-time. (Used when NSPR20 is not available.)
- *
- *************************************************************************
- */
-
-SSMPRInt32 ssmprErrno;
-
-void SSMPORT_SetError(SSMPRInt32 errorcode) 
-{ ssmprErrno = errorcode; }  
-
-
-SSMPRInt32 SSMPORT_GetError(void)
-{ return ssmprErrno; }
-
-

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

@@ -1,93 +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 NULL
-#define NULL 0x00000000
-#endif
-
-#define SSMPR_BYTES_PER_INT  4
-#define SSMPR_BYTES_PER_LONG  4
-
-/******************************************************************
- *  No NSPR - define all the SSMPR values and functions here   
- ******************************************************************
- */
-
-typedef enum { SSMPR_SUCCESS = 0,  SSMPR_FAILURE = -1 } SSMPRStatus;
-enum { 
-  SSMPR_INVALID_ARGUMENT_ERROR = -6000,
-  SSMPR_OUT_OF_MEMORY_ERROR =  -5987
-};
-
-#if SSMPR_BYTES_PER_INT == 4
-typedef unsigned int SSMPRUint32;
-typedef int SSMPRInt32; 
-#elif SSMPR_BYTES_PER_LONG == 4
-typedef unsigned long SSMPRUint32;
-typedef long SSMPRInt32;
-#else
-#error No suitable type for SSMPRInt32/SSMPRUint32
-#endif
-
-/*******************************************************************
- * Use libc functions instead 
- *******************************************************************
- */
-#include <sys/types.h>
-#ifdef WIN32
-#include <winsock.h>
-#else
-#include <netinet/in.h>
-#endif
-#define SSMPR_ntohl  ntohl
-#define SSMPR_htonl  htonl
-
-#include <stdlib.h>
-#define SSMPORT_Free   free
-#define SSMPR_sprint   printf
-#define SSMPORT_ZAlloc malloc
-
-extern SSMPRInt32 ssmprErrno;
-#define SSMPR_SetError(x, y) SSMPORT_SetError(x)
-#define SSMPR_GetError SSMPORT_GetError
-void SSMPORT_SetError(SSMPRInt32 errorcode);
-
-
-
-

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

@@ -1,169 +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 "string.h"
-#include "protocol.h"
-#include "protocolshr.h"
-#include "messages.h"
-
-/* Forward ref */
-static void encrypt(CMTItem *data);
-static void decrypt(CMTItem *data);
-
-const char *kPrefix = "Encrypted";
-
-/* encryption request */
-CMTStatus
-CMT_DoEncryptionRequest(CMTItem *message)
-{
-  CMTStatus rv = CMTSuccess;
-  EncryptRequestMessage request;
-  EncryptReplyMessage reply;
-  CMUint32 pLen = strlen(kPrefix);
-
-  /* Initialize */
-  request.keyid.data = 0;
-  request.data.data = 0;
-  reply.item.data = 0;
-
-  /* Decode incoming message */
-  rv = CMT_DecodeMessage(EncryptRequestTemplate, &request, message);
-  if (rv != CMTSuccess) goto loser;  /* Protocol error */
-
-  /* Free incoming message */
-  free(message->data);
-  message->data = NULL;
-
-  /* "Encrypt" by prefixing the data */
-  reply.item.len = request.data.len + pLen;
-  reply.item.data = calloc(reply.item.len, 1);
-  if (!reply.item.data) {
-	rv = CMTFailure;
-	goto loser;
-  }
-
-  if (pLen) memcpy(reply.item.data, kPrefix, pLen);
-  encrypt(&request.data);
-  memcpy(&reply.item.data[pLen], request.data.data, request.data.len);
-  
-  /* Generate response */
-  message->type = SSM_SDR_ENCRYPT_REPLY;
-  rv = CMT_EncodeMessage(EncryptReplyTemplate, message, &reply);
-  if (rv != CMTSuccess) goto loser;  /* Unknown error */
-
-loser:
-  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;
-}
-
-/* decryption request */
-CMTStatus
-CMT_DoDecryptionRequest(CMTItem *message)
-{
-  CMTStatus rv = CMTSuccess;
-  DecryptRequestMessage request;
-  DecryptReplyMessage reply;
-  CMUint32 pLen = strlen(kPrefix);
-
-  /* Initialize */
-  request.data.data = 0;
-  request.ctx.data = 0;
-  reply.item.data = 0;
-
-  /* Decode the message */
-  rv = CMT_DecodeMessage(DecryptRequestTemplate, &request, message);
-  if (rv != CMTSuccess) goto loser;
-
-  /* Free incoming message */
-  free(message->data);
-  message->data = NULL;
-
-  /* "Decrypt" the message by removing the key */
-  if (pLen && memcmp(request.data.data, kPrefix, pLen) != 0) {
-    rv = CMTFailure;  /* Invalid format */
-    goto loser;
-  }
-
-  reply.item.len = request.data.len - pLen;
-  reply.item.data = calloc(reply.item.len, 1);
-  if (!reply.item.data) { rv = CMTFailure;  goto loser; }
-
-  memcpy(reply.item.data, &request.data.data[pLen], reply.item.len);
-  decrypt(&reply.item);
-
-  /* Create reply message */
-  message->type = SSM_SDR_DECRYPT_REPLY;
-  rv = CMT_EncodeMessage(DecryptReplyTemplate, message, &reply);
-  if (rv != CMTSuccess) goto loser;
-
-loser:
-  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;
-}
-
-/* "encrypt" */
-static unsigned char mask[64] = {
- 0x73, 0x46, 0x1a, 0x05, 0x24, 0x65, 0x43, 0xb4, 0x24, 0xee, 0x79, 0xc1, 0xcc,
- 0x49, 0xc7, 0x27, 0x11, 0x91, 0x2e, 0x8f, 0xaa, 0xf7, 0x62, 0x75, 0x41, 0x7e,
- 0xb2, 0x42, 0xde, 0x1b, 0x42, 0x7b, 0x1f, 0x33, 0x49, 0xca, 0xd1, 0x6a, 0x85,
- 0x05, 0x6c, 0xf9, 0x0e, 0x3e, 0x72, 0x02, 0xf2, 0xd8, 0x9d, 0xa1, 0xb8, 0x6e,
- 0x03, 0x18, 0x3e, 0x82, 0x86, 0x34, 0x1a, 0x61, 0xd9, 0x65, 0xb6, 0x7f
-};
-
-static void
-encrypt(CMTItem *data)
-{
-  unsigned int i, j;
-
-  j = 0;
-  for(i = 0;i < data->len;i++)
-  {
-    data->data[i] ^= mask[j];
-
-    if (++j >= 64) j = 0;
-  }
-}
-
-static void
-decrypt(CMTItem *data)
-{
-  encrypt(data);
-}
-
-

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

@@ -1,48 +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.
- */
-/*
-  protocolshr.h - Definitions of shared routines for both client and server
-    These are mostly for testing.
- */
-
-#ifndef __PROTOCOLSHR_H__
-#define __PROTOCOLSHR_H__
-
-CMTStatus
-CMT_DoEncryptionRequest(CMTItem *message);
-
-CMTStatus
-CMT_DoDecryptionRequest(CMTItem *meessage);
-
-
-#endif /* __PROTOCOLSHR_H__ */

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

@@ -1,207 +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 "protocolf.h"
-#include <stdio.h>
-  
- 
-int main() 
-{
-  void * blob, * recvd;
-  int blobSize;
-  SSMPRUint32 version, flags, port, connID, keySize, secretKeySize;
-  SSMPRUint32 sessionID, httpPort;
-  SSMPRInt32 result;
-  char *profile, * nonce, * hostIP, * hostName, * cipher, * CA;
-  SSMPRStatus rv;
-  
-  
-  /*
-   * Test functions to pack and parse HelloRequest message 
-   */
-  version = 3;
-  profile = (char *)SSMPORT_ZAlloc(strlen("profile"));
-  sprintf(profile, "profile");
-  printf("HelloRequest, packing version #%d, profile %s\n", 
-	 version, profile);
-  blobSize = SSM_PackHelloRequest(&blob, version, profile);
-  if (!blobSize)
-    printf("Error in PackHelloRequest: %d\n", SSMPR_GetError());
-  SSMPORT_Free(profile);
-  version = 0;
-  recvd = (void *)SSMPORT_ZAlloc(blobSize);
-  if (!recvd) printf("Can't allocate %d bytes of memory!\n", blobSize);
-  memcpy(recvd, blob, blobSize);
-  SSMPORT_Free(blob);
-  rv = SSM_ParseHelloRequest(recvd, &version, &profile);
-  if (rv != SSMPR_SUCCESS) 
-    printf("Error in ParseHelloRequest: %d\n", SSMPR_GetError());
-  printf("HelloRequest, parsing version #%d, profile %s\n", 
-	 version, profile);
-
-
-  /* 
-   * Test functions to parse and pack HelloReply message
-   */
-  version = 5;
-  result = 2;
-  sessionID = 34567;
-  httpPort = 87654;
-  nonce = (char *)SSMPORT_ZAlloc(strlen("some secret nonce"));
-  sprintf(nonce, "some secret nonce");
-  printf("HelloReply, packing result %d, sessionID %d, version #%d, httpPort %d,\n nonce %s\n", 
-	 result, sessionID, version, httpPort, nonce);
-  blobSize = SSM_PackHelloReply(&blob, result, sessionID, version, httpPort, 
-				nonce);
-  if (!blobSize) 
-    printf("Error in PackHelloReply: %d\n", SSMPR_GetError());
-  memset(nonce, 0, strlen(nonce));
-  SSMPORT_Free(nonce);
-  version = result = sessionID = httpPort = 0;
-  recvd = (void *)SSMPORT_ZAlloc(blobSize);
-  if (!recvd) printf("Can't allocate %d bytes of memory!\n", blobSize);
-  memcpy(recvd, blob, blobSize);
-  SSMPORT_Free(blob);
-  rv = SSM_ParseHelloReply(recvd, &result, &sessionID, &version, &httpPort, 
-			   &nonce);
-  if (rv != SSMPR_SUCCESS) 
-    printf("Error in ParseHelloReply: %d\n", SSMPR_GetError());
-  printf("HelloReply, parsing result %d, sessionID %d, version #%d, httpPort %d, \n nonce %s\n", 
-	 result, sessionID, version, httpPort, nonce);
-  
-  /*
-   * Test functions to parse and pack SSLDataConnectionRequest message
-   */
-  flags = 0x00044000;
-  port = 34567;
-  hostIP = (char *)SSMPORT_ZAlloc(strlen("somehostIP"));
-  sprintf(hostIP, "somehostIP");
-  hostName = (char *)SSMPORT_ZAlloc(strlen("somehostName"));
-  sprintf(hostName, "somehostName");
-  printf("SSLDataConnRequest, packing flags %x, port %d, hostIP %s, hostName %s\n", 
-	 flags, port, hostIP, hostName);
-  blobSize = SSM_PackSSLDataConnectionRequest(&blob, flags, port, hostIP, 
-					  hostName);
-  if (!blobSize) 
-    printf("Error in PackSSLDataConnectionRequest: %d\n", SSMPR_GetError());
-  SSMPORT_Free(hostIP);
-  SSMPORT_Free(hostName);
-  flags = port = 0;
-  
-  recvd = (void *)SSMPORT_ZAlloc(blobSize);
-  if (!recvd) printf("Can't allocate %d bytes of memory!\n", blobSize);
-  memcpy(recvd, blob, blobSize);
-  SSMPORT_Free(blob);  
-  
-  rv = SSM_ParseSSLDataConnectionRequest(recvd, &flags, &port, &hostIP, 
-					 &hostName);
-  if (rv != SSMPR_SUCCESS) 
-    printf("Error in ParseSSLDataConnectionRequest: %d\n", SSMPR_GetError());
-  printf(
-"SSLDataConnRequest, parsing flags %x, port %d, hostIP %s, hostName %s\n", 
-	 flags, port, hostIP, hostName);
-  SSMPORT_Free(hostIP);
-  SSMPORT_Free(hostName);
-  
-  
-  /*
-   * Test functions to parse and pack SSLDataConnectionReply message 
-   */
-  result = 2;
-  connID = 713259;
-  port = 57402;
-  printf("SSLDataConnReply, packing result %d, connectionID %d, port %d\n",
-	 result, connID, port);
-  blobSize = SSM_PackSSLDataConnectionReply(&blob, result, connID, port);
-  if (!blobSize) 
-    printf("Error in PackSSLDataConnReply: %d\n", SSMPR_GetError());
-  result = connID = port = 0;
-  recvd = (void *)SSMPORT_ZAlloc(blobSize);
-  if (!recvd) printf("Can't allocate %d bytes of memory!\n", blobSize);
-  memcpy(recvd, blob, blobSize);
-  SSMPORT_Free(blob);
-  rv = SSM_ParseSSLDataConnectionReply(recvd, &result, &connID, &port);
-  if (rv != SSMPR_SUCCESS) 
-    printf("Error in ParseSSLDataConnectionReply: %d\n", SSMPR_GetError());
-  printf("SSLDataConnReply, parsing result %d, connectionID %d, port %d\n", 
-	 result, connID, port);
-  
-  
-  /* 
-   * Test functions to parse and pack SecurityStatusRequest message
-   */
-  connID = 45375;
-  printf("SecurityStatusRequest, packing connection ID %d\n", connID);
-  blobSize = SSM_PackSecurityStatusRequest(&blob, connID);
-  if (!blobSize)  
-    printf("Error in PackSecurityStatusRequest: %d\n", SSMPR_GetError());
-  connID = 0;
-  recvd = (void *)SSMPORT_ZAlloc(blobSize);
-  if (!recvd) printf("Can't allocate %d bytes of memory!\n", blobSize);
-  memcpy(recvd, blob, blobSize);
-  SSMPORT_Free(blob);
-  rv = SSM_ParseSecurityStatusRequest(recvd, &connID);
-  if (rv != SSMPR_SUCCESS) 
-    printf("Error in ParseSecurityStatusRequest: %d\n", SSMPR_GetError());
-  printf("SecurityStatusRequest, parsing connection ID %d\n", connID);
-  
-
-  /* 
-   * Test functions to parse and pack SecurityStatusReply message 
-   */
-  result = 2;
-  keySize = 256;
-  secretKeySize = 511;
-  cipher = (char *)SSMPORT_ZAlloc(strlen("My Cipher"));
-  sprintf(cipher, "My Cipher");
-  CA = (char *)SSMPORT_ZAlloc(strlen("My CA issuer"));
-  sprintf(CA, "My CA issuer");
-  printf("SecurityStatusReply, packing result %d, keysize %d, secretKeySize %d, cipher %s, CA %s\n", result, keySize, secretKeySize, cipher, CA);
-  blobSize = SSM_PackSecurityStatusReply(&blob, result, keySize, secretKeySize, cipher, CA);
-  if (!blobSize) 
-    printf("Error in PackSecurityStatusReply: %d\n", SSMPR_GetError());
-  result = keySize = secretKeySize = 0;
-  SSMPORT_Free(cipher);
-  SSMPORT_Free(CA);
-  recvd = (void *)SSMPORT_ZAlloc(blobSize);
-  if (!recvd) printf("Can't allocate %d bytes of memory!\n", blobSize);
-  memcpy(recvd, blob, blobSize);
-  SSMPORT_Free(blob);
-  rv = SSM_ParseSecurityStatusReply(recvd, &result, &keySize, &secretKeySize, 
-				    &cipher, &CA);
-  if (rv != SSMPR_SUCCESS) 
-    printf("Error in ParseSecurityStatusReply: %d\n", SSMPR_GetError());
-  printf("SecurityStatusReply, parsing result %d, keysize %d, secretKeySize %d, cipher %s, CA %s\n", result, keySize, secretKeySize, cipher, CA);
-}     
-
-
-

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

@@ -1,130 +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 "protocol.h"
-#include "prmem.h"
-#include "prnetdb.h"
-#include <string.h>
-
-#ifndef NSPR20
-#include "protocolport.c"
-#endif
-
-CMStatus SSM_SSMStringToString(char ** string,
-			       int *len, 
-			       SSMString * ssmString) 
-{
-  char * str = NULL;
-  int realLen;
-  PRStatus rv =PR_SUCCESS;
-
-  if (!ssmString || !string ) { 
-    rv = PR_INVALID_ARGUMENT_ERROR;
-    goto loser;
-  }
-
-  /* in case we fail */
-  *string = NULL;
-  if (len) *len = 0;
-
-  /* Convert from net byte order */
-  realLen = SSMPR_ntohl(ssmString->m_length);
-
-  str = (char *)PR_CALLOC(realLen+1); /* add 1 byte for end 0 */
-  if (!str) {
-    rv = PR_OUT_OF_MEMORY_ERROR;
-    goto loser;
-  }
-  
-  memcpy(str, (char *) &(ssmString->m_data), realLen);
-  /* str[realLen]=0; */
-
-  if (len) *len = realLen;
-  *string = str;
-  return rv;
-  
-loser:
-  if (str) 
-    PR_Free(str);
-  if (string && *string) {
-    PR_Free(*string);
-    *string = NULL;
-  }
-  if (rv == PR_SUCCESS) 
-    rv = PR_FAILURE;
-  return rv;
-}
-
-
-CMStatus SSM_StringToSSMString(SSMString ** ssmString, int length, 
-				  char * string)
-{
-  SSMPRUint32 len;
-  SSMString *result = NULL;
-  PRStatus rv = PR_SUCCESS;
-  
-  if (!string || !ssmString) {
-    rv = PR_INVALID_ARGUMENT_ERROR;
-    goto loser;
-  }
-
-  *ssmString = NULL; /* in case we fail */
-
-  if (length) len = length; 
-  else len = strlen(string);
-  if (len <= 0) {
-    rv = PR_INVALID_ARGUMENT_ERROR;
-    goto loser;
-  }
-  result = (SSMString *) PR_CALLOC(sizeof(PRUint32) + 
-				   SSMSTRING_PADDED_LENGTH(len));
-  if (!result) {
-    rv = PR_OUT_OF_MEMORY_ERROR;
-    goto loser;
-  }
-
-  result->m_length = SSMPR_htonl(len);
-  memcpy((char *) (&(result->m_data)), string, len);
-
-  *ssmString = result;
-  goto done;
-  
-loser:
-  if (result)
-    PR_Free(result);
-  *ssmString = NULL;
-  if (rv == PR_SUCCESS)
-    rv = PR_FAILURE;
-done:
-  return rv;
-}
-

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

@@ -1,165 +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 __SSM_RSRCIDS_H__
-#define __SSM_RSRCIDS_H__
-
-#include "ssmdefs.h"
-
-/*
- * IMPORTANT:
- *
- * To preserve backward compatibility as much as possible, always add new 
- * values to either one of the enumeration tables at the end of the table.
- */
-
-typedef enum 
-{
-    SSM_RESTYPE_NULL = 0L,
-    SSM_RESTYPE_RESOURCE,
-    SSM_RESTYPE_CONNECTION,
-    SSM_RESTYPE_CONTROL_CONNECTION,
-    SSM_RESTYPE_DATA_CONNECTION,
-    SSM_RESTYPE_SSL_DATA_CONNECTION,
-    SSM_RESTYPE_PKCS7_DECODE_CONNECTION,
-    SSM_RESTYPE_PKCS7_ENCODE_CONNECTION,
-    SSM_RESTYPE_HASH_CONNECTION,
-    
-    SSM_RESTYPE_CERTIFICATE,
-    SSM_RESTYPE_SSL_SOCKET_STATUS,
-    SSM_RESTYPE_PKCS7_CONTENT_INFO,
-    SSM_RESTYPE_KEY_PAIR,
-    SSM_RESTYPE_CRMF_REQUEST,
-    SSM_RESTYPE_KEYGEN_CONTEXT,
-    SSM_RESTYPE_SECADVISOR_CONTEXT,
-    SSM_RESTYPE_SIGNTEXT,
-    SSM_RESTYPE_PKCS12_CONTEXT,
-    SSM_RESTYPE_MAX
-} SSMResourceType;
-
-/* Attribute/resource types */
-
-/* Attribute IDs */
-typedef enum
-{
-    SSM_FID_NULL = (CMUint32) 0, /* placeholder */
-
-    /* Connection attributes */
-    SSM_FID_CONN_ALIVE,
-    SSM_FID_CONN_PARENT,
-
-    /* Data connection attributes */
-    SSM_FID_CONN_DATA_PENDING,
-
-    /* SSL data connection attributes */
-    SSM_FID_SSLDATA_SOCKET_STATUS,
-    SSM_FID_SSLDATA_ERROR_VALUE,
-
-    /* PKCS7 decode connection attributes */
-    SSM_FID_P7CONN_CONTENT_INFO,
-    SSM_FID_P7CONN_RETURN_VALUE,
-    SSM_FID_P7CONN_ERROR_VALUE,
-
-    /* Hash connection attributes */
-    SSM_FID_HASHCONN_RESULT,
-
-    /* Certificate attributes */
-    SSM_FID_CERT_SUBJECT_NAME,
-    SSM_FID_CERT_ISSUER_NAME,
-    SSM_FID_CERT_SERIAL_NUMBER,
-    SSM_FID_CERT_EXP_DATE,
-    SSM_FID_CERT_FINGERPRINT,
-    SSM_FID_CERT_COMMON_NAME,
-    SSM_FID_CERT_NICKNAME,
-    SSM_FID_CERT_ORG_NAME,
-    SSM_FID_CERT_HTML_CERT,
-    SSM_FID_CERT_PICKLE_CERT,
-    SSM_FID_CERT_CERTKEY,
-    SSM_FID_CERT_FIND_CERT_ISSUER,
-    SSM_FID_CERT_EMAIL_ADDRESS,
-    SSM_FID_CERT_ISPERM,
-
-    /* SSL socket status attributes */
-    SSM_FID_SSS_KEYSIZE,
-    SSM_FID_SSS_SECRET_KEYSIZE,
-    SSM_FID_SSS_CERT_ID,
-    SSM_FID_SSS_CIPHER_NAME,
-    SSM_FID_SSS_SECURITY_LEVEL,
-    SSM_FID_SSS_HTML_STATUS,
-
-    /* PKCS7 content info attributes */
-    SSM_FID_P7CINFO_IS_SIGNED,
-    SSM_FID_P7CINFO_IS_ENCRYPTED,
-    SSM_FID_P7CINFO_SIGNER_CERT,
-
-    /* CRMF ID's */
-    SSM_FID_CRMFREQ_REGTOKEN,
-    SSM_FID_CRMFREQ_AUTHENTICATOR,
-    SSM_FID_CRMFREQ_EXTENSIONS,
-    SSM_FID_CRMFREQ_KEY_TYPE,
-    SSM_FID_CRMFREQ_DN,
-
-    /* Security advisor context */
-    SSM_FID_SECADVISOR_URL,
-    SSM_FID_SECADVISOR_WIDTH,
-    SSM_FID_SECADVISOR_HEIGHT,
-
-    /* Sign Text */
-    SSM_FID_SIGNTEXT_RESULT,
-
-    /* Key Gen ID's */
-    SSM_FID_KEYGEN_ESCROW_AUTHORITY,
-
-    /* Key Pair ID's */
-    SSM_FID_KEYPAIR_KEY_GEN_TYPE,
-
-    /* Session Attributes */
-    SSM_FID_DEFAULT_EMAIL_RECIPIENT_CERT,
-    SSM_FID_DEFAULT_EMAIL_SIGNER_CERT,
-
-    /* Client Context Attribute */
-    SSM_FID_CLIENT_CONTEXT,
-
-	/* Resource Error */
-	SSM_FID_RESOURCE_ERROR,
-
-    SSM_FID_KEYGEN_SLOT_NAME,
-    SSM_FID_DISABLE_ESCROW_WARN,
-    SSM_FID_KEYGEN_TOKEN_NAME,
-
-    SSM_FID_SSLDATA_DISCARD_SOCKET_STATUS,
-
-    SSM_FID_MAX /* placeholder */
-} SSMAttributeID;
-
-#endif

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

@@ -1,324 +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 __SSMDEFS_H__
-#define __SSMDEFS_H__
-
-/* Basic type definitions for both client and server. */
-typedef long CMInt32;
-typedef unsigned long CMUint32;
-typedef long SSMResourceID;
-
-typedef int SSMStatus;
-
-#define PSM_PORT                        11111
-#define PSM_DATA_PORT                   11113 /* needs to be removed */
- 
-typedef enum _CMTStatus {
-  CMTFailure = -1,
-  CMTSuccess = 0
-} CMTStatus;
-
-typedef enum {
-   CM_FALSE = 0,
-   CM_TRUE = 1
-} CMBool;
- 
-typedef struct CMTItemStr {
-  CMUint32 type;
-  unsigned char *data;
-  unsigned int len;
-} CMTItem;
-
-/* A length-encoded string. */
-struct _SSMString {
-  CMUint32 m_length;
-  char m_data;
-};
-typedef struct _SSMString SSMString;
-
-#define SSM_PROTOCOL_VERSION 0x00000051
-
-#define SSM_INVALID_RESOURCE 0x00000000
-#define SSM_GLOBAL_RESOURCE  0x00000001
-#define SSM_SESSION_RESOURCE 0x00000002
-
-/* Message category flags */
-#define SSM_REQUEST_MESSAGE     0x10000000
-#define SSM_REPLY_OK_MESSAGE    0x20000000
-#define SSM_REPLY_ERR_MESSAGE   0x30000000
-#define SSM_EVENT_MESSAGE       0x40000000
-
-/* Message types */
-#define SSM_DATA_CONNECTION   0x00001000
-#define SSM_OBJECT_SIGNING    0x00002000
-#define SSM_RESOURCE_ACTION   0x00003000
-#define SSM_CERT_ACTION       0x00004000
-#define SSM_PKCS11_ACTION     0x00005000
-#define SSM_CRMF_ACTION       0x00006000
-#define SSM_FORMSIGN_ACTION   0x00007000
-#define SSM_LOCALIZED_TEXT    0x00008000
-#define SSM_HELLO_MESSAGE     0x00009000
-#define SSM_SECURITY_ADVISOR  0x0000a000
-#define SSM_SEC_CFG_ACTION    0x0000b000
-#define SSM_KEYGEN_TAG        0x0000c000
-#define SSM_PREF_ACTION       0x0000d000
-#define SSM_MISC_ACTION       0x0000f000
-
-/* Data connection messages subtypes */ 
-#define SSM_SSL_CONNECTION      0x00000100
-#define SSM_PKCS7DECODE_STREAM  0x00000200
-#define SSM_PKCS7ENCODE_STREAM  0x00000300
-#define SSM_HASH_STREAM         0x00000400
-#define SSM_TLS_CONNECTION      0x00000500
-#define SSM_PROXY_CONNECTION    0x00000600
-
-/* Object signing message subtypes */
-#define SSM_VERIFY_RAW_SIG      0x00000100
-#define SSM_VERIFY_DETACHED_SIG 0x00000200
-#define SSM_CREATE_SIGNED       0x00000300
-#define SSM_CREATE_ENCRYPTED    0x00000400
-
-/* Resource access messages subtypes  */
-#define SSM_CREATE_RESOURCE           0x00000100
-#define SSM_DESTROY_RESOURCE          0x00000200
-#define SSM_GET_ATTRIBUTE             0x00000300
-#define SSM_CONSERVE_RESOURCE         0x00000400
-#define SSM_DUPLICATE_RESOURCE        0x00000500
-#define SSM_SET_ATTRIBUTE             0x00000600
-#define SSM_TLS_STEPUP                0x00000700
-#define SSM_PROXY_STEPUP              0x00000800
-
-/* Further specification for resource access messages */
-#define SSM_SSLSocket_Status    0x00000010
-
-#define SSM_NO_ATTRIBUTE        0x00000000
-#define SSM_NUMERIC_ATTRIBUTE   0x00000010
-#define SSM_STRING_ATTRIBUTE    0x00000020
-#define SSM_RID_ATTRIBUTE       0x00000030
-
-#define SSM_PICKLE_RESOURCE             0x00000010
-#define SSM_UNPICKLE_RESOURCE           0x00000020
-#define SSM_PICKLE_SECURITY_STATUS      0x00000030
-
-/* Certificate access message subtypes */
-#define SSM_IMPORT_CERT         0x00000100
-#define SSM_VERIFY_CERT         0x00000200
-#define SSM_FIND_BY_NICKNAME    0x00000300
-#define SSM_FIND_BY_KEY         0x00000400
-#define SSM_FIND_BY_EMAILADDR   0x00000500
-#define SSM_ADD_TO_DB           0x00000600
-#define SSM_DECODE_CERT         0x00000700
-#define SSM_MATCH_USER_CERT     0x00000800
-#define SSM_DESTROY_CERT        0x00000900
-#define SSM_DECODE_TEMP_CERT    0x00000a00
-#define SSM_REDIRECT_COMPARE    0x00000b00
-#define SSM_DECODE_CRL          0x00000c00
-#define SSM_EXTENSION_VALUE     0x00000d00
-#define SSM_HTML_INFO           0x00000e00
-
-/* message subtypes used for KEYGEN form tag */
-#define SSM_GET_KEY_CHOICE       0x00000100
-#define SSM_KEYGEN_START         0x00000200
-#define SSM_KEYGEN_TOKEN         0x00000300
-#define SSM_KEYGEN_PASSWORD      0x00000400
-#define SSM_KEYGEN_DONE          0x00000500
-
-#define SSM_CREATE_KEY_PAIR    0x00000100
-#define SSM_FINISH_KEY_GEN     0x00000200
-#define SSM_ADD_NEW_MODULE     0x00000300
-#define SSM_DEL_MODULE         0x00000400
-#define SSM_LOGOUT_ALL         0x00000500
-#define SSM_ENABLED_CIPHERS    0x00000600
-
-#define SSM_CREATE_CRMF_REQ    0x00000100
-#define SSM_DER_ENCODE_REQ     0x00000200
-#define SSM_PROCESS_CMMF_RESP  0x00000300
-#define SSM_CHALLENGE          0x00000400
-
-#define SSM_SIGN_TEXT  0x00000100
-
-/* Security Config subtypes */
-#define SSM_ADD_CERT_TO_TEMP_DB     0x00000100
-#define SSM_ADD_TEMP_CERT_TO_DB     0x00000200
-#define SSM_DELETE_PERM_CERTS       0x00000300
-#define SSM_FIND_CERT_KEY           0x00000400
-#define SSM_GET_CERT_PROP_BY_KEY    0x00000500
-#define SSM_CERT_INDEX_ENUM         0x00000600
-
-/* subcategories for SSM_FIND_CERT_KEY and SSM_CERT_INDEX_ENUM */
-#define SSM_FIND_KEY_BY_NICKNAME    0x00000010
-#define SSM_FIND_KEY_BY_EMAIL_ADDR  0x00000020
-#define SSM_FIND_KEY_BY_DN          0x00000030
-
-/* subcategories for SSM_GET_CERT_PROP_BY_KEY */
-#define SSM_SECCFG_GET_NICKNAME      0x00000010
-#define SSM_SECCFG_GET_EMAIL_ADDR    0x00000020
-#define SSM_SECCFG_GET_DN            0x00000030
-#define SSM_SECCFG_GET_TRUST         0x00000040
-#define SSM_SECCFG_CERT_IS_PERM      0x00000050
-#define SSM_SECCFG_GET_NOT_BEFORE    0x00000060
-#define SSM_SECCFG_GET_NOT_AFTER     0x00000070
-#define SSM_SECCFG_GET_SERIAL_NO     0x00000080
-#define SSM_SECCFG_GET_ISSUER        0x00000090
-#define SSM_SECCFG_GET_ISSUER_KEY    0x000000a0
-#define SSM_SECCFG_GET_SUBJECT_NEXT  0x000000b0
-#define SSM_SECCFG_GET_SUBJECT_PREV  0x000000c0
-
-/* Misc requests */
-#define SSM_MISC_GET_RNG_DATA      0x00000100
-#define SSM_MISC_PUT_RNG_DATA      0x00000200
-#define SSM_MISC_SDR_ENCRYPT       0x00000300
-#define SSM_MISC_SDR_DECRYPT       0x00000400
-#define SSM_MISC_UI                0x00000500
-
-/* specific UI requests */
-#define SSM_UI_CHANGE_PASSWORD     0x00000010
-
-#define SSM_SDR_ENCRYPT_REQUEST \
-  (SSM_REQUEST_MESSAGE|SSM_MISC_ACTION|SSM_MISC_SDR_ENCRYPT)
-#define SSM_SDR_ENCRYPT_REPLY \
-  (SSM_REPLY_OK_MESSAGE|SSM_MISC_ACTION|SSM_MISC_SDR_ENCRYPT)
-#define SSM_SDR_DECRYPT_REQUEST \
-  (SSM_REQUEST_MESSAGE|SSM_MISC_ACTION|SSM_MISC_SDR_DECRYPT)
-#define SSM_SDR_DECRYPT_REPLY \
-  (SSM_REPLY_OK_MESSAGE|SSM_MISC_ACTION|SSM_MISC_SDR_DECRYPT)
-
-/* Type masks for message types */
-#define SSM_CATEGORY_MASK   0xF0000000
-#define SSM_TYPE_MASK       0x0000F000
-#define SSM_SUBTYPE_MASK    0x00000F00
-#define SSM_SPECIFIC_MASK   0x000000F0
-
-typedef struct SSMAttributeValue {
-  CMUint32 type;
-  union {
-    SSMResourceID rid;
-    CMTItem string;
-    CMInt32 numeric;
-  } u;
-} SSMAttributeValue;
-
-typedef enum {
-  rsaEnc, rsaDualUse, rsaSign, rsaNonrepudiation, rsaSignNonrepudiation,
-  dhEx, dsaSignNonrepudiation, dsaSign, dsaNonrepudiation, invalidKeyGen
-} SSMKeyGenType;
-
-typedef enum {
-  ssmUnknownPolicy= -1,ssmDomestic=0, ssmExport=1, ssmFrance=2
-} SSMPolicyType;
-
-/* These are the localized strings that PSM can feed back to 
- * the plug-in.  These will initially be used by the plug-in for 
- * JavaScript purposes to pop up alert/confirm dialogs that would 
- * cause nightmares to do if we sent UI events.
- */
-typedef enum {
-  SSM_STRING_BAD_PK11_LIB_PARAM,
-  SSM_STRING_BAD_PK11_LIB_PATH,
-  SSM_STRING_ADD_MOD_SUCCESS,
-  SSM_STRING_DUP_MOD_FAILURE,
-  SSM_STRING_ADD_MOD_FAILURE,
-  SSM_STRING_BAD_MOD_NAME,
-  SSM_STRING_EXT_MOD_DEL,
-  SSM_STRING_INT_MOD_DEL,
-  SSM_STRING_MOD_DEL_FAIL,
-  SSM_STRING_ADD_MOD_WARN,
-  SSM_STRING_MOD_PROMPT,
-  SSM_STRING_DLL_PROMPT,
-  SSM_STRING_DEL_MOD_WARN,
-  SSM_STRING_INVALID_CRL,
-  SSM_STRING_INVALID_CKL,
-  SSM_STRING_ROOT_CKL_CERT_NOT_FOUND,
-  SSM_STRING_BAD_CRL_SIGNATURE,
-  SSM_STRING_BAD_CKL_SIGNATURE,
-  SSM_STRING_ERR_ADD_CRL,
-  SSM_STRING_ERR_ADD_CKL,
-  SSM_STRING_JAVASCRIPT_DISABLED
-} SSMLocalizedString;
-
-/* Event types */
-#define SSM_UI_EVENT                    0x00001000
-#define SSM_TASK_COMPLETED_EVENT        0x00002000
-#define SSM_FILE_PATH_EVENT             0x00003000
-#define SSM_PROMPT_EVENT                0x00004000
-#define SSM_AUTH_EVENT                  0x00007000
-#define SSM_SAVE_PREF_EVENT             0x00008000
-#define SSM_MISC_EVENT                  0x0000f000
-
-/* Flags used in Create SSL Data request */
-#define SSM_REQUEST_SSL_DATA_SSL         0x00000001
-#define SSM_REQUEST_SSL_DATA_PROXY       0x00000002
-#define SSM_REQUEST_SSL_CONNECTION_MASK  0x00000003
-
-/* Create typedefs for the various #defines */
-typedef CMUint32 SSMMessageCategory;
-typedef CMUint32 SSMMessageType;
-typedef CMUint32 SSMDataConnectionSType;
-typedef CMUint32 SSMObjSignSType;
-typedef CMUint32 SSMResourceAccessSType;
-typedef CMUint32 SSMCreateResource;
-typedef CMUint32 SSMResourceAttrType;
-typedef CMUint32 SSMResourceConsv;
-typedef CMUint32 SSMCertAccessSType;
-typedef CMUint32 SSMKeyGenTagProcessType;
-typedef CMUint32 SSMPKCS11Actions;
-typedef CMUint32 SSMCRMFAction;
-typedef CMUint32 SSMFormSignAction;
-typedef CMUint32 SSMSecCfgAction;
-typedef CMUint32 SSMSecCfgFindByType;
-typedef CMUint32 SSMSecCfgGetCertPropType;
-typedef CMUint32 SSMMiscRequestType;
-typedef CMUint32 SSMMessageMaskType;
-typedef CMUint32 SSMEventType;
-typedef CMUint32 SSMSSLConnectionRequestType;
-
-/*
- * This string is version that can be used to assemble any
- * version information by the apllication using the protocol 
- * library.
- */
-extern char SSMVersionString[];
-
-/* What type of client */
-typedef enum
-{
-    SSM_NOINFO,
-    SSM_COMPOSE,
-    SSM_MAIL_MESSAGE,
-    SSM_NEWS_MESSAGE,
-    SSM_SNEWS_MESSAGE,
-    SSM_BROWSER
-} SSMClientType;
-
-#endif /* __SSMDEFS_H__ */

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

@@ -1,628 +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 "stddef.h"
-#include "messages.h"
-
-CMTMessageTemplate SingleNumMessageTemplate[] =
-{
-  { CMT_DT_INT, offsetof(SingleNumMessage, value) },
-  { CMT_DT_END }
-};
-
-CMTMessageTemplate SingleStringMessageTemplate[] =
-{
-  { CMT_DT_STRING, offsetof(SingleStringMessage, string) },
-  { CMT_DT_END }
-};
-
-CMTMessageTemplate SingleItemMessageTemplate[] =
-{
-  { CMT_DT_ITEM, offsetof(SingleItemMessage, item) },
-  { CMT_DT_END }
-};
-
-CMTMessageTemplate HelloRequestTemplate[] =
-{
-  { CMT_DT_INT, offsetof(HelloRequest, version) },
-  { CMT_DT_INT, offsetof(HelloRequest, policy) },
-  { CMT_DT_BOOL, offsetof(HelloRequest, doesUI) },
-  { CMT_DT_STRING, offsetof(HelloRequest, profile) },
-  { CMT_DT_STRING, offsetof(HelloRequest, profileDir) },
-  { CMT_DT_END }
-};
-
-CMTMessageTemplate HelloReplyTemplate[] =
-{
-  { CMT_DT_INT, offsetof(HelloReply, result) },
-  { CMT_DT_INT, offsetof(HelloReply, sessionID) },
-  { CMT_DT_INT, offsetof(HelloReply, version) },
-  { CMT_DT_STRING, offsetof(HelloReply, stringVersion) },
-  { CMT_DT_INT, offsetof(HelloReply, httpPort) },
-  { CMT_DT_INT, offsetof(HelloReply, policy) },
-  { CMT_DT_ITEM, offsetof(HelloReply, nonce) },
-  { CMT_DT_END }
-};
-
-CMTMessageTemplate SSLDataConnectionRequestTemplate[] =
-{
-  { CMT_DT_INT, offsetof(SSLDataConnectionRequest, flags) },
-  { CMT_DT_INT, offsetof(SSLDataConnectionRequest, port) },
-  { CMT_DT_STRING, offsetof(SSLDataConnectionRequest, hostIP) },
-  { CMT_DT_STRING, offsetof(SSLDataConnectionRequest, hostName) },
-  { CMT_DT_BOOL, offsetof(SSLDataConnectionRequest, forceHandshake) },
-  { CMT_DT_ITEM, offsetof(SSLDataConnectionRequest, clientContext) },
-  { CMT_DT_END }
-};
-
-CMTMessageTemplate TLSDataConnectionRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(TLSDataConnectionRequest, port) },
-    { CMT_DT_STRING, offsetof(TLSDataConnectionRequest, hostIP) },
-    { CMT_DT_STRING, offsetof(TLSDataConnectionRequest, hostName) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate TLSStepUpRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(TLSStepUpRequest, connID) },
-    { CMT_DT_ITEM, offsetof(TLSStepUpRequest, clientContext) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate ProxyStepUpRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(ProxyStepUpRequest, connID) },
-    { CMT_DT_ITEM, offsetof(ProxyStepUpRequest, clientContext) },
-    { CMT_DT_STRING, offsetof(ProxyStepUpRequest, url) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate PKCS7DataConnectionRequestTemplate[] =
-{
-  { CMT_DT_INT, offsetof(PKCS7DataConnectionRequest, resID) },
-  { CMT_DT_ITEM, offsetof(PKCS7DataConnectionRequest, clientContext) },
-  { CMT_DT_END }
-};
-
-CMTMessageTemplate DataConnectionReplyTemplate[] =
-{
-  { CMT_DT_INT, offsetof(DataConnectionReply, result) },
-  { CMT_DT_INT, offsetof(DataConnectionReply, connID) },
-  { CMT_DT_INT, offsetof(DataConnectionReply, port) },
-  { CMT_DT_END }
-};
-
-CMTMessageTemplate UIEventTemplate[] =
-{
-    { CMT_DT_INT, offsetof(UIEvent, resourceID) },
-    { CMT_DT_INT, offsetof(UIEvent, width) },
-    { CMT_DT_INT, offsetof(UIEvent, height) },
-    { CMT_DT_BOOL, offsetof(UIEvent, isModal) },
-    { CMT_DT_STRING, offsetof(UIEvent, url) },
-    { CMT_DT_ITEM, offsetof(UIEvent, clientContext) },
-    { CMT_DT_END }
-};
-
-/*
- * The old UI Event was missing the modal indication.
- * As a transition aid, we use the old template if the
- * "modern" version doesn't work.  Model is true in that case
- */
-CMTMessageTemplate OldUIEventTemplate[] =
-{
-    { CMT_DT_INT, offsetof(UIEvent, resourceID) },
-    { CMT_DT_INT, offsetof(UIEvent, width) },
-    { CMT_DT_INT, offsetof(UIEvent, height) },
-    { CMT_DT_STRING, offsetof(UIEvent, url) },
-    { CMT_DT_ITEM, offsetof(UIEvent, clientContext) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate TaskCompletedEventTemplate[] =
-{
-    { CMT_DT_INT, offsetof(TaskCompletedEvent, resourceID) },
-    { CMT_DT_INT, offsetof(TaskCompletedEvent, numTasks) },
-    { CMT_DT_INT, offsetof(TaskCompletedEvent, result) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate VerifyDetachedSigRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(VerifyDetachedSigRequest, pkcs7ContentID) },
-    { CMT_DT_INT, offsetof(VerifyDetachedSigRequest, certUsage) },
-    { CMT_DT_INT, offsetof(VerifyDetachedSigRequest, hashAlgID) },
-    { CMT_DT_BOOL, offsetof(VerifyDetachedSigRequest, keepCert) },
-    { CMT_DT_ITEM, offsetof(VerifyDetachedSigRequest, hash) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate CreateSignedRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(CreateSignedRequest, scertRID) },
-    { CMT_DT_INT, offsetof(CreateSignedRequest, ecertRID) },
-    { CMT_DT_INT, offsetof(CreateSignedRequest, dig_alg) },
-    { CMT_DT_ITEM, offsetof(CreateSignedRequest, digest) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate CreateContentInfoReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(CreateContentInfoReply, ciRID) },
-    { CMT_DT_INT, offsetof(CreateContentInfoReply, result) },
-    { CMT_DT_INT, offsetof(CreateContentInfoReply, errorCode) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate CreateEncryptedRequestTemplate[] =
-{
-  { CMT_DT_INT, offsetof(CreateEncryptedRequest, scertRID) },
-  { CMT_DT_LIST, offsetof(CreateEncryptedRequest, nrcerts) },
-  { CMT_DT_INT, offsetof(CreateEncryptedRequest, rcertRIDs) },
-  { CMT_DT_END }
-};
-
-CMTMessageTemplate CreateResourceRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(CreateResourceRequest, type) },
-    { CMT_DT_ITEM, offsetof(CreateResourceRequest, params) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate CreateResourceReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(CreateResourceReply, result) },
-    { CMT_DT_INT, offsetof(CreateResourceReply, resID) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate GetAttribRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(GetAttribRequest, resID) },
-    { CMT_DT_INT, offsetof(GetAttribRequest, fieldID) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate GetAttribReplyTemplate[] =
-{
-  { CMT_DT_INT, offsetof(GetAttribReply, result) },
-  { CMT_DT_CHOICE, offsetof(GetAttribReply, value.type) },
-  { CMT_DT_RID, offsetof(GetAttribReply, value.u.rid), 0, SSM_RID_ATTRIBUTE },
-  { CMT_DT_INT, offsetof(GetAttribReply, value.u.numeric), 0,
-    SSM_NUMERIC_ATTRIBUTE },
-  { CMT_DT_ITEM, offsetof(GetAttribReply, value.u.string), 0,
-    SSM_STRING_ATTRIBUTE},
-  { CMT_DT_END_CHOICE },
-  { CMT_DT_END }
-};
-
-CMTMessageTemplate SetAttribRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(SetAttribRequest, resID) },
-    { CMT_DT_INT, offsetof(SetAttribRequest, fieldID) },
-    { CMT_DT_CHOICE, offsetof(SetAttribRequest, value.type) },
-    { CMT_DT_RID, offsetof(SetAttribRequest, value.u.rid), 0, SSM_RID_ATTRIBUTE },
-    { CMT_DT_INT, offsetof(SetAttribRequest, value.u.numeric), 0,
-                            SSM_NUMERIC_ATTRIBUTE },
-    { CMT_DT_ITEM, offsetof(SetAttribRequest, value.u.string), 0,
-                            SSM_STRING_ATTRIBUTE},
-    { CMT_DT_END_CHOICE },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate PickleResourceReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(PickleResourceReply, result) },
-    { CMT_DT_ITEM, offsetof(PickleResourceReply, blob) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate UnpickleResourceRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(UnpickleResourceRequest, resourceType) },
-    { CMT_DT_ITEM, offsetof(UnpickleResourceRequest, resourceData) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate UnpickleResourceReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(UnpickleResourceReply, result) },
-    { CMT_DT_INT, offsetof(UnpickleResourceReply, resID) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate PickleSecurityStatusReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(PickleSecurityStatusReply, result) },
-    { CMT_DT_INT, offsetof(PickleSecurityStatusReply, securityLevel) },
-    { CMT_DT_ITEM, offsetof(PickleSecurityStatusReply, blob) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate DupResourceReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(DupResourceReply, result) },
-    { CMT_DT_RID, offsetof(DupResourceReply, resID), 0, SSM_RID_ATTRIBUTE },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate DestroyResourceRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(DestroyResourceRequest, resID) },
-    { CMT_DT_INT, offsetof(DestroyResourceRequest, resType) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate VerifyCertRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(VerifyCertRequest, resID) },
-    { CMT_DT_INT, offsetof(VerifyCertRequest, certUsage) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate AddTempCertToDBRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(AddTempCertToDBRequest, resID) },
-    { CMT_DT_STRING, offsetof(AddTempCertToDBRequest, nickname) },
-    { CMT_DT_INT, offsetof(AddTempCertToDBRequest, sslFlags) },
-    { CMT_DT_INT, offsetof(AddTempCertToDBRequest, emailFlags) },
-    { CMT_DT_INT, offsetof(AddTempCertToDBRequest, objSignFlags) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate MatchUserCertRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(MatchUserCertRequest, certType) },
-    { CMT_DT_LIST, offsetof(MatchUserCertRequest, numCANames) },
-    { CMT_DT_STRING, offsetof(MatchUserCertRequest, caNames) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate MatchUserCertReplyTemplate[] =
-{
-    { CMT_DT_LIST, offsetof(MatchUserCertReply, numCerts) },
-    { CMT_DT_INT, offsetof(MatchUserCertReply, certs) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate EncodeCRMFReqRequestTemplate[] =
-{
-    { CMT_DT_LIST, offsetof(EncodeCRMFReqRequest, numRequests) },
-    { CMT_DT_INT, offsetof(EncodeCRMFReqRequest, reqIDs) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate CMMFCertResponseRequestTemplate[] =
-{
-    { CMT_DT_STRING, offsetof(CMMFCertResponseRequest, nickname) },
-    { CMT_DT_STRING, offsetof(CMMFCertResponseRequest, base64Der) },
-    { CMT_DT_INT,    offsetof(CMMFCertResponseRequest, doBackup) },
-    { CMT_DT_ITEM,   offsetof(CMMFCertResponseRequest, clientContext) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate PasswordRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(PasswordRequest, tokenKey) },
-    { CMT_DT_STRING, offsetof(PasswordRequest, prompt) },
-    { CMT_DT_ITEM, offsetof(PasswordRequest, clientContext) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate PasswordReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(PasswordReply, result) },
-    { CMT_DT_INT, offsetof(PasswordReply, tokenID) },
-    { CMT_DT_STRING, offsetof(PasswordReply, passwd) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate KeyPairGenRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(KeyPairGenRequest, keyGenCtxtID) },
-    { CMT_DT_INT, offsetof(KeyPairGenRequest, genMechanism) },
-    { CMT_DT_INT, offsetof(KeyPairGenRequest, keySize) },
-    { CMT_DT_ITEM, offsetof(KeyPairGenRequest, params) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate DecodeAndCreateTempCertRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(DecodeAndCreateTempCertRequest, type) },
-    { CMT_DT_ITEM, offsetof(DecodeAndCreateTempCertRequest, cert) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate GenKeyOldStyleRequestTemplate[] =
-{
-    { CMT_DT_STRING, offsetof(GenKeyOldStyleRequest, choiceString) },
-    { CMT_DT_STRING, offsetof(GenKeyOldStyleRequest, challenge) },
-    { CMT_DT_STRING, offsetof(GenKeyOldStyleRequest, typeString) },
-    { CMT_DT_STRING, offsetof(GenKeyOldStyleRequest, pqgString) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate GenKeyOldStyleTokenRequestTemplate[] = 
-{
-    { CMT_DT_INT,  offsetof(GenKeyOldStyleTokenRequest, rid)       },
-    { CMT_DT_LIST,  offsetof(GenKeyOldStyleTokenRequest, numtokens) },
-    { CMT_DT_STRING,offsetof(GenKeyOldStyleTokenRequest, tokenNames)},
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate GenKeyOldStyleTokenReplyTemplate[] = 
-{
-    { CMT_DT_INT, offsetof(GenKeyOldStyleTokenReply, rid) },
-    { CMT_DT_BOOL, offsetof(GenKeyOldStyleTokenReply, cancel) },
-    { CMT_DT_STRING, offsetof(GenKeyOldStyleTokenReply, tokenName) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate GenKeyOldStylePasswordRequestTemplate[] = 
-{
-    { CMT_DT_INT, offsetof(GenKeyOldStylePasswordRequest, rid) },
-    { CMT_DT_STRING, offsetof(GenKeyOldStylePasswordRequest, tokenName) },
-    { CMT_DT_BOOL, offsetof(GenKeyOldStylePasswordRequest, internal) },
-    { CMT_DT_INT, offsetof(GenKeyOldStylePasswordRequest, minpwdlen) },
-    { CMT_DT_INT, offsetof(GenKeyOldStylePasswordRequest, maxpwdlen) }, 
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate GenKeyOldStylePasswordReplyTemplate[] = 
-{
-    { CMT_DT_INT, offsetof(GenKeyOldStylePasswordReply, rid) },
-    { CMT_DT_BOOL, offsetof(GenKeyOldStylePasswordReply, cancel) },
-    { CMT_DT_STRING, offsetof(GenKeyOldStylePasswordReply, password) },
-    { CMT_DT_END }
-};
-
-
-CMTMessageTemplate GetKeyChoiceListRequestTemplate[] =
-{
-    { CMT_DT_STRING, offsetof(GetKeyChoiceListRequest, type) },
-    { CMT_DT_STRING, offsetof(GetKeyChoiceListRequest, pqgString) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate GetKeyChoiceListReplyTemplate[] =
-{
-    { CMT_DT_LIST, offsetof(GetKeyChoiceListReply, nchoices) },
-    { CMT_DT_STRING, offsetof(GetKeyChoiceListReply, choices) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate AddNewSecurityModuleRequestTemplate[] =
-{
-    { CMT_DT_STRING, offsetof(AddNewSecurityModuleRequest, moduleName) },
-    { CMT_DT_STRING, offsetof(AddNewSecurityModuleRequest, libraryPath) },
-    { CMT_DT_INT, offsetof(AddNewSecurityModuleRequest, pubMechFlags) },
-    { CMT_DT_INT, offsetof(AddNewSecurityModuleRequest, pubCipherFlags) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate FilePathRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(FilePathRequest, resID) },
-    { CMT_DT_STRING, offsetof(FilePathRequest, prompt) },
-    { CMT_DT_BOOL, offsetof(FilePathRequest, getExistingFile) },
-    { CMT_DT_STRING, offsetof(FilePathRequest, fileRegEx) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate FilePathReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(FilePathReply, resID) },
-    { CMT_DT_STRING, offsetof(FilePathReply, filePath) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate PasswordPromptReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(PasswordPromptReply, resID) },
-    { CMT_DT_STRING, offsetof(PasswordPromptReply, promptReply) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate SignTextRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(SignTextRequest, resID) },
-    { CMT_DT_STRING, offsetof(SignTextRequest, stringToSign) },
-    { CMT_DT_STRING, offsetof(SignTextRequest, hostName) },
-    { CMT_DT_STRING, offsetof(SignTextRequest, caOption) },
-    { CMT_DT_LIST, offsetof(SignTextRequest, numCAs) },
-    { CMT_DT_STRING, offsetof(SignTextRequest, caNames) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate GetLocalizedTextReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(GetLocalizedTextReply, whichString) },
-    { CMT_DT_STRING, offsetof(GetLocalizedTextReply, localizedString) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate ImportCertReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(ImportCertReply, result) },
-    { CMT_DT_INT, offsetof(ImportCertReply, resID) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate PromptRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(PromptRequest, resID) },
-    { CMT_DT_STRING, offsetof(PromptRequest, prompt) },
-    { CMT_DT_ITEM, offsetof(PromptRequest, clientContext) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate PromptReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(PromptReply, resID) },
-    { CMT_DT_BOOL, offsetof(PromptReply, cancel) },
-    { CMT_DT_STRING, offsetof(PromptReply, promptReply) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate RedirectCompareRequestTemplate[] =
-{
-    { CMT_DT_ITEM, offsetof(RedirectCompareRequest, socketStatus1Data) },
-    { CMT_DT_ITEM, offsetof(RedirectCompareRequest, socketStatus2Data) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate DecodeAndAddCRLRequestTemplate[] = 
-{
-    { CMT_DT_ITEM,   offsetof(DecodeAndAddCRLRequest, derCrl) },
-    { CMT_DT_INT,    offsetof(DecodeAndAddCRLRequest, type)   },
-    { CMT_DT_STRING, offsetof(DecodeAndAddCRLRequest, url)    },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate SecurityAdvisorRequestTemplate[] =
-{
-    { CMT_DT_INT,   offsetof(SecurityAdvisorRequest, infoContext) },
-    { CMT_DT_INT,   offsetof(SecurityAdvisorRequest, resID) },
-    { CMT_DT_STRING, offsetof(SecurityAdvisorRequest, hostname) },
-    { CMT_DT_STRING, offsetof(SecurityAdvisorRequest, senderAddr) },
-    { CMT_DT_INT,   offsetof(SecurityAdvisorRequest, encryptedP7CInfo) },
-    { CMT_DT_INT,   offsetof(SecurityAdvisorRequest, signedP7CInfo) },
-    { CMT_DT_INT,   offsetof(SecurityAdvisorRequest, decodeError) },
-    { CMT_DT_INT,   offsetof(SecurityAdvisorRequest, verifyError) },
-    { CMT_DT_BOOL,   offsetof(SecurityAdvisorRequest, encryptthis) },
-    { CMT_DT_BOOL,   offsetof(SecurityAdvisorRequest, signthis) },
-    { CMT_DT_LIST,	offsetof(SecurityAdvisorRequest, numRecipients) },
-    { CMT_DT_STRING, offsetof(SecurityAdvisorRequest, recipients) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate SCAddTempCertToPermDBRequestTemplate[] =
-{
-    { CMT_DT_ITEM, offsetof(SCAddTempCertToPermDBRequest, certKey) },
-    { CMT_DT_STRING, offsetof(SCAddTempCertToPermDBRequest, trustStr) },
-    { CMT_DT_STRING, offsetof(SCAddTempCertToPermDBRequest, nickname) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate SCDeletePermCertsRequestTemplate[] =
-{
-    { CMT_DT_ITEM, offsetof(SCDeletePermCertsRequest, certKey) },
-    { CMT_DT_BOOL, offsetof(SCDeletePermCertsRequest, deleteAll) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate TimeMessageTemplate[] =
-{
-    { CMT_DT_INT, offsetof(TimeMessage, year) },
-    { CMT_DT_INT, offsetof(TimeMessage, month) },
-    { CMT_DT_INT, offsetof(TimeMessage, day) },
-    { CMT_DT_INT, offsetof(TimeMessage, hour) },
-    { CMT_DT_INT, offsetof(TimeMessage, minute) },
-    { CMT_DT_INT, offsetof(TimeMessage, second) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate SCCertIndexEnumReplyTemplate[] =
-{
-    { CMT_DT_INT, offsetof(SCCertIndexEnumReply, length) },
-    { CMT_DT_STRUCT_PTR, offsetof(SCCertIndexEnumReply, list) },
-    { CMT_DT_STRING, offsetof(CertEnumElement, name) },
-    { CMT_DT_ITEM, offsetof(CertEnumElement, certKey) },
-    { CMT_DT_END_STRUCT_LIST },
-    { CMT_DT_END }
-};
-
-/* Test template */
-
-CMTMessageTemplate TestListTemplate[] = 
-{
-	{ CMT_DT_STRING, offsetof(TestList, listName) },
-	{ CMT_DT_STRUCT_LIST, offsetof(TestList, numElements) },
-	{ CMT_DT_STRUCT_PTR, offsetof(TestList, elements) },
-	{ CMT_DT_STRING, offsetof(TestListElement, name) },
-	{ CMT_DT_STRING, offsetof(TestListElement, value) },
-	{ CMT_DT_END_STRUCT_LIST},
-	{ CMT_DT_END}
-};
-
-CMTMessageTemplate SetPrefListMessageTemplate[] =
-{
-    { CMT_DT_STRUCT_LIST, offsetof(SetPrefListMessage, length) },
-    { CMT_DT_STRUCT_PTR, offsetof(SetPrefListMessage, list) },
-    { CMT_DT_STRING, offsetof(SetPrefElement, key) },
-    { CMT_DT_STRING, offsetof(SetPrefElement, value) },
-    { CMT_DT_INT, offsetof(SetPrefElement, type) },
-    { CMT_DT_END_STRUCT_LIST },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate GetPrefListRequestTemplate[] =
-{
-    { CMT_DT_STRUCT_LIST, offsetof(GetPrefListRequest, length) },
-    { CMT_DT_STRUCT_PTR, offsetof(GetPrefListRequest, list) },
-    { CMT_DT_STRING, offsetof(GetPrefElement, key) },
-    { CMT_DT_INT, offsetof(GetPrefElement, type) },
-    { CMT_DT_END_STRUCT_LIST },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate GetCertExtensionTemplate[] =
-{
-    { CMT_DT_INT, offsetof(GetCertExtension, resID) },
-    { CMT_DT_INT, offsetof(GetCertExtension, extension) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate HTMLCertInfoRequestTemplate[] =
-{
-    { CMT_DT_INT, offsetof(HTMLCertInfoRequest, certID) },
-    { CMT_DT_INT, offsetof(HTMLCertInfoRequest, showImages) },
-    { CMT_DT_INT, offsetof(HTMLCertInfoRequest, showIssuer) },
-    { CMT_DT_END }
-};
-
-CMTMessageTemplate EncryptRequestTemplate[] =
-{
-  { CMT_DT_ITEM, offsetof(EncryptRequestMessage, keyid) },
-  { CMT_DT_ITEM, offsetof(EncryptRequestMessage, data) },
-  { CMT_DT_ITEM, offsetof(EncryptRequestMessage, ctx) },
-  { CMT_DT_END }
-};
-
-CMTMessageTemplate DecryptRequestTemplate[] =
-{
-  { CMT_DT_ITEM, offsetof(DecryptRequestMessage, data) },
-  { CMT_DT_ITEM, offsetof(DecryptRequestMessage, ctx) },
-  { CMT_DT_END }
-};

mozilla/webtools/tinderbox/Backwards.pm

@@ -0,0 +1,216 @@
+# Backwards.pm
+
+# Copyright (C) 1999 Uri Guttman. All rights reserved.
+# mail bugs, comments and feedback to uri@sysarch.com
+
+
+use strict ;
+
+package Backwards ;
+
+use Symbol ;
+use Fcntl ;
+use Carp ;
+use integer ;
+
+#my $max_read_size = 3 ;
+
+my $max_read_size = 1 << 13 ;
+
+# support tied handles. the tied calls map directly to the object methods
+
+*TIEHANDLE = \&new ;
+*READLINE = \&readline ;
+
+# create a new Backwards object
+
+sub new {
+
+	my( $class, $filename ) = @_ ;
+
+	my( $handle, $seek_pos, $read_size, $self ) ;
+
+# get a new handle symbol and the real file handle
+
+	$handle = gensym() ;
+
+# open the file for reading
+
+	unless( sysopen( $handle, $filename, O_RDONLY ) ) {
+		carp "Can't open $filename $!" ;
+		return ;
+	}
+
+# seek to the end of the file
+
+	seek( $handle, 0, 2 ) ;
+	$seek_pos = tell( $handle ) ;
+
+# get the size of the first block to read,
+# either a trailing partial one (the % size) or full sized one (max read size)
+
+	$read_size = $seek_pos % $max_read_size || $max_read_size ;
+
+# create the hash for the object, bless and return it
+
+	$self = {
+			'file_name'	=> $filename,
+			'handle'	=> $handle,
+			'read_size'	=> $read_size,
+			'seek_pos'	=> $seek_pos,
+			'lines'		=> [],
+	} ;
+
+	return( bless( $self, $class ) ) ;
+}
+
+sub readline {
+
+	my( $self, $line_ref ) = @_ ;
+
+	my( $handle, $lines_ref, $seek_pos, $read_cnt, $read_buf,
+	    $file_size, $read_size, $text ) ;
+
+# get the buffer of lines
+
+	$lines_ref = $self->{'lines'} ;
+
+	while( 1 ) {
+
+# see if there is more than 1 line in the buffer
+
+		if ( @{$lines_ref} > 1 ) {
+
+# we have a complete line so return it
+
+			return( pop @{$lines_ref} ) ;
+		}
+
+# we don't have a complete, so have to read blocks until we do
+
+		$seek_pos = $self->{'seek_pos'} ;
+
+# see if we are at the beginning of the file
+
+		if ( $seek_pos == 0 ) {
+
+# the last read never made more lines, so return the last line in the buffer
+# if no lines left then undef will be returned
+
+			return( pop @{$lines_ref} ) ;
+		}
+
+#print "c size $read_size\n" ;
+
+# we have to read more text so get the handle and the current read size
+
+		$handle = $self->{'handle'} ;
+		$read_size = $self->{'read_size'} ;
+
+# after the first read, always read the maximum size
+
+		$self->{'read_size'} = $max_read_size ;
+
+# seek to the beginning of this block and save the new seek position
+
+		$seek_pos -= $read_size ;
+		$self->{'seek_pos'} = $seek_pos ;
+		seek( $handle, $seek_pos, 0 ) ;
+
+#print "seek $seek_pos\n" ;
+
+# read in the next (previous) block of text
+
+		$read_cnt = sysread( $handle, $read_buf, $read_size ) ;
+
+#print "Read <$read_buf>\n" ;
+
+#   if ( $read_cnt != $read_size ) {
+#   	print "bad read cnt $read_cnt != size $read_size\n" ;
+#	return( undef ) ;
+#   }
+
+# prepend the read buffer to the leftover (possibly partial) line
+
+		$text = $read_buf . ( pop @{$lines_ref} || '' ) ;
+
+# split the buffer into a list of lines
+# this may want to be $/ but reading files backwards assumes plain text and
+# newline separators
+
+		@{$lines_ref} = $text =~ m[(^.*\n|^.+)]mg ;
+
+#print "Lines \n=>", join( "<=\n=>", @{$lines_ref} ), "<=\n" ;
+	}
+}
+
+__END__
+
+
+=head1 NAME
+
+Backwards.pm -- Read a file backwards by lines.
+ 
+
+=head1 SYNOPSIS
+
+	use Backwards ;
+
+	# Object interface
+
+	$bw = Backwards->new( 'log_file' ) ;
+
+	while( $log_line = $bw->readline ) {
+		print $log_line ;
+	}
+
+	# Tied Handle Interface
+
+	tie *BW, 'log_file' ;
+
+	while( <BW> ) {
+		print ;
+	}
+
+=head1 DESCRIPTION
+ 
+
+This module reads a file backwards line by line. It is simple to use,
+memory efficient and fast. It supports both an object and a tied handle
+interface.
+
+It is intended for processing log and other similar text files which
+typically have new entries appended. It uses newline as the separator
+and not $/ since it is only meant to be used for text.
+
+It works by reading large (8kb) blocks of text from the end of the file,
+splits them on newlines and stores the other lines until the buffer runs
+out. Then it seeks to the previous block and splits it. When it reaches
+the beginning of the file, it stops reading more blocks.  All boundary
+conditions are handled correctly. If there is a trailing partial line
+(no newline) it will be the first line returned. Lines larger than the
+read buffer size are ok.
+
+=head2 Object Interface
+ 
+
+There are only 2 methods in Backwards' object interface, new and
+readline.
+
+=head2 new
+
+New takes just a filename for an argument and it either returns the
+object on a successful open on that file or undef.
+
+=head2 readline
+
+Readline takes no arguments and it returns the previous line in the file
+or undef when there are no more lines in the file.
+
+
+=head2 Tied Handle Interface
+
+The only tied handle calls supported are TIEHANDLE and READLINE and they
+are typeglobbed to new and readline respectively. All other tied handle
+operations will generate an unknown method error. Do not seek, write or
+do any other operation other than <> on the handle.

mozilla/webtools/tinderbox/Empty.html

@@ -0,0 +1 @@
+<font size=+2>Click on the <b>filename and line number</b> in the log and the source will appear in this window.</font>

mozilla/webtools/tinderbox/Makefile

@@ -0,0 +1,77 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+
+# This Makefile helps you install Tinderbox.  Define PERL and MYSQLTCL to
+# the full pathnames of where you have these utilities.  Define PREFIX
+# to where you will install the running Tinderbox.  Then "make install" should
+# copy things for you.
+
+#BONSAI = /home/httpd/html/bonsai
+#CVSROOT = /cvsroot
+#GZIP = /usr/bin/gzip
+#PERL = /usr/bin/perl
+#PREFIX = /home/httpd/html/tinderbox
+#UUDECODE = /usr/bin/uudecode
+
+FILES = addimage.cgi	\
+addnote.cgi	\
+admintree.cgi	\
+buildwho.pl	\
+clean.pl	\
+copydata.pl	\
+doadmin.cgi	\
+ep_mac.pl	\
+ep_unix.pl	\
+ep_windows.pl	\
+fixupimages.pl	\
+globals.pl	\
+handlemail.pl	\
+imagelog.pl	\
+processbuild.pl	\
+showbuilds.cgi	\
+showimages.cgi	\
+showlog.cgi	\
+Empty.html	\
+faq.html	\
+index.html	\
+examples/mozilla-unix.pl \
+examples/mozilla-windows.pl
+
+PICS = \
+1afi003r.gif	\
+reledanim.gif	\
+star.gif
+
+install:
+	mkdir -p $(PREFIX) && \
+	for I in $(FILES); do \
+	  echo Installing $$I && \
+          sed -e s#/usr/bonsaitools/bin/perl#$(PERL)#g \
+              -e s#/tools/ns/bin/perl5#$(PERL)#g \
+              -e s#/m/src#$(CVSROOT)#g \
+              -e s#/usr/local/bin/gzip#$(GZIP)#g \
+              -e s#/tools/ns/bin/uudecode#$(UUDECODE)#g \
+              -e s#/d/webdocs/projects/bonsai#$(BONSAI)#g \
+              $$I > $(PREFIX)/$$I && \
+	chmod 755 $(PREFIX)/$$I; done && \
+	for I in $(PICS); do \
+	  echo Installing $$I && \
+	  cp -f $$I $(PREFIX) && \
+	  chmod 755 $(PREFIX)/$$I; done
+

mozilla/webtools/tinderbox/README

@@ -0,0 +1,287 @@
+This is Tinderbox.  See <http://www.mozilla.org/tinderbox.html>.
+
+
+	==========
+	DISCLAIMER
+	==========
+
+This is not very well packaged code.  It's not packaged at all.  Don't
+come here expecting something you plop in a directory, twiddle a few
+things, and you're off and using it.  Much work has to be done to get
+there.  We'd like to get there, but it wasn't clear when that would be,
+and so we decided to let people see it first.
+
+Don't believe for a minute that you can use this stuff without first
+understanding most of the code.
+
+
+	============
+	DEPENDENCIES
+	============
+
+To use tinderbox, you must first have bonsai up and running.
+See <http://www.mozilla.org/bonsai.html>.
+
+Be warned now that bonsai is not easily installed.
+
+
+	====================================
+	What's What in the Tinderbox sources:
+	====================================
+
+This is a rough first pass at cataloging and documenting the Tinderbox
+sources.  Many hands have been in this code over the years, and it has
+accreted wildly.  There is probably quite a lot of dead code in here.
+
+
+PROGRAMS
+========
+
+handlemail.pl   This is the mail deliverty agent (MDA) for tinderbox,
+                the local message transfer agent (MTA) calls this
+                program to deliver the tinderbox mail into the system.
+                It is a wrapper for processbuild.pl.
+
+processbuild.pl Update the "$tbx{tree}/build.dat" database as new
+                mail comes in then run "./buildwho.pl $tree" and
+                "./showbuilds.cgi" (to build static versions of 
+                tinderbox data.
+
+buildwho.pl     Update the who.dat file with the list of authors who
+                checked in in the last two days.  This is run from
+                processbuild.pl, always, and from showbuild.cgi when
+                'rebuildguilty' is clicked
+
+
+Conceptually, the three programs, handlemail.pl, processbuild.pl, and
+buildwho.pl, make up the MDA for tinderbox.
+
+
+showbuilds.cgi  Create the Tinderbox web page.  
+
+showlog.cgi     Show a build log (brief and full) update the brief_log if
+                necessary. Requires the ep_$form{errorparser}.pl error
+                parser.
+
+ep_unix.pl      Knows how to parse Unix build error logs.  Used by
+                processbuild.pl There needs to be one ep_* file for
+                each distinct parsing algorithm used, typically this
+                is per platform.  This file defines the regular
+                expressions which locate error lines: has_error()
+                has_warning() and the function has_errorline() which
+                parses the line into the global variables:
+                $error_file, $error_file_ref, $error_line, $error_guess,
+
+admintree.cgi   Displays the admin cgi which depends on:
+                $message_of_day, $ignore_builds
+
+doadmin.cgi     Actually do the work to admin a tinderbox tree 
+                (change message of the day, turn off displays for a
+                channel)
+
+clean.pl        Run `find . -name \"*.gz\" -mtime +7 -print ` and 
+                unlink those files.  Does not appear to be run from
+                other tools.  It is a good candidate for a cron job.
+
+
+
+OPTIONS to showbuilds.cgi
+=========================
+
+Options to showbuilds are specified in the URL and are undocumented
+elsewhere.
+
+If called with no 'tree' option display the possible build trees to
+pick from.  The 'tree' picks the build to display.  An additional tree
+can be specified with 'tree2'.
+
+Interesting visual params are:
+
+current state monitoring mode:
+          express=1
+        or
+          panel=1
+text mode state monitoring:
+        quickparse=1
+
+These modes do not show on my browser:
+        flash=1
+        rdf=1
+        static=1 
+
+These are self explanatory:
+        nocrap=1;  
+        hours=n; 
+
+
+EMAIL FORMAT
+============
+
+Each tinderbox client mails status updates to the tinderbox server.
+These mails contain special tinderbox data lines describing the
+progress of the build it may also contain the log of the build process
+and could contain a uuencoded binary.
+
+
+The email to the tinderbox server looks like:
+
+tinderbox: tree: Mozilla
+tinderbox: builddate: 900002087
+tinderbox: status: building
+tinderbox: build: IRIX 6.3 Depend
+tinderbox: errorparser: unix
+
+If binaryname is set then the mail message is run through uudecode to
+create a file called "$binaryname" on the tinderbox server.
+
+# NOT USED tinderbox: buildfamily: unix
+
+
+DATA STRUCTURES IN showbuilds.cgi 
+=================================
+
+load_buildlog() creates build_list a list of hash refernces of this
+type
+      $buildrec = {    
+         mailtime => $mailtime,
+         buildtime => $buildtime,
+         buildname => ($tree2 ne '' ? $t->{name} . ' ' : '' ) . $buildname,
+         errorparser => $errorparser,
+         buildstatus => $buildstatus,
+         logfile => $logfile,
+         binaryname => $binaryname,
+         td => $t
+      };
+
+the $buildrec->{rowspan} variable holds the number of rows that the build
+should occupy on the table and is not stored in the build.dat file.
+
+These are other add ons to the data structure
+$buildrec->{hasnote}=1;
+$buildrec->{noteid} = (0+@note_array);
+
+commonly  buildrec's are accessed through:
+$build_table->[$build_time][$build_name] = $buildrec;
+
+The list of users who updated this build is stored as:
+$who_list->[$checkin_time]->{$author} = 1;
+
+There are numerous duplicate data structures which hold partial
+information:
+
+        hashes which hold all indices:
+            $build_name_index->{$br->{buildname}} = 1;
+            $build_time_index->{$br->{buildtime}} = 1;
+        other access into $build_table:
+            $build_name_names->[$i] = $n;
+            $build_time_times->[$i] = $n;
+
+
+loadquickparseinfo creates these references
+      $build->{$buildname} = $buildstatus;
+      $times->{$buildname} = $buildtime;
+
+    
+
+DATA FILES
+==========
+
+These files are used to store data structures.  They are a persistent
+store of data between executions of the same program and they pass the
+data between cooperating program.  This data is often databases with
+rows separated by "\n" and columns by '|'.
+
+
+$tree/${logfile}
+$tree/${logfile}.brief.html
+$tree/ignorebuilds.pl
+$tree/mod.pl
+$tree/notes.txt
+$tree/treedata.pl
+$tree/who.dat
+$treename/build.dat
+
+The logfile that the tinderbox client sent stored in gziped format.
+The filename is ${tree}/$builddate.$$.gz so its quite random and does
+not depend on the clients$build string and multiple logs are kept for
+each build, one for each mail message sent.
+
+The brief.html file is a cache of the error log summary for this log
+file and is recreated when the logfile gets updated.
+
+ignorebuilds.pl is a file which specifies builds that should not be
+performed.  It is valid perl code which sets the hash reference
+$ignore_builds, each key is a tree name.
+
+mod.pl stores the tree specific message of the day.  This is not to be
+       confused with mod perl the CGI library. Its contents looks like:
+        $message_of_day = 'message';
+
+notes.txt store the database of notes:
+$buildtime|$buildname||$author|$time_now|$note 
+
+
+treedata.pl stores the cvs information pertaining to this tree and
+                looks like this:
+        $cvs_module='$modulename';
+        $cvs_branch='$branchname';
+        $cvs_root='$repository';
+
+who.dat file has lines like:
+            $checkin_time|$author
+        This gets stored in the data structure, where checkin_time
+        gets fudged up so that is is a time already in the
+        build_table:
+                      $who_list->[$checkin_time]->{$author} = 1;
+ 
+build.dat stores the build results table.  It is a flat file
+                representation of $build_table
+
+build.dat is a database file each row is a build and has pipe
+separated columns: 
+
+1) the time stamp of the tinderbox server 
+2) time stamp of the build machine 
+3) the official build name (should include build machine name)
+   ( note: that 2 & 3 together uniquely identify the build 
+        and all relevant build data)
+4) the architecture dependent error parser to use on the log files
+5) status of the build (success|busted|building|testfailed)
+6) The log file for this build (if completed)
+7) the name of the binary (if any) that came from the build
+
+
+Other Files
+====================
+1afi003r.gif	The "flames" animation used by showbuilds.cgi
+
+Empty.html	Document used for an empty frame by ???
+
+addimage.cgi	The form that lets you add a new image to the list of
+		images that Tinderbox picks from randomly.
+
+addnote.cgi	Add a note to a build log.
+
+admintree.cgi	Lets you perform various admin tasks on a Tinderbox tree.
+		This just prompts for a password and posts to doadmin.cgi.
+
+clean.pl	???
+copydata.pl	???
+
+doadmin.cgi	Actually do the work to admin a tinderbox tree 
+
+ep_mac.pl	Knows how to parse Mac build error logs.  Used by ???
+ep_unix.pl	Knows how to parse Unix build error logs.  Used by ???
+ep_windows.pl	Knows how to parse Windows build error logs.  Used by ???
+
+faq.html	Wildly out of date.
+
+fixupimages.pl	???
+globals.pl	???
+imagelog.pl	???
+index.html	???
+reledanim.gif	???
+
+showimages.cgi	Show all the images in the Tinderbox list.  Password-protected.
+
+star.gif	The "star" image used to annotate builds by ???

mozilla/webtools/tinderbox/addimage.cgi

@@ -0,0 +1,404 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use Socket;
+
+use lib "../bonsai";
+require 'header.pl';
+
+print "Content-type: text/html\n\n";
+
+EmitHtmlTitleAndHeader("tinderbox: add images", "add images");
+
+$| = 1;
+
+require "globals.pl";
+require "imagelog.pl";
+
+&split_cgi_args;
+
+
+sub Error {
+    my ($msg) = @_;
+    print "<BR><BR><BR>";
+    print "<UL><FONT SIZE='+1'><B>Something went wrong:</B><P>";
+    print "<UL>";
+    print $msg;
+    print "</UL>";
+    print "<P>";
+    print "Hit <B>\`Back'</B> and try again.";
+    print "</UL>";
+    exit 1;
+}
+
+
+if( $url = $form{"url"} ){
+    $quote = $form{"quote"};
+
+    $quote =~ s/[\r\n]/ /g;
+    $url =~ s/[\r\n]/ /g;
+
+    $width = "";
+    $height = "";
+# I think we don't want to allow this --jwz
+#    $width = $form{"width"};
+#    $height = $form{"height"};
+
+    if ($width eq "" || $height eq "") {
+        $size = &URLsize($url);
+        if ($size =~ /WIDTH=([0-9]*)/) {
+            $width = $1;
+        }
+        if ($size =~ /HEIGHT=([0-9]*)/) {
+            $height = $1;
+        }
+        if ($width eq "" || $height eq "") {
+            Error "Couldn't get image size for \"$url\".\n";
+        }
+    }
+
+    print " 
+    
+<P><center><img border=2 src='$url' width=$width height=$height><br>
+<i>$quote</i><br><br>
+";
+
+    if( $form{"submit"} ne "Yes" ){
+        my $u2 = $url;
+        my $q2 = $quote;
+        $u2 =~ s@&@&amp;@g; $u2 =~ s@<@&lt;@g; $u2 =~ s@\"@&quot;@g;
+        $q2 =~ s@&@&amp;@g; $q2 =~ s@<@&lt;@g; $q2 =~ s@\"@&quot;@g;
+
+        print "
+<form action='addimage.cgi' METHOD='get'>
+<input type=hidden name=url value=\"$u2\">
+<input type=hidden name=quote value=\"$q2\">
+<HR>
+<TABLE>
+ <TR>
+  <TH ALIGN=RIGHT NOWRAP>Image URL:</TH>
+  <TD><TT><B>$u2</B></TT></TD>
+ </TR><TR>
+  <TH ALIGN=RIGHT>Caption:</TH>
+  <TD><TT><B>$q2</B></TT></TD>
+ </TR>
+ <TR>
+  <TD></TD>
+  <TD>
+   <FONT SIZE=+2><B>
+   Does that look right?
+   <SPACER SIZE=10>
+   <INPUT Type='submit' name='submit' value='Yes'>
+   </B><BR>(If not, hit \`Back' and fix it.)
+   </FONT>
+ </TD>
+</TABLE>
+</form>
+";
+    }
+    else {
+        &add_imagelog( $url, $quote, $width, $height );
+        print "<br><br>
+        <font size=+2>Has been added</font><br><br>
+        <a href=showbuilds.cgi>Return to Log</a>";
+    }
+
+}
+else {
+    print "
+<h2>Add an image and a funny caption.</h2>
+
+<ul>
+<p>This is about fun, and making your daily excursion to 
+<A HREF=http://www.mozilla.org/tinderbox.html>Tinderbox</A> a
+novel experience.  Engineers spend a lot of time here; it might as well
+have some entertainment value.
+
+<p>Please play nice. We don't have the time or inclination to look at
+everything you people submit, but if we get nastygrams or legalgrams
+and have to take something down, we will curse your IP address, and you
+might even make it so the whole thing goes away forever. Please don't
+make us go there. You might also avoid links to big images or slow
+servers.  
+
+<p><ul><B>Thank you for playing nice.</B></UL>
+
+<p>If you really find an image offensive, please
+<A HREF=mailto:terry\@netscape.com?Subject=offensive%20tinderbox%20image>tell us</A>
+nicely before someone causes a stink.  Be sure to include the URL of
+the image.  Remember, we don't screen these submissions and may not
+have even seen it.
+
+<p><ul><B>P.S. Please, no more pictures of Bill Gates.</B></UL>
+</ul>
+
+<p><form action='addimage.cgi' METHOD='get'>
+<TABLE>
+ <TR>
+  <TH ALIGN=RIGHT NOWRAP>Image URL:</TH>
+  <TD><INPUT NAME='url' SIZE=60></TD>
+ </TR><TR>
+  <TH ALIGN=RIGHT>Caption:</TH>
+  <TD><INPUT NAME='quote' SIZE=60></TD>
+ </TR><TR>
+  <TD></TD>
+  <TD><B>
+   <INPUT Type='submit' name='submit' value='Test'>
+   <SPACER SIZE=25>
+   <INPUT Type='reset' name='reset' value='Reset'>
+  </B></TD>
+ </TR>
+</TABLE>
+
+</form>
+<br><br>
+";
+}
+
+sub split_cgi_args {
+    local($i,$var,$value, $s);
+
+    $s = $ENV{"QUERY_STRING"};
+
+    @args= split(/\&/, $s );
+
+    for $i (@args) {
+        ($var, $value) = split(/=/, $i);
+        $value =~ tr/+/ /;
+        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+        $form{$var} = $value;
+    }
+}
+
+
+#sub imgsize {
+#    local($file)= @_;
+#
+#    #first try to open the file
+#    if( !open(STREAM, "<$file") ){
+#        Error "Can't open IMG $file"; 
+##        $size="";
+#    } else {
+#        if ($file =~ /.jpg/i || $file =~ /.jpeg/i) {
+#            $size = &jpegsize(STREAM);
+#        } elsif($file =~ /.gif/i) {
+#            $size = &gifsize(STREAM);
+#        } elsif($file =~ /.xbm/i) {
+#            $size = &xbmsize(STREAM);
+#        } else {
+#           return "";
+#        }
+#        $_ = $size;
+#        if(  /\s*width\s*=\s*([0-9]*)\s*/i ){
+#            ($newwidth)= /\s*width\s*=\s*(\d*)\s*/i;
+#        }
+#        if(  /\s*height\s*=\s*([0-9]*)\s*/i ){
+#            ($newheight)=/\s*height\s*=\s*(\d*)\s*/i;
+#        }
+#        close(STREAM);
+#    }
+#    return $size;
+#}
+
+###########################################################################
+# Subroutine gets the size of the specified GIF
+###########################################################################
+
+# bug: it thinks that 
+# http://cvs1.mozilla.org/webtools/tinderbox/data/knotts.gif
+# is 640x400, but it's really 200x245.
+# giftrans says of that image:
+#
+#   Header: "GIF87a"
+#   Logical Screen Descriptor:
+#       Logical Screen Width: 640 pixels
+#       Logical Screen Height: 480 pixels
+#   Image Descriptor:
+#       Image Width: 200 pixels
+#       Image Height: 245 pixels
+
+
+sub gifsize {
+    local($GIF) = @_;
+    read($GIF, $type, 6); 
+    if(!($type =~ /GIF8[7,9]a/) || 
+       !(read($GIF, $s, 4) == 4) ){
+        Error "Invalid or Corrupted GIF"; 
+        $size="";
+    } else {
+        ($a,$b,$c,$d)=unpack("C"x4,$s);
+        $size=join ("", 'WIDTH=', $b<<8|$a, ' HEIGHT=', $d<<8|$c);
+    }
+    return $size;
+}
+
+sub xbmsize {
+    local($XBM) = @_;
+    local($input)="";
+
+    $input .= <$XBM>;
+    $input .= <$XBM>;
+    $_ = $input;
+    if( /#define\s*\S*\s*\d*\s*\n#define\s*\S*\s*\d*\s*\n/i ){
+       ($a,$b)=/#define\s*\S*\s*(\d*)\s*\n#define\s*\S*\s*(\d*)\s*\n/i;
+       $size=join ("", 'WIDTH=', $a, ' HEIGHT=', $b );
+   } else {
+       Error "Doesn't look like an XBM file";
+   }
+    return $size;
+}
+
+# jpegsize : gets the width and height (in pixels) of a jpeg file
+# Andrew Tong, werdna@ugcs.caltech.edu           February 14, 1995
+# modified slightly by alex@ed.ac.uk
+sub jpegsize {
+    local($JPEG) = @_;
+    local($done)=0;
+    $size="";
+
+    read($JPEG, $c1, 1); read($JPEG, $c2, 1);
+    if( !((ord($c1) == 0xFF) && (ord($c2) == 0xD8))){
+        my $s = sprintf "This is not a JPEG! (Codes %02X %02X)\n", ord($c1), ord($c2);
+        Error $s;
+        $done=1;
+    }
+    while (ord($ch) != 0xDA && !$done) {
+        # Find next marker (JPEG markers begin with 0xFF)
+        # This can hang the program!!
+        while (ord($ch) != 0xFF) {  read($JPEG, $ch, 1); }
+        # JPEG markers can be padded with unlimited 0xFF's
+        while (ord($ch) == 0xFF) { read($JPEG, $ch, 1); }
+        # Now, $ch contains the value of the marker.
+            $marker=ord($ch);
+
+            if (($marker >= 0xC0) && ($marker <= 0xCF) &&
+            ($marker != 0xC4) && ($marker != 0xCC)) {  # it's a SOFn marker
+            read ($JPEG, $junk, 3); read($JPEG, $s, 4);
+            ($a,$b,$c,$d)=unpack("C"x4,$s);
+            $size=join("", 'HEIGHT=',$a<<8|$b,' WIDTH=',$c<<8|$d );
+            $done=1;
+        } else {
+            # We **MUST** skip variables, since FF's within variable 
+            # names are NOT valid JPEG markers
+            read ($JPEG, $s, 2); 
+            ($c1, $c2) = unpack("C"x2,$s); 
+            $length = $c1<<8|$c2;
+            if( ($length < 2) ){
+                Error "Bad JPEG file: erroneous marker length";
+                $done=1;
+            } else {
+                read($JPEG, $junk, $length-2);
+            }
+        }
+    }
+    return $size;
+}
+
+###########################################################################
+# Subroutine grabs a gif from another server and gets its size
+###########################################################################
+
+
+sub URLsize {
+    my ($fullurl) = @_;
+
+    $_ = $fullurl;
+    if ( ! m@^http://@ ) {
+        Error "HTTP URLs only, please: \"$_\" is no good.";
+    }
+
+    my($dummy, $dummy, $serverstring, $url) = split(/\//, $fullurl, 4);
+    my($them,$port) = split(/:/, $serverstring);
+    my $port = 80 unless $port;
+    my $size="";
+
+    $_ = $them;
+    if ( m@^[^.]*$@ ) {
+        Error "Fully-qualified host names only, please: \"$_\" is no good.";
+    }
+
+    $_=$url;
+    my ($remote, $iaddr, $paddr, $proto, $line);
+    $remote = $them;
+    if ($port =~ /\D/) { $port = getservbyname($port, 'tcp') }
+    die "No port" unless $port;
+    $iaddr   = inet_aton($remote)               || die "no host: $remote";
+    $paddr   = sockaddr_in($port, $iaddr);
+
+    $proto   = getprotobyname('tcp');
+    socket(S, PF_INET, SOCK_STREAM, $proto)  || die "socket: $!";
+    connect(S, $paddr)    || die "connect: $!";
+    select(S); $| = 1; select(STDOUT);
+
+    print S "GET /$url HTTP/1.0\r\n";
+    print S "Host: $them\r\n";
+    print S "User-Agent: Tinderbox/0.0\r\n";
+    print S "\r\n";
+
+    $_ = <S>;
+    if (! m@^HTTP/[0-9.]+ 200@ ) {
+        Error "$them responded:<BR> $_";
+    }
+
+    my $ctype = "";
+    while (<S>) {
+        # print "read: $_<br>\n";
+        if ( m@^Content-Type:[ \t]*([^ \t\r\n]+)@io ) {
+            $ctype = $1;
+        }
+        last if (/^[\r\n]/);
+    }
+
+    $_ = $ctype;
+    if ( $_ eq "" ) {
+        Error "Server returned no content-type for \"$fullurl\"?";
+    } elsif ( m@image/jpeg@i || m@image/pjpeg@i ) {
+        $size = &jpegsize(S);
+    } elsif ( m@image/gif@i ) {
+        $size = &gifsize(S);
+    } elsif ( m@image/xbm@i || m@image/x-xbm@i || m@image/x-xbitmap@i ) {
+        $size = &xbmsize(S);
+    } else {
+        Error "Not a GIF, JPEG, or XBM: that was of type \"$ctype\".";
+    }               
+
+    $_ = $size;
+    if(  /\s*width\s*=\s*([0-9]*)\s*/i ){
+        ($newwidth)= /\s*width\s*=\s*(\d*)\s*/i;
+    }
+    if(  /\s*height\s*=\s*([0-9]*)\s*/i ){
+        ($newheight)=/\s*height\s*=\s*(\d*)\s*/i;
+    }
+
+    if ( $newwidth eq "" || $newheight eq "" ) {
+        return "";
+    } else {
+        if ( $newwidth <= 5 || $newheight <= 5 ) {
+            Error "${newwidth}x${newheight} seems small, don't you think?";
+        } elsif ( $newwidth >= 400 || $newheight >= 400 ) {
+            Error "${newwidth}x${newheight} is too big; please" .
+                " keep it under 400x400."
+        }
+        return $size;
+    }
+}
+
+sub dokill {
+    kill 9,$child if $child;
+}

mozilla/webtools/tinderbox/addnote.cgi

@@ -0,0 +1,206 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use lib "../bonsai";
+use Fcntl;
+
+require "globals.pl";
+require 'lloydcgi.pl';
+
+if (defined($args = $form{log})) {
+
+  ($tree, $logfile) = split /\//, $args;
+
+  my $br = find_build_record($tree, $logfile);
+  $errorparser = $br->{errorparser};
+  $buildname   = $br->{buildname};
+  $buildtime   = $br->{buildtime};
+} else {
+  $tree        = $form{'tree'};
+  $logfile     = $form{'logfile'};
+  $errorparser = $form{'errorparser'};
+  $buildname   = $form{'buildname'};
+  $buildtime   = $form{'buildtime'};
+}
+
+$enc_buildname = &url_encode($buildname);
+
+$note = $form{'note'};
+$who  = $form{'who'};
+
+$now = time;
+$now_str = &print_time($now);
+
+$|=1;
+
+if( -r "$tree/ignorebuilds.pl" ){
+     require "$tree/ignorebuilds.pl";
+ }
+
+print "Content-Type:text/html\n";
+if ($ENV{"REQUEST_METHOD"} eq 'POST' && defined($form{'note'})) {
+    # Expire the cookie 5 months from now
+    print "Set-Cookie: email=$form{who}; expires="
+        . toGMTString(time + 86400 * 152) . "; path=/\n";
+}     
+print "\n<HTML>\n";
+
+if( $url = $form{"note"} ){
+
+    $note =~ s/\&/&amp;/gi;
+    $note =~ s/\</&lt;/gi;
+    $note =~ s/\>/&gt;/gi;
+    $enc_note = url_encode( $note );
+
+    open( NOTES,">>$tree/notes.txt");
+    flock(NOTES, LOCK_EX);
+    print NOTES "$buildtime|$buildname|$who|$now|$enc_note\n"; 
+
+       &LoadBuildTable;
+
+    foreach $element (keys %form) {
+
+          if(exists ${$build_name_index}{$element}) {
+             print NOTES "${$build_name_index}{$element}|$element|$who|$now|$enc_note\n"; 
+          } #EndIf
+    } #Endforeach
+    close(NOTES);
+
+    print "<H1>The following comment has been added to the log</h1>\n";
+
+    #print "$buildname \n $buildtime \n $errorparser \n $logfile \n  $tree \n $enc_buildname \n";
+    print "<pre>\n[<b>$who - $now_str</b>]\n$note\n</pre>";
+
+    print"
+<p><a href=\"showlog.cgi?tree=$tree\&buildname=$enc_buildname\&buildtime=$buildtime\&logfile=$logfile\&errorparser=$errorparser\">
+Go back to the Error Log</a>
+<a href=\"showbuilds.cgi?tree=$tree\">
+<br>Go back to the build Page</a>";
+
+  # Build tinderbox static pages
+  $ENV{QUERY_STRING}="tree=$tree&static=1";
+  $ENV{REQUEST_METHOD}="GET";
+  system './showbuilds.cgi >/dev/null';
+
+} else {
+
+  &GetBuildNameIndex;
+
+  @names = sort (keys %$build_name_index);
+
+  if ($buildname eq '' || $buildtime == 0) {
+    print "<h1>Invalid parameters</h1>\n";
+    die "\n";
+  }
+
+#print "$buildname \n $buildtime \n $errorparser \n $logfile \n  $tree \n $enc_buildname \n";
+
+$emailvalue = '';
+$emailvalue = " value='$cookie_jar{email}'" if defined($cookie_jar{email});
+
+print qq(
+<head><title>Add a Comment to $buildname log</title></head>
+<body BGCOLOR="#FFFFFF" TEXT="#000000"LINK="#0000EE" VLINK="#551A8B" ALINK="#FF0000">
+
+<table><tr><td>
+<b><font size="+2">Add a Log Comment</font></b>
+</td></tr><tr><td>
+<b><code>$buildname</code></b>
+</td></tr></table>
+
+<form action='addnote.cgi' METHOD='post'>
+
+<INPUT Type='hidden' name='buildname' value='${buildname}'>
+<INPUT Type='hidden' name='buildtime' value='${buildtime}'>
+<INPUT Type='hidden' name='errorparser' value='$errorparser'>
+<INPUT Type='hidden' name='logfile' value='$logfile'>
+<INPUT Type='hidden' name='tree' value='$tree'>
+
+<table border=0 cellpadding=4 cellspacing=1>
+<tr valign=top>
+  <td align=right>
+     <NOWRAP>Email address:</NOWRAP>
+  </td><td>
+     <INPUT Type='input' name='who' size=32$emailvalue><BR>
+  </td>
+</tr><tr valign=top>
+  <td align=right>
+     Comment:
+  </td><td>
+     <TEXTAREA NAME=note ROWS=10 COLS=30 WRAP=HARD></textarea>
+  </td>
+</tr>
+</table>
+<br><b><font size="+2">Addition Builds</font></b><br>
+(Comment will be added to the most recent cycle.)<br>
+);
+
+for $other_build (@names){
+    if( $other_build ne "" ){
+      
+      if (not exists ${$ignore_builds}{$other_build}) {
+        if( $other_build ne $buildname ){
+          print "<INPUT TYPE=checkbox NAME=\"$other_build\">";
+          print "$other_build<BR>\n";
+        }
+      } #EndIf
+    }
+} #Endfor
+
+print "<INPUT Type='submit' name='submit' value='Add Comment'><BR>
+</form>\n</body>\n</html>";
+}
+
+sub GetBuildNameIndex {
+local($mailtime, $buildtime, $buildname, $errorparser, $buildstatus, $logfile, $binaryname);
+
+open(BUILDLOG, "$tree/build.dat") or die "Couldn't open build.dat: $!\n";
+
+while(<BUILDLOG>) {
+    chomp;
+    ($mailtime, $buildtime, $buildname, $errorparser, $buildstatus, $logfile, $binaryname) = 
+         split( /\|/ );
+
+    $build_name_index->{$buildname} = 0;
+
+} #EndWhile
+close(BUILDLOG);
+
+}
+
+
+sub LoadBuildTable {
+local($mailtime, $buildtime, $buildname, $errorparser, $buildstatus, $logfile, $binaryname);
+
+open(BUILDLOG, "$tree/build.dat") or die "Couldn't open build.dat: $!\n";
+
+while(<BUILDLOG>) {
+    chomp;
+    ($mailtime, $buildtime, $buildname, $errorparser, $buildstatus, $logfile, $binaryname) = 
+         split( /\|/ );
+
+    if ($buildtime > $build_name_index->{$buildname} ) {
+    $build_name_index->{$buildname} = $buildtime;
+    }
+
+} #EndWhile
+close(BUILDLOG);
+
+}
+

mozilla/webtools/tinderbox/admintree.cgi

@@ -0,0 +1,131 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use lib "../bonsai";
+
+require 'lloydcgi.pl';
+require 'globals.pl';
+require 'header.pl';
+
+$|=1;
+
+print "Content-type: text/html\n\n<HTML>\n";
+
+EmitHtmlHeader("administer tinderbox", "tree: $tree");
+
+$form{noignore} = 1;            # Force us to load all build info, not
+                                # paying any attention to ignore_builds stuff.
+$maxdate = time();
+$mindate = $maxdate - 24*60*60;
+&load_data;
+
+if (defined($tree)) {
+    if( -r "$tree/mod.pl" ){
+        require "$tree/mod.pl";
+    }
+    else {
+        $message_of_day = "";
+    }
+
+    print "
+<FORM method=post action=doadmin.cgi>
+<B>Password:</B> <INPUT NAME=password TYPE=password>
+<INPUT TYPE=HIDDEN NAME=tree VALUE=$tree>
+<INPUT TYPE=HIDDEN NAME=command VALUE=set_message>
+<br><b>Message of the Day
+<br><TEXTAREA NAME=message ROWS=10 COLS=70 WRAP=SOFT>$message_of_day
+</TEXTAREA>
+<br><INPUT TYPE=SUBMIT VALUE='Set Message of the Day'>
+</FORM>
+<hr>
+";
+
+
+    print "
+<FORM method=post action=doadmin.cgi>
+<B>Password:</B> <INPUT NAME=password TYPE=password>
+<INPUT TYPE=HIDDEN NAME=tree VALUE=$tree>
+<INPUT TYPE=HIDDEN NAME=command VALUE=trim_logs>
+<br><b>Trim Logs to <INPUT NAME=days size=5 VALUE='7'> days.</b> (Tinderbox 
+shows 2 days history by default.  You can see more by clicking show all).
+<br><INPUT TYPE=SUBMIT VALUE='Trim Logs'>
+</FORM>
+<FORM method=post action=doadmin.cgi>
+<hr>
+"   ;
+}
+
+print "
+<FORM method=post action=doadmin.cgi>
+<B>Password:</B> <INPUT NAME=password TYPE=password> <BR>
+<INPUT TYPE=HIDDEN NAME=tree VALUE=$tree>
+<INPUT TYPE=HIDDEN NAME=command VALUE=create_tree>
+<TABLE>
+<TR>
+<TD><B>tinderbox tree name:</B></TD>
+<TD><INPUT NAME=treename VALUE=''></TD>
+</TR><TR>
+<TD><B>cvs repository:</B></TD>
+<TD><INPUT NAME=repository VALUE=''></TD>
+</TR><TR>
+<TD><B>cvs module name:</B></TD>
+<TD><INPUT NAME=modulename VALUE=''></TD>
+</TR><TR>
+<TD><B>cvs branch:</B></TD>
+<TD><INPUT NAME=branchname VALUE='HEAD'></TD>
+</TR>
+</TABLE>
+<INPUT TYPE=SUBMIT VALUE='Create a new Tinderbox page'>
+</FORM>
+<FORM method=post action=doadmin.cgi>
+<hr>
+";
+
+if (defined($tree)) {
+    print "
+<B><font size=+1>If builds are behaving badly you can turn them off.</font></b><br>  Uncheck
+the build that is misbehaving and click the button.  You can still see all the
+builds even if some are disabled by adding the parameter <b><tt>&noignore=1</tt></b> to
+the tinderbox URL.<br>
+<B>Password:</B> <INPUT NAME=password TYPE=password> <BR>
+<INPUT TYPE=HIDDEN NAME=tree VALUE=$tree>
+<INPUT TYPE=HIDDEN NAME=command VALUE=disable_builds>
+";
+
+    @names = sort (@$build_name_names) ;
+
+    for $i (@names){
+        if( $i ne "" ){
+            $checked = ($ignore_builds->{$i} != 0 ? "": "CHECKED" );
+            print "<INPUT TYPE=checkbox NAME='build_$i' $checked >";
+            print "$i<br>\n";
+        }
+    }
+
+    print "
+<INPUT TYPE=SUBMIT VALUE='Show only checked builds'>
+</FORM>
+<hr>
+";
+}
+
+
+
+
+

mozilla/webtools/tinderbox/buildwho.pl

@@ -0,0 +1,97 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use lib "../bonsai";
+
+require 'globals.pl';
+
+$F_DEBUG=1;
+
+
+$days = 2;
+
+if ($ARGV[0] eq "-days") {
+    shift @ARGV;
+    $days = shift @ARGV;
+}
+
+$tree = $ARGV[0];
+
+open(SEMFILE, ">>$tree/buildwho.sem") || die "Couldn't open semaphore file!";
+if (!flock(SEMFILE, 2 + 4)) {   # 2 means "lock"; 4 means "fail immediately if
+                                # lock already taken".
+    print "buildwho.pl: Another process is currently building the database.\n";
+    exit(0);
+}
+
+require "$tree/treedata.pl";
+
+if( $cvs_root eq '' ){
+    $CVS_ROOT = '/m/src';
+}
+else {
+    $CVS_ROOT = $cvs_root;
+}
+
+$CVS_REPOS_SUFIX = $CVS_ROOT;
+$CVS_REPOS_SUFIX =~ s/\//_/g;
+    
+$CHECKIN_DATA_FILE = "/d/webdocs/projects/bonsai/data/checkinlog${CVS_REPOS_SUFIX}";
+$CHECKIN_INDEX_FILE = "/d/webdocs/projects/bonsai/data/index${CVS_REPOS_SUFIX}";
+
+require 'cvsquery.pl';
+
+print "cvsroot='$CVS_ROOT'\n";
+
+&build_who;
+
+flock(SEMFILE, 8);              # '8' is magic 'unlock' const.
+close SEMFILE;
+
+
+sub build_who {
+    open(BUILDLOG, "<$tree/build.dat" );
+    $line = <BUILDLOG>;
+    close(BUILDLOG);
+
+    #($j,$query_date_min) = split(/\|/, $line);
+    $query_date_min = time - (60 * 60 * 24 * $days);
+
+    if( $F_DEBUG ){
+        print "Minimum date: $query_date_min\n";
+    }
+
+    $query_module=$cvs_module;
+    $query_branch=$cvs_branch;
+
+    $result = &query_checkins;
+
+    
+    $last_who='';
+    $last_date=0;
+    open(WHOLOG, ">$tree/who.dat" );
+    for $ci (@$result) {
+        if( $ci->[$CI_DATE] != $last_date || $ci->[$CI_WHO] != $last_who ){
+            print WHOLOG "$ci->[$CI_DATE]|$ci->[$CI_WHO]\n";
+        }
+        $last_who=$ci->[$CI_WHO];
+        $last_date=$ci->[$CI_DATE];
+    }
+    close( WHOLOG );
+}

mozilla/webtools/tinderbox/bustagestats.cgi

@@ -0,0 +1,124 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use lib "../bonsai";
+
+require 'lloydcgi.pl';
+require 'globals.pl';
+require 'header.pl';
+
+use Date::Parse;
+use Date::Format;
+
+my $TIMEFORMAT = "%D %T";
+
+$|=1;
+
+print "Content-type: text/html\n\n<HTML>\n";
+
+# &load_data;
+
+EmitHtmlHeader("Statistics");
+
+my $tree = $form{'tree'};
+my $start = $form{'start'};
+my $end = $form{'end'};
+
+sub str2timeAndCheck {
+    my ($str) = (@_);
+    my $result = str2time($str);
+    if (defined $result && $result > 7000000) {
+        return $result;
+    }
+    print "<p><font color=red>Can't parse as a date: $str</font><p>\n";
+    return 0;
+}
+
+if (defined $tree && defined $start && defined $end) {
+    my $first = str2timeAndCheck($start);
+    my $last = str2timeAndCheck($end);
+    if ($first > 0 && $last > 0) {
+        if (open(IN, "<$tree/build.dat")) {
+            print "<hr><center><h1>Bustage stats for $tree</H1><H3>from " .
+                time2str($TIMEFORMAT, $first) . " to " .
+                    time2str($TIMEFORMAT, $last) . "</H3></center>\n";
+            my %stats;
+            while (<IN>) {
+                chomp;
+                my ($mailtime, $buildtime, $buildname, $errorparser,
+                    $buildstatus, $logfile, $binaryname) = 
+                        split( /\|/ );
+                if ($buildtime >= $first && $buildtime <= $last) {
+                    if (!defined $stats{$buildname}) {
+                        $stats{$buildname} = 0;
+                    }
+                    if ($buildstatus eq "busted") {
+                        $stats{$buildname}++;
+                    }
+                }
+            }
+            print "<table>\n";
+            print "<tr><th>Build name</th><th>Number of bustages</th></tr>\n";
+            foreach my $key (sort (keys %stats)) {
+                print "<tr><td>$key</td><td>$stats{$key}</td></tr>\n";
+            }
+            print "</table>\n";
+        } else {
+            print "<p><font color=red>There does not appear to be a tree " .
+                "named '$tree'.</font><p>";
+        }
+        
+    }
+    print "<hr>\n";
+}
+
+if (!defined $tree) {
+    $tree = "";
+}
+
+if (!defined $start) {
+    $start = time2str($TIMEFORMAT, time() - 7*24*60*60); # One week ago.
+}
+
+if (!defined $end) {
+    $end = time2str($TIMEFORMAT, time()); # #now
+}
+
+
+print qq|
+<form>
+<table>
+<tr>
+<th align=right>Tree:</th>
+<td><input name=tree size=30 value="$tree"></td>
+</tr>
+<tr>
+<th align=right>Start time:</th>
+<td><input name=start size=30 value="$start"></td>
+</tr>
+<tr>
+<th align=right>End time:</th>
+<td><input name=end size=30 value="$end"></td>
+</tr>
+</table>
+
+<INPUT TYPE=\"submit\" VALUE=\"Generate stats \">
+
+</form>
+|;

mozilla/webtools/tinderbox/clean.pl

@@ -0,0 +1,42 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+# Figure out which directory tinderbox is in by looking at argv[0]
+
+$tinderboxdir = $0;
+$tinderboxdir =~ s:/[^/]*$::;      # Remove last word, and slash before it.
+if ($tinderboxdir eq "") {
+    $tinderboxdir = ".";
+}
+
+#print "tinderbox = $tinderboxdir\n"; 
+
+chdir $tinderboxdir || die "Couldn't chdir to $tinderboxdir"; 
+
+#print "cd ok\n";
+
+open FL, "find . -name \"*.gz\" -mtime +7 -print |";
+
+#print "find ok\n";
+
+while( <FL> ){
+    chop();
+    #print "unlink $_\n";
+    unlink $_;
+}

mozilla/webtools/tinderbox/copydata.pl

@@ -0,0 +1,91 @@
+#!/tools/ns/bin/perl5
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+#
+# to run this script execute 'nohup copydata.pl &' from the tinderbox directory
+#
+
+$start_dir = `pwd`;
+chop($start_dir);
+$scp_cmd = "scp  -o 'User snapshot' -o'Port 22' -o 'UserKnownHostsFile /u/shaver/snapshot/known_hosts' -o 'IdentityFile /u/shaver/snapshot/identity'";
+
+
+$last_time = 0;
+
+$min_cycle_time = 3 * 60;  # 3 minutes
+
+print "starting dir is :$start_dir\n";
+
+while( 1 ){
+    chdir("$start_dir");
+    if( time - $last_time < $min_cycle_time ){
+        $sleep_time = $min_cycle_time - (time - $last_time);
+        print "\n\nSleeping $sleep_time seconds ...\n";
+        sleep( $sleep_time );
+    }
+
+    &copy_data("Mozilla");
+    &copy_data("raptor");
+
+    chdir( "$start_dir");
+    print  "$scp_cmd * cvs1.mozilla.org:/e/webtools/tinderbox\n";
+    system "$scp_cmd * cvs1.mozilla.org:/e/webtools/tinderbox";
+
+    chdir( "$start_dir/../bonsai");
+    print  "$scp_cmd * cvs1.mozilla.org:/e/webtools/bonsai\n";
+    system "$scp_cmd * cvs1.mozilla.org:/e/webtools/bonsai";
+
+
+    $last_time = time;
+}
+
+1;
+
+
+sub copy_data {
+    local($data_dir) = @_;
+    local($zips,$qry);
+
+chdir $data_dir || die "couldn't chdir to $data_dir";
+
+system "echo hello >lastup.new";
+
+if( -r 'lastup' ) {
+    $qry = '-newer lastup.old';
+    rename 'lastup', 'lastup.old'
+}
+rename 'lastup.new', 'lastup';
+
+
+open( FINDER, "find . $qry -name \"*.gz\" -print|" );
+while(<FINDER>){
+    print;
+    chop;
+    $zips .= "$_ ";
+}
+close( FINDER );
+
+unlink 'lastup.old';
+
+print "$scp_cmd *.txt $zips *.dat cvs1.mozilla.org:/e/webtools/tinderbox/$data_dir\n";
+system "$scp_cmd *.txt $zips *.dat cvs1.mozilla.org:/e/webtools/tinderbox/$data_dir";
+
+
+chdir $start_dir || die "couldn't chdir to $start_dir";
+}

mozilla/webtools/tinderbox/doadmin.cgi

@@ -0,0 +1,217 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+
+use lib "../bonsai";
+require 'lloydcgi.pl';
+require 'globals.pl';
+
+umask O666;
+
+
+$|=1;
+
+check_password();
+
+print "Content-type: text/html\n\n<HTML>\n";
+
+$command = $form{'command'};
+$tree= $form{'tree'};
+
+if( $command eq 'create_tree' ){
+    &create_tree;
+}
+elsif( $command eq 'remove_build' ){
+    &remove_build;
+}
+elsif( $command eq 'trim_logs' ){
+    &trim_logs;
+}
+elsif( $command eq 'set_message' ){
+    &set_message;
+}
+elsif( $command eq 'disable_builds' ){
+    &disable_builds;
+} else {
+    print "Unknown command: \"$command\".";
+}
+
+sub trim_logs {
+    $days = $form{'days'};
+    $tree = $form{'tree'};
+
+    print "<h2>Trimming Log files for $tree...</h2>\n<p>";
+    
+    $min_date = time - (60*60*24 * $days);
+
+    #
+    # Nuke the old log files
+    #
+    $i = 0;
+    opendir( D, 'DogbertTip' );
+    while( $fn = readdir( D ) ){
+        if( $fn =~ /\.gz$/ ){
+            ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,
+                $ctime,$blksize,$blocks) = stat("$tree/$fn");
+            if( $mtime && ($mtime < $min_date) ){
+                print "$fn\n";
+                $tblocks += $blocks;
+                unlink( "$tree/$fn" );
+                $i++;
+            }
+        }
+    }
+    closedir( D );
+    $k = $tblocks*512/1024;
+    print "<br><b>$i Logfiles ( $k K bytes ) removed</b><br>\n";
+
+    #
+    # Trim build.dat
+    #
+    $builds_removed = 0;
+    open(BD, "<$tree/build.dat");
+    open(NBD, ">$tree/build.dat.new");
+    while( <BD> ){
+        ($mailtime,$buildtime,$buildname) = split( /\|/ );
+        if( $buildtime >= $min_date ){
+            print NBD $_;
+        }
+        else {
+            $builds_removed++;
+        }
+    }
+    close( BD );
+    close( NBD );
+
+    rename( "$tree/build.dat", "$tree/build.dat.old" );
+    rename( "$tree/build.dat.new", "$tree/build.dat" );
+
+    print "<h2>$builds_removed Builds removed from build.dat</h2>\n";
+}
+
+sub create_tree {
+    $treename = $form{'treename'};
+    my $repository = $form{'repository'};
+    $modulename = $form{'modulename'};
+    $branchname = $form{'branchname'};
+
+    if( -r $treename ){
+        chmod 0777, $treename;
+    }
+    else {
+        mkdir( $treename, 0777 ) || die "<h1> Cannot mkdir $treename</h1>";
+    }
+    open( F, ">$treename/treedata.pl" );
+    print F "\$cvs_module='$modulename';\n";
+    print F "\$cvs_branch='$branchname';\n";
+    if ($repository ne "") {
+        print F "\$cvs_root='$repository';\n";
+    }
+    close( F );
+
+    open( F, ">$treename/build.dat" );
+    close( F );
+    
+    open( F, ">$treename/who.dat" );
+    close( F );
+
+    open( F, ">$treename/notes.txt" );
+    close( F );
+
+    chmod 0777, "$treename/build.dat", "$treename/who.dat", "$treename/notes.txt",
+                "$treename/treedata.pl";
+
+    print "<h2><a href=showbuilds.cgi?tree=$treename>Tree created or modified</a></h2>\n";
+}
+
+sub remove_build {
+    $build_name = $form{'build'};
+
+    #
+    # Trim build.dat
+    #
+    $builds_removed = 0;
+    open(BD, "<$tree/build.dat");
+    open(NBD, ">$tree/build.dat.new");
+    while( <BD> ){
+        ($mailtime,$buildtime,$bname) = split( /\|/ );
+        if( $bname ne $build_name ){
+            print NBD $_;
+        }
+        else {
+            $builds_removed++;
+        }
+    }
+    close( BD );
+    close( NBD );
+    chmod( 0777, "$tree/build.dat.new");
+
+    rename( "$tree/build.dat", "$tree/build.dat.old" );
+    rename( "$tree/build.dat.new", "$tree/build.dat" );
+
+    print "<h2><a href=showbuilds.cgi?tree=$tree>
+            $builds_removed Builds removed from build.dat</a></h2>\n";
+}
+
+sub disable_builds {
+    my $i,%buildnames;
+    $build_name = $form{'build'};
+
+    #
+    # Trim build.dat
+    #
+    open(BD, "<$tree/build.dat");
+    while( <BD> ){
+        ($mailtime,$buildtime,$bname) = split( /\|/ );
+        $buildnames{$bname} = 0;
+    }
+    close( BD );
+
+    for $i (keys %form) {
+        if ($i =~ /^build_/ ){
+            $i =~ s/^build_//;
+            $buildnames{$i} = 1;
+        }
+    }
+
+    open(IGNORE, ">$tree/ignorebuilds.pl");
+    print IGNORE '$ignore_builds = {' . "\n";
+    for $i ( sort keys %buildnames ){
+        if( $buildnames{$i} == 0 ){
+            print IGNORE "\t\t'$i' => 1,\n";
+        }
+    }
+    print IGNORE "\t};\n";
+
+    chmod( 0777, "$tree/ignorebuilds.pl");
+    print "<h2><a href=showbuilds.cgi?tree=$treename>Build state Changed</a></h2>\n";
+}
+
+
+sub set_message {
+    $m = $form{'message'};
+    $m =~ s/\'/\\'/g;
+    open(MOD, ">$tree/mod.pl");
+    print MOD "\$message_of_day = \'$m\'\;\n1;";
+    close(MOD);
+    chmod( 0777, "$tree/mod.pl");
+    print "<h2><a href=showbuilds.cgi?tree=$tree>
+            Message Changed</a></h2>\n";
+}
+

mozilla/webtools/tinderbox/ep_mac.pl

@@ -0,0 +1,45 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+1;
+# 
+# Scan a line and see if it has an error
+#
+sub has_error {
+    $line =~ /fatal error/  # link error
+    || $line =~ /Error  /   # C error
+    || $line =~ /\[checkout aborted\]/ #cvs error
+    || $line =~ /Couldn\'t find project file / # CW project error
+;
+}
+
+sub has_warning {                                    
+    $line =~ /^[A-Za-z0-9_]+\.[A-Za-z0-9]+\ line [0-9]+/ ;
+}
+
+sub has_errorline {
+    local( $line ) = @_;
+    if( $line =~ /^(([A-Za-z0-9_]+\.[A-Za-z0-9]+) line ([0-9]+))/ ){
+        $error_file = $1;
+        $error_file_ref = $2;
+        $error_line = $3;
+        $error_guess = 1;
+        return 1;
+    }
+    return 0;
+}

mozilla/webtools/tinderbox/ep_unix.pl

@@ -0,0 +1,59 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+1;
+# 
+# Scan a line and see if it has an error
+#
+sub has_error {
+    $line =~ /fatal error/  # link error
+    || $line =~ /^C /   # cvs merge conflict
+    || $line =~ / Error: /   # C error
+    || $line =~ / error\([0-9]*\)\:/   # C error
+    || ($line =~ /gmake/ && $line =~ / Error /)
+    || $line =~ /\[checkout aborted\]/ #cvs error
+    || $line =~ /\: cannot find module/ #cvs error
+
+    ;
+}
+
+
+sub has_warning {                                    
+    $line =~ /^[A-Za-z0-9_]+\.[A-Za-z0-9]+\:[0-9]+\:/ 
+    || $line =~ /^\"[A-Za-z0-9_]+\.[A-Za-z0-9]+\"\, line [0-9]+\:/ 
+;
+}
+
+sub has_errorline {
+    local( $line ) = @_;
+    if( $line =~ /^(([A-Za-z0-9_]+\.[A-Za-z0-9]+)\:([0-9]+)\:)/ ){
+        $error_file = $1;
+        $error_file_ref = $2;
+        $error_line = $3;
+        $error_guess = 1;
+        return 1;
+    }
+    if ( $line =~ /^(\"([A-Za-z0-9_]+\.[A-Za-z0-9]+)\"\, line ([0-9]+)\:)/  ){
+        $error_file = $1;
+        $error_file_ref = $2;
+        $error_line = $3;
+        $error_guess = 1;
+        return 1;
+    }
+    return 0;
+}

mozilla/webtools/tinderbox/ep_windows.pl

@@ -0,0 +1,73 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+1;
+# 
+# Scan a line and see if it has an error
+#
+sub has_error {
+    $line =~ /fatal error/  # link error
+    || $line =~ / error /   # C error
+    || $line =~ /^C /   # cvs merge conflict
+    || $line =~ /error C/   # C error
+    || $line =~ /Creating new precompiled header/   # Wastes time.
+    || $line =~ /error:/    # java error
+    || $line =~ /jmake.MakerFailedException:/    # java error
+    || $line =~ /Unknown host /    # cvs error
+    || $line =~ /: build failed\;/    # nmake error
+    || ($line =~ /gmake/ && $line =~ / Error /)
+    || $line =~ /\[checkout aborted\]/ #cvs error
+    || $line =~ /\: cannot find module/ #cvs error
+;
+}
+
+
+sub has_warning {
+    $line =~ /: warning/  # link error
+    || $line =~ / error /   # C error
+;
+}
+
+sub has_errorline {
+    local( $line ) = @_;
+    $error_file = ''; #'NS\CMD\WINFE\CXICON.cpp';
+    $error_line = 0;
+
+    if( $line =~ m@(ns([\\/][a-z0-9\._]+)*)@i ){
+        $error_file = $1;
+        $error_file_ref = lc $error_file;
+        $error_file_ref =~ s@\\@/@g;
+
+        $line =~ m/\(([0-9]+)\)/;
+        $error_line = $1;
+        return 1;
+    }
+
+    if( $line =~ m@(^([A-Za-z0-9_]+\.[A-Za-z])+\(([0-9]+)\))@ ){
+        $error_file = $1;
+        $error_file_ref = lc $2;
+        $error_line = $3;
+        $error_guess=1;
+        $error_file_ref =~ s@\\@/@g;
+
+        return 1;
+    }
+
+    return 0;
+}
+

mozilla/webtools/tinderbox/examples/README

@@ -0,0 +1,44 @@
+This directory contains example Tinderbox client scripts. These scripts are
+for illustration/documentation purposes only and are not maintained
+regularly. Current scripts to build mozilla will live in an another spot
+in the mozilla tree.
+
+Three examples have been provided:
+
+mozilla-windows.pl: perl script that drives mozilla tinderbox builds for Win32
+mozilla-unix.pl   : perl script that drives mozilla tinderbox builds for UNIX
+build-moz-smoke.pl: perl script that drives mozilla tinderbox builds for UNIX,
+	and subsequently runs the executable returning a green tree only if
+	it does not crash.
+
+These scripts show the basic elements of a Tinderbox client script. These
+elements are:
+
+1) Sending a start e-mail to the Tinderbox server, in the form of a formatted
+mail message. Example:
+
+tinderbox: tree: Mozilla
+tinderbox: builddate: 900002087
+tinderbox: status: building
+tinderbox: build: IRIX 6.3 Depend
+tinderbox: errorparser: unix
+tinderbox: buildfamily: unix
+
+2) Obtain a source tree by performing a cvs checkout.
+
+3) Perform the build, saving the output to a log file.
+
+4) Determine if the build was successful or failed. This could be done either
+by checking for the presence of a binary, or being using error codes returned
+from the compile command.
+
+5) Send a completion message to Tinderbox, identifying build success or
+failure.  Example:
+
+tinderbox: tree: Mozilla
+tinderbox: builddate: 900002087
+tinderbox: status: success
+tinderbox: build: IRIX 6.3 Depend
+tinderbox: errorparser: unix
+tinderbox: buildfamily: unix
+

mozilla/webtools/tinderbox/examples/build-moz-smoke.pl

@@ -0,0 +1,594 @@
+#!/usr/bin/perl
+
+require 5.000;
+
+use Sys::Hostname;
+use POSIX "sys_wait_h";
+use Cwd;
+
+$Version = "1.000";
+
+sub InitVars {
+
+    # PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+    $BuildAdministrator = "$ENV{'USER'}\@$ENV{'HOST'}";
+
+    #Default values of cmdline opts
+    $BuildDepend = 1;	#depend or clobber
+    $ReportStatus = 1;  # Send results to server or not
+    $BuildOnce = 0;     # Build once, don't send results to server
+    $BuildClassic = 0;  # Build classic source
+
+    #relative path to binary
+    $BinaryName{'x'} = 'mozilla-export';
+    $BinaryName{'qt'} = 'qtmozilla-export';
+    $BinaryName{'gnome'} = 'gnuzilla-export';
+    $BinaryName{'webshell'} = '/webshell/tests/viewer/viewer';
+
+    # Set these to what makes sense for your system
+    $cpus = 1;
+    $Make = 'gmake'; # Must be gnu make
+    $mail = '/bin/mail';
+    $Autoconf = 'autoconf -l build/autoconf';
+    $CVS = 'cvs -z3';
+    $CVSCO = 'co -P';
+
+    # Set these proper values for your tinderbox server
+    $Tinderbox_server = 'tinderbox-daemon\@cvs-mirror.mozilla.org';
+    #$Tinderbox_server = 'external-tinderbox-incoming\@tinderbox.seawood.org';
+
+    # These shouldn't really need to be changed
+    $BuildSleep = 10; # Minimum wait period from start of build to start
+                      # of next build in minutes
+    $BuildTree = 'SeaMonkey';
+    $BuildTag = '';
+    $BuildName = '';
+    $TopLevel = '.';
+    $Topsrcdir = 'mozilla';
+    $BuildObjName = '';
+    $BuildConfigDir = 'mozilla/config';
+    $ClobberStr = 'realclean';
+    $ConfigureEnvArgs = 'CFLAGS=-pipe CXXFLAGS=-pipe';
+    #$ConfigureEnvArgs = '';
+    $ConfigureArgs = "--with-nspr=/usr/local/nspr --cache-file=/dev/null --with-static-gtk --enable-editor";
+    $ConfigGuess = './build/autoconf/config.guess';
+    $Logfile = '${BuildDir}.log';
+} #EndSub-InitVars
+
+sub ConditionalArgs {
+    if ( $BuildClassic ) {
+	$FE = 'x';
+	$ConfigureArgs .= " --enable-fe=$FE";
+#	$BuildTree = 'raptor';
+	$BuildModule = 'Raptor';
+	$BuildTag = ''
+	    if ($BuildTag eq '');
+	$TopLevel = "mozilla-classic";
+    } else {
+#	$BuildTree = 'raptor';
+#	$Toolkit = 'gtk';
+	$FE = 'webshell'; 
+#	$BuildModule = 'Raptor';
+	$BuildModule = 'SeaMonkeyAll';
+#	$ConfigureArgs .= " --enable-toolkit=$Toolkit";
+    }
+    $CVSCO .= " -r $BuildTag" if ( $BuildTag ne '');
+}
+sub SetupEnv {
+    umask(0);
+    $ENV{"CVSROOT"} = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot';
+    $ENV{"LD_LIBRARY_PATH"} = '/usr/local/nspr:/builds/tinderbox/SeaMonkey/Linux_2.0.34_clobber/mozilla/obj-i586-pc-linux-gnu/dist/bin:/usr/lib/png:/usr/local/lib';
+    $ENV{"DISPLAY"} = 'crucible.mcom.com:0.0';
+} #EndSub-SetupEnv
+
+sub SetupPath {
+    my($Path);
+    $Path = $ENV{PATH};
+    print "Path before: $Path\n";
+
+    if ( $OS eq 'SunOS' ) {
+	$ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
+    }
+
+    $Path = $ENV{PATH};
+    print "Path After: $Path\n";
+} #EndSub-SetupPath
+
+##########################################################################
+# NO USER CONFIGURABLE PIECES BEYOND THIS POINT                          #
+##########################################################################
+
+sub GetSystemInfo {
+
+    $OS = `uname -s`;
+    $OSVer = `uname -r`;
+    
+    chop($OS, $OSVer);
+    
+    if ( $OS eq 'AIX' ) {
+	$OSVer = `uname -v`;
+	chop($OSVer);
+	$OSVer = $OSVer . "." . `uname -r`;
+	chop($OSVer);
+    }
+        
+    if ( $OS eq 'IRIX64' ) {
+	$OS = 'IRIX';
+    }
+    
+    if ( $OS eq 'SCO_SV' ) {
+	$OS = 'SCOOS';
+	$OSVer = '5.0';
+    }
+    
+    my $host, $myhost = hostname;
+    chomp($myhost);
+    ($host, $junk) = split(/\./, $myhost);
+	
+    $BuildName = ""; 
+	
+    if ( "$host" ne "" ) {
+	$BuildName = $host . ' ';
+    }
+    $BuildName .= $OS . ' ' . $OSVer . ' ' . ($BuildDepend?'Depend':'Clobber');
+    $DirName = $OS . '_' . $OSVer . '_' . ($BuildDepend?'depend':'clobber');
+    
+    $RealOS = $OS;
+    $RealOSVer = $OSVer;
+    
+    if ( $OS eq 'HP-UX' ) {
+	$RealOSVer = substr($OSVer,0,4);
+    }
+    
+    if ( $OS eq 'Linux' ) {
+	$RealOSVer = substr($OSVer,0,3);
+    }
+
+    if ($BuildClassic) {
+        $logfile = "${DirName}-classic.log";
+    } else {
+	$logfile = "${DirName}.log";
+    }
+} #EndSub-GetSystemInfo
+
+sub BuildIt {
+    my ($fe, @felist, $EarlyExit, $LastTime, $StartTimeStr);
+
+    mkdir("$DirName", 0777);
+    chdir("$DirName") || die "Couldn't enter $DirName";
+    
+    $StartDir = getcwd();
+    $LastTime = 0;
+    
+    print "Starting dir is : $StartDir\n";
+    
+    $EarlyExit = 0;
+    
+    while ( ! $EarlyExit ) {
+	chdir("$StartDir");
+	if ( time - $LastTime < (60 * $BuildSleep) ) {
+	    $SleepTime = (60 * $BuildSleep) - (time - $LastTime);
+	    print "\n\nSleeping $SleepTime seconds ...\n";
+	    sleep($SleepTime);
+	}
+	
+	$LastTime = time;
+	
+	$StartTime = time - 60 * 10;
+	$StartTimeStr = &CVSTime($StartTime);
+	
+	&StartBuild if ($ReportStatus);
+ 	$CurrentDir = getcwd();
+	if ( $CurrentDir ne $StartDir ) {
+	    print "startdir: $StartDir, curdir $CurrentDir\n";
+	    die "curdir != startdir";
+	}
+
+	$BuildDir = $CurrentDir;
+	
+	unlink( "$logfile" );
+	
+	print "opening $logfile\n";
+	open( LOG, ">$logfile" ) || print "can't open $?\n";
+	print LOG "current dir is -- $hostname:$CurrentDir\n";
+	print LOG "Build Administrator is $BuildAdministrator\n";
+	&PrintEnv;
+	
+	$BuildStatus = 0;
+
+	mkdir($TopLevel, 0777);
+	chdir($TopLevel) || die "chdir($TopLevel): $!\n";
+	
+	if ( $BuildClassic ) {
+	    print"$CVS $CVSCO $BuildModule\n";
+	    print LOG "$CVS $CVSCO $BuildModule\n";
+	    open (PULL, "$CVS $CVSCO $BuildModule 2>&1 |") || die "open: $!\n";
+	} else {
+#	    print "$CVS $CVSCO mozilla/nglayout.mk\n";
+#	    print LOG "$CVS $CVSCO mozilla/nglayout.mk\n";
+#	    open (PULL, "$CVS $CVSCO mozilla/nglayout.mk 2>&1 |") || die "open: $!\n";
+	    print "$CVS $CVSCO mozilla/client.mk\n";
+	    print LOG "$CVS $CVSCO mozilla/client.mk\n";
+	    open (PULL, "$CVS $CVSCO mozilla/client.mk 2>&1 |") || die "open: $!\n";
+	}
+	while (<PULL>) {
+	    print $_;
+	    print LOG $_;
+	}
+	close(PULL);
+	
+	# Move to topsrcdir
+	#chdir($Topsrcdir) || die "chdir($Topsrcdir): $!\n";
+         
+
+	# Do a separate checkout with toplevel makefile
+	if (! $BuildClassic) {
+	 #  print LOG "$Make -f nglayout.mk pull_all CVSCO='$CVS $CVSCO'|\n";
+	 #  open (PULLALL, "$Make -f nglayout.mk pull_all CVSCO='$CVS $CVSCO' |\n");
+	    print LOG "$Make -f mozilla/client.mk checkout CVSCO='$CVS $CVSCO'|\n";
+	    open (PULLALL, "$Make -f mozilla/client.mk checkout CVSCO='$CVS $CVSCO' |\n");
+	    while (<PULLALL>) {
+		print LOG $_;
+		print $_;
+	    }
+	    close(PULLALL);
+	}
+
+	chdir($Topsrcdir) || die "chdir($Topsrcdir): $!\n";
+
+	print LOG "$Autoconf\n";
+	open (AUTOCONF, "$Autoconf 2>&1 | ") || die "$Autoconf: $!\n";
+	while (<AUTOCONF>) {
+	    print LOG $_;
+	    print $_;
+	}
+	close(AUTOCONF);
+
+	print LOG "$ConfigGuess\n";
+	$BuildObjName = "obj-";
+	open (GETOBJ, "$ConfigGuess 2>&1 |") || die "$ConfigGuess: $!\n";
+	while (<GETOBJ>) {
+	    print $_;
+	    print LOG $_;
+	    chomp($BuildObjName .= $_); 
+	}
+	close (GETOBJ); 
+	
+	mkdir($BuildObjName, 0777);
+	chdir($BuildObjName) || die "chdir($BuildObjName): $!\n";
+	
+	print LOG "$ConfigureEnvArgs ../configure $ConfigureArgs\n";
+	open (CONFIGURE, "$ConfigureEnvArgs ../configure $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
+	while (<CONFIGURE>) {
+	    print $_;
+	    print LOG $_;
+	}
+	close(CONFIGURE);
+	    
+	# if we are building depend, rebuild dependencies
+	
+	if ($BuildDepend) {
+	    print LOG "$Make MAKE='$Make -j $cpus' depend 2>&1 |\n";
+	    open ( MAKEDEPEND, "$Make MAKE='$Make -j $cpus' depend 2>&1 |\n");
+	    while ( <MAKEDEPEND> ) {
+		print $_;
+		print LOG $_;
+	    }
+	    close (MAKEDEPEND);
+	    system("rm -rf dist");
+
+	} else {
+	    # Building clobber
+	    print LOG "$Make MAKE='$Make -j $cpus' $ClobberStr 2>&1 |\n";
+	    open( MAKECLOBBER, "$Make MAKE='$Make -j $cpus' $ClobberStr 2>&1 |");	    
+	    while ( <MAKECLOBBER> ) {
+	    	print $_;
+	    	print LOG $_;
+	    }
+	    close( MAKECLOBBER );
+	}
+
+	@felist = split(/,/, $FE);
+	    
+	foreach $fe ( @felist ) {	    
+	    if (&BinaryExists($fe)) {
+		print LOG "deleting existing binary\n";
+		&DeleteBinary($fe);
+	    }
+	}
+
+	if ($BuildClassic) {
+	    # Build the BE only	    
+	    print LOG "$Make MAKE='$Make -j $cpus' MOZ_FE= 2>&1 |\n";
+	    open( BEBUILD, "$Make MAKE='$Make -j $cpus' MOZ_FE= 2>&1 |");
+	    
+	    while ( <BEBUILD> ) {
+		print $_;
+		print LOG $_;
+	    }
+	    close( BEBUILD );
+
+	    foreach $fe ( @felist ) {		   
+		# Now build each front end
+		print LOG "$Make MAKE='$Make -j $cpus' -C cmd/${fe}fe 2>&1 |\n";
+		open(FEBUILD, "$Make MAKE='$Make -j $cpus' -C cmd/${fe}fe 2>&1 |\n");
+		while (<FEBUILD>) {
+		    print $_;
+		    print LOG $_;
+		}
+		close(FEBUILD);
+	    }
+	} else {
+		print LOG "$Make MAKE='$Make -j $cpus' 2>&1 |\n";
+		open(BUILD, "$Make MAKE='$Make -j $cpus' 2>&1 |\n");
+		while (<BUILD>) {
+		    print $_;
+		    print LOG $_;
+		}
+		close(BUILD);
+	}
+
+	foreach $fe (@felist) {
+	    if (&BinaryExists($fe)) {
+		   print LOG "export binary exists, build successful. Testing...\n";
+#return 0 if no problem, else 333 for a runtime error
+           $BuildStatus = &RunSmokeTest($fe);
+	    }
+	    else {
+		   print LOG "export binary missing, build FAILED\n";
+		   $BuildStatus = 666;
+	    }
+	   
+	    if ( $BuildStatus == 0 ) {
+ 	       $BuildStatusStr = 'success';
+	    }
+	    elsif ( $BuildStatus == 333 ) {
+           $BuildStatusStr = 'testfailed';
+        }
+		else {
+           $BuildStatusStr = 'busted';
+        }
+# replaced by above lines
+#	    $BuildStatusStr = ( $BuildStatus ? 'busted' : 'success' );
+
+	    print LOG "tinderbox: tree: $BuildTree\n";
+	    print LOG "tinderbox: builddate: $StartTime\n";
+	    print LOG "tinderbox: status: $BuildStatusStr\n";
+	    print LOG "tinderbox: build: $BuildName $fe\n";
+	    print LOG "tinderbox: errorparser: unix\n";
+	    print LOG "tinderbox: buildfamily: unix\n";
+	    print LOG "tinderbox: END\n";	    
+	}
+	close(LOG);
+	chdir("$StartDir");
+	
+# this fun line added on 2/5/98. do not remove. Translated to english,
+# that's "take any line longer than 1000 characters, and split it into less
+# than 1000 char lines.  If any of the resulting lines is
+# a dot on a line by itself, replace that with a blank line."  
+# This is to prevent cases where a <cr>.<cr> occurs in the log file.  Sendmail
+# interprets that as the end of the mail, and truncates the log before
+# it gets to Tinderbox.  (terry weismann, chris yeh)
+#
+# This was replaced by a perl 'port' of the above, writen by 
+# preed@netscape.com; good things: no need for system() call, and now it's
+# all in perl, so we don't have to do OS checking like before.
+
+	open(LOG, "$logfile") || die "Couldn't open logfile: $!\n";
+	open(OUTLOG, ">${logfile}.last") || die "Couldn't open logfile: $!\n";
+	    
+	while (<LOG>) {
+	    $q = 0;
+	    
+	    for (;;) {
+		$val = $q * 1000;
+		$Output = substr($_, $val, 1000);
+		
+		last if $Output eq undef;
+		
+		$Output =~ s/^\.$//g;
+		$Output =~ s/\n//g;
+		print OUTLOG "$Output\n";
+		$q++;
+	    } #EndFor
+		
+	} #EndWhile
+	    
+	close(LOG);
+	close(OUTLOG);
+
+	system( "$mail $Tinderbox_server < ${logfile}.last" )
+	    if ($ReportStatus );
+	unlink("$logfile");
+	
+	# if this is a test run, set early_exit to 0. 
+	#This mean one loop of execution
+	$EarlyExit++ if ($BuildOnce);
+    }
+    
+} #EndSub-BuildIt
+
+sub CVSTime {
+    my($StartTimeArg) = @_;
+    my($RetTime, $StartTimeArg, $sec, $minute, $hour, $mday, $mon, $year);
+    
+    ($sec,$minute,$hour,$mday,$mon,$year) = localtime($StartTimeArg);
+    $mon++; # month is 0 based.
+    
+    sprintf("%02d/%02d/%02d %02d:%02d:00", $mon,$mday,$year,$hour,$minute );
+}
+
+sub StartBuild {
+    
+    my($fe, @felist);
+
+    @felist = split(/,/, $FE);
+
+#    die "SERVER: " . $Tinderbox_server . "\n";
+    open( LOG, "|$mail $Tinderbox_server" );
+    foreach $fe ( @felist ) {
+	print LOG "\n";
+	print LOG "tinderbox: tree: $BuildTree\n";
+	print LOG "tinderbox: builddate: $StartTime\n";
+	print LOG "tinderbox: status: building\n";
+	print LOG "tinderbox: build: $BuildName $fe\n";
+	print LOG "tinderbox: errorparser: unix\n";
+	print LOG "tinderbox: buildfamily: unix\n";
+	print LOG "tinderbox: END\n";
+	print LOG "\n";
+    }
+    close( LOG );
+}
+
+# check for the existence of the binary
+sub BinaryExists {
+    my($fe) = @_;
+    my($Binname);
+    $fe = 'x' if (!defined($fe)); 
+
+    if ($BuildClassic) {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/'. $BuildObjName . "/cmd/${fe}fe/" . $BinaryName{"$fe"};
+    } else {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName{"$fe"};
+    }
+    print LOG $BinName . "\n"; 
+    if ((-e $BinName) && (-x $BinName) && (-s $BinName)) {
+	1;
+    }
+    else {
+	0;
+    }
+}
+
+sub DeleteBinary {
+    my($fe) = @_;
+    my($BinName);
+    $fe = 'x' if (!defined($fe)); 
+
+    if ($BuildClassic) {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . "/cmd/${fe}fe/" . $BinaryName{"$fe"};
+    } else {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName{"$fe"};
+    }
+    print LOG "unlinking $BinName\n";
+    unlink ($BinName) || print LOG "unlinking $BinName failed\n";
+}
+
+sub ParseArgs {
+    my($i, $manArg);
+
+    if( @ARGV == 0 ) {
+	&PrintUsage;
+    }
+    $i = 0;
+    $manArg = 0;
+    while( $i < @ARGV ) {
+	if ($ARGV[$i] eq '--depend') {
+	    $BuildDepend = 1;
+ 	    $manArg++;
+	}
+	elsif ($ARGV[$i] eq '--clobber') {
+	    $BuildDepend = 0;
+	    $manArg++;
+	}
+	elsif ( $ARGV[$i] eq '--once' ) {
+	    $BuildOnce = 1;
+	    #$ReportStatus = 0;
+	}
+	elsif ($ARGV[$i] eq '--classic') {
+	    $BuildClassic = 1;
+	}
+	elsif ($ARGV[$i] eq '--noreport') {
+	    $ReportStatus = 0;
+	}
+	elsif ($ARGV[$i] eq '--version' || $ARGV[$i] eq '-v') {
+	    die "$0: version $Version\n";
+	}
+	elsif ( $ARGV[$i] eq '-tag' ) {
+	    $i++;
+	    $BuildTag = $ARGV[$i];
+	    if ( $BuildTag eq '' || $BuildTag eq '-t') {
+		&PrintUsage;
+	    }
+	}
+	elsif ( $ARGV[$i] eq '-t' ) {
+	    $i++;
+	    $BuildTree = $ARGV[$i];
+	    if ( $BuildTree eq '' ) {
+		&PrintUsage;
+	    }
+	} else {
+	    &PrintUsage;
+	}
+
+	$i++;
+    } #EndWhile
+
+    if ( $BuildTree =~ /^\s+$/i ) {
+	&PrintUsage;
+    }
+
+    if ($BuildDepend eq undef) {
+	&PrintUsage;
+    }
+
+    &PrintUsage if (! $manArg );
+
+} #EndSub-ParseArgs
+
+sub PrintUsage {
+    die "usage: $0 [--depend | --clobber] [-v | --version ] [--once --classic --noreport -tag TREETAG -t TREENAME ]\n";
+}
+
+sub PrintEnv {
+    my ($key);
+    foreach $key (keys %ENV) {
+	print LOG "$key = $ENV{$key}\n";
+	print "$key = $ENV{$key}\n";
+    }
+} #EndSub-PrintEnv
+
+sub RunSmokeTest {
+    my($fe) = @_;
+    my($Binary);
+    $fe = 'x' if (!defined($fe));
+
+    $Binary = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName{"$fe"};
+    print LOG $BinName . "\n";
+
+   $waittime = 30;
+
+   $pid = fork;
+
+   exec $Binary if !$pid;
+
+   # parent - wait $waittime seconds then check on child
+   sleep $waittime;
+   $status = waitpid $pid, WNOHANG();
+   if ($status != 0) {
+     print LOG "$BinName has crashed or quit. Turn the tree orange now.\n";
+     return 333;
+   }
+
+   print LOG "Success! $BinName is still running. Killing..\n";
+   # try to kill 3 times, then try a kill -9
+   for ($i=0 ; $i<3 ; $i++) {
+     kill 'TERM',$pid,;
+     # give it 3 seconds to actually die
+     sleep 3;
+     $status = waitpid $pid, WNOHANG();
+    last if ($status != 0);
+   }
+   return 0;
+} #EndSub-RunSmokeTest
+ 
+# Main function
+&InitVars;
+&ParseArgs;
+&ConditionalArgs;
+&GetSystemInfo;
+&SetupEnv;
+&SetupPath;
+&BuildIt;
+
+1;

mozilla/webtools/tinderbox/examples/buildit.config

@@ -0,0 +1,63 @@
+#!/usr/bin/perl
+
+sub InitVars {
+
+#initialize variables
+#$binary_name = '/netscape-export';
+$BinaryName = '/mozilla-export';
+$BuildDepend = 1;	#depend or clobber
+$BuildTree = '';
+$BuildTag = '';
+$BuildName = '';
+#$BuildContinue = 0;
+$TopLevel = 'mozilla/';
+$BuildObjName = '';
+$BuildSleep = 10;
+$BuildUnixclasses = 0;
+$EarlyExit = 1;
+$BuildStartDir = 'ns/';
+$BuildConfigDir = 'mozilla/config';
+
+} #EndSub-InitVars
+
+sub SetupEnv {
+
+	umask(0);
+	$ENV{'MOZILLA_CLIENT'} = 1;
+	$ENV{'NETSCAPE_HIERARCHY'} = 1;
+	$ENV{'BUILD_OFFICIAL'} = 1;
+	$ENV{'NSPR20'} = 1;
+	$ENV{'AWT_11'} = 1;
+	$ENV{'MOZ_SECURITY'} = 1;
+	$ENV{"CVSROOT"} = '/m/src';
+	$ENV{"MAKE"} = 'gmake -e';
+	$ENV{'MOZ_MEDIUM'} = 1;
+	$ENV{'NO_MDUPDATE'} = 1;
+	$ENV{'EDITOR'} = 1;
+
+} #EndSub-SetupEnv
+
+sub SetupPath {
+
+    my($Path);
+    $Path = $ENV{PATH};
+    print "Path before: $Path\n";
+    $ENV{'PATH'} = '/tools/ns/bin:/tools/contrib/bin:/usr/local/bin:/usr/sbin:/usr/bsd:/sbin:/usr/bin:/bin:/usr/bin/X11:/usr/etc:/usr/hosts:/usr/ucb:';
+
+    # This won't work on x86 or sunos4 systems....
+    if ( $OS eq 'SunOS' ) {
+	$ENV{'PATH'} = '/usr/ccs/bin:/tools/ns/soft/gcc-2.6.3/run/default/sparc_sun_solaris2.4/bin:' . $ENV{'PATH'};
+	$ENV{'NO_MDUPDATE'} = 1;
+    }
+
+    if ( $OS eq 'AIX' ) {
+	$ENV{'PATH'} = $ENV{'PATH'} . '/usr/lpp/xlC/bin:/usr/local-aix/bin:';
+    }
+
+    $Path = $ENV{PATH};
+    print "Path After: $Path\n";
+
+} #EndSub-SetupPath
+
+
+1;

mozilla/webtools/tinderbox/examples/mozilla-unix.pl

@@ -0,0 +1,548 @@
+#!/usr/bin/perl
+
+require 5.000;
+
+use Sys::Hostname;
+use Cwd;
+
+$Version = "1.000";
+
+sub InitVars {
+
+    # PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+    $BuildAdministrator = "$ENV{'USER'}\@$ENV{'HOST'}";
+
+    #Default values of cmdline opts
+    $BuildDepend = 1;	#depend or clobber
+    $ReportStatus = 1;  # Send results to server or not
+    $BuildOnce = 0;     # Build once, don't send results to server
+    $BuildClassic = 0;  # Build classic source
+
+    #relative path to binary
+    $BinaryName{'x'} = 'mozilla-export';
+    $BinaryName{'qt'} = 'qtmozilla-export';
+    $BinaryName{'gnome'} = 'gnuzilla-export';
+    $BinaryName{'webshell'} = '/webshell/tests/viewer/viewer';
+    $BinaryName{'xpfe'} = '/xpfe/xpviewer/src/xpviewer';
+
+    # Set these to what makes sense for your system
+    $cpus = 1;
+    $Make = 'gmake'; # Must be gnu make
+    $mail = '/bin/mail';
+    $Autoconf = 'autoconf -l build/autoconf';
+    $CVS = 'cvs -z3';
+    $CVSCO = 'co -P';
+
+    # Set these proper values for your tinderbox server
+    $Tinderbox_server = 'tinderbox-daemon\@warp.mcom.com';
+    #$Tinderbox_server = 'external-tinderbox-incoming\@tinderbox.seawood.org';
+
+    # These shouldn't really need to be changed
+    $BuildSleep = 10; # Minimum wait period from start of build to start
+                      # of next build in minutes
+    $BuildTree = 'raptor';
+    $BuildTag = '';
+    $BuildName = '';
+    $TopLevel = '.';
+    $Topsrcdir = 'mozilla';
+    $BuildObjName = '';
+    $BuildConfigDir = 'mozilla/config';
+    $ClobberStr = 'realclean';
+    $ConfigureEnvArgs = 'CFLAGS=-pipe CXXFLAGS=-pipe';
+    #$ConfigureEnvArgs = '';
+    $ConfigureArgs = "--cache-file=/dev/null";
+    $ConfigGuess = './build/autoconf/config.guess';
+    $Logfile = '${BuildDir}.log';
+} #EndSub-InitVars
+
+sub ConditionalArgs {
+    if ( $BuildClassic ) {
+	$FE = 'x';
+	$ConfigureArgs .= " --enable-fe=$FE";
+	$BuildTree = 'raptor';
+	$BuildModule = 'Raptor';
+	$BuildTag = ''
+	    if ($BuildTag eq '');
+	$TopLevel = "mozilla-classic";
+    } else {
+	$BuildTree = 'raptor';
+#	$Toolkit = 'gtk';
+	$FE = 'webshell,xpfe'; 
+	$BuildModule = 'Raptor';
+#	$ConfigureArgs .= " --enable-toolkit=$Toolkit";
+    }
+    $CVSCO .= " -r $BuildTag" if ( $BuildTag ne '');
+}
+sub SetupEnv {
+    umask(0);
+    $ENV{"CVSROOT"} = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot';
+} #EndSub-SetupEnv
+
+sub SetupPath {
+    my($Path);
+    $Path = $ENV{PATH};
+    print "Path before: $Path\n";
+
+    if ( $OS eq 'SunOS' ) {
+	$ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
+    }
+
+    $Path = $ENV{PATH};
+    print "Path After: $Path\n";
+} #EndSub-SetupPath
+
+##########################################################################
+# NO USER CONFIGURABLE PIECES BEYOND THIS POINT                          #
+##########################################################################
+
+sub GetSystemInfo {
+
+    $OS = `uname -s`;
+    $OSVer = `uname -r`;
+    
+    chop($OS, $OSVer);
+    
+    if ( $OS eq 'AIX' ) {
+	$OSVer = `uname -v`;
+	chop($OSVer);
+	$OSVer = $OSVer . "." . `uname -r`;
+	chop($OSVer);
+    }
+        
+    if ( $OS eq 'IRIX64' ) {
+	$OS = 'IRIX';
+    }
+    
+    if ( $OS eq 'SCO_SV' ) {
+	$OS = 'SCOOS';
+	$OSVer = '5.0';
+    }
+    
+    my $host, $myhost = hostname;
+    chomp($myhost);
+    ($host, $junk) = split(/\./, $myhost);
+	
+    $BuildName = ""; 
+	
+    if ( "$host" ne "" ) {
+	$BuildName = $host . ' ';
+    }
+    $BuildName .= $OS . ' ' . $OSVer . ' ' . ($BuildDepend?'Depend':'Clobber');
+    $DirName = $OS . '_' . $OSVer . '_' . ($BuildDepend?'depend':'clobber');
+    
+    $RealOS = $OS;
+    $RealOSVer = $OSVer;
+    
+    if ( $OS eq 'HP-UX' ) {
+	$RealOSVer = substr($OSVer,0,4);
+    }
+    
+    if ( $OS eq 'Linux' ) {
+	$RealOSVer = substr($OSVer,0,3);
+    }
+
+    if ($BuildClassic) {
+        $logfile = "${DirName}-classic.log";
+    } else {
+	$logfile = "${DirName}.log";
+    }
+} #EndSub-GetSystemInfo
+
+sub BuildIt {
+    my ($fe, @felist, $EarlyExit, $LastTime, $StartTimeStr);
+
+    mkdir("$DirName", 0777);
+    chdir("$DirName") || die "Couldn't enter $DirName";
+    
+    $StartDir = getcwd();
+    $LastTime = 0;
+    
+    print "Starting dir is : $StartDir\n";
+    
+    $EarlyExit = 0;
+    
+    while ( ! $EarlyExit ) {
+	chdir("$StartDir");
+	if ( time - $LastTime < (60 * $BuildSleep) ) {
+	    $SleepTime = (60 * $BuildSleep) - (time - $LastTime);
+	    print "\n\nSleeping $SleepTime seconds ...\n";
+	    sleep($SleepTime);
+	}
+	
+	$LastTime = time;
+	
+	$StartTime = time - 60 * 10;
+	$StartTimeStr = &CVSTime($StartTime);
+	
+	&StartBuild if ($ReportStatus);
+ 	$CurrentDir = getcwd();
+	if ( $CurrentDir ne $StartDir ) {
+	    print "startdir: $StartDir, curdir $CurrentDir\n";
+	    die "curdir != startdir";
+	}
+
+	$BuildDir = $CurrentDir;
+	
+	unlink( "$logfile" );
+	
+	print "opening $logfile\n";
+	open( LOG, ">$logfile" ) || print "can't open $?\n";
+	print LOG "current dir is -- $hostname:$CurrentDir\n";
+	print LOG "Build Administrator is $BuildAdministrator\n";
+	&PrintEnv;
+	
+	$BuildStatus = 0;
+
+	mkdir($TopLevel, 0777);
+	chdir($TopLevel) || die "chdir($TopLevel): $!\n";
+	
+	if ( $BuildClassic ) {
+	    print"$CVS $CVSCO $BuildModule\n";
+	    print LOG "$CVS $CVSCO $BuildModule\n";
+	    open (PULL, "$CVS $CVSCO $BuildModule 2>&1 |") || die "open: $!\n";
+	} else {
+#	    print "$CVS $CVSCO mozilla/nglayout.mk\n";
+#	    print LOG "$CVS $CVSCO mozilla/nglayout.mk\n";
+#	    open (PULL, "$CVS $CVSCO mozilla/nglayout.mk 2>&1 |") || die "open: $!\n";
+	    print "$CVS $CVSCO mozilla/client.mk\n";
+	    print LOG "$CVS $CVSCO mozilla/client.mk\n";
+	    open (PULL, "$CVS $CVSCO mozilla/client.mk 2>&1 |") || die "open: $!\n";
+	}
+	while (<PULL>) {
+	    print $_;
+	    print LOG $_;
+	}
+	close(PULL);
+	
+	# Move to topsrcdir
+	#chdir($Topsrcdir) || die "chdir($Topsrcdir): $!\n";
+         
+
+	# Do a separate checkout with toplevel makefile
+	if (! $BuildClassic) {
+	 #  print LOG "$Make -f nglayout.mk pull_all CVSCO='$CVS $CVSCO'|\n";
+	 #  open (PULLALL, "$Make -f nglayout.mk pull_all CVSCO='$CVS $CVSCO' |\n");
+	    print LOG "$Make -f mozilla/client.mk checkout CVSCO='$CVS $CVSCO'|\n";
+	    open (PULLALL, "$Make -f mozilla/client.mk checkout CVSCO='$CVS $CVSCO' |\n");
+	    while (<PULLALL>) {
+		print LOG $_;
+		print $_;
+	    }
+	    close(PULLALL);
+	}
+
+	chdir($Topsrcdir) || die "chdir($Topsrcdir): $!\n";
+
+	print LOG "$Autoconf\n";
+	open (AUTOCONF, "$Autoconf 2>&1 | ") || die "$Autoconf: $!\n";
+	while (<AUTOCONF>) {
+	    print LOG $_;
+	    print $_;
+	}
+	close(AUTOCONF);
+
+	print LOG "$ConfigGuess\n";
+	$BuildObjName = "obj-";
+	open (GETOBJ, "$ConfigGuess 2>&1 |") || die "$ConfigGuess: $!\n";
+	while (<GETOBJ>) {
+	    print $_;
+	    print LOG $_;
+	    chomp($BuildObjName .= $_); 
+	}
+	close (GETOBJ); 
+	
+	mkdir($BuildObjName, 0777);
+	chdir($BuildObjName) || die "chdir($BuildObjName): $!\n";
+	
+	print LOG "$ConfigureEnvArgs ../configure $ConfigureArgs\n";
+	open (CONFIGURE, "$ConfigureEnvArgs ../configure $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
+	while (<CONFIGURE>) {
+	    print $_;
+	    print LOG $_;
+	}
+	close(CONFIGURE);
+	    
+	# if we are building depend, rebuild dependencies
+	
+	if ($BuildDepend) {
+	    print LOG "$Make MAKE='$Make -j $cpus' depend 2>&1 |\n";
+	    open ( MAKEDEPEND, "$Make MAKE='$Make -j $cpus' depend 2>&1 |\n");
+	    while ( <MAKEDEPEND> ) {
+		print $_;
+		print LOG $_;
+	    }
+	    close (MAKEDEPEND);
+	    system("rm -rf dist");
+
+	} else {
+	    # Building clobber
+	    print LOG "$Make MAKE='$Make -j $cpus' $ClobberStr 2>&1 |\n";
+	    open( MAKECLOBBER, "$Make MAKE='$Make -j $cpus' $ClobberStr 2>&1 |");	    
+	    while ( <MAKECLOBBER> ) {
+	    	print $_;
+	    	print LOG $_;
+	    }
+	    close( MAKECLOBBER );
+	}
+
+	@felist = split(/,/, $FE);
+	    
+	foreach $fe ( @felist ) {	    
+	    if (&BinaryExists($fe)) {
+		print LOG "deleting existing binary\n";
+		&DeleteBinary($fe);
+	    }
+	}
+
+	if ($BuildClassic) {
+	    # Build the BE only	    
+	    print LOG "$Make MAKE='$Make -j $cpus' MOZ_FE= 2>&1 |\n";
+	    open( BEBUILD, "$Make MAKE='$Make -j $cpus' MOZ_FE= 2>&1 |");
+	    
+	    while ( <BEBUILD> ) {
+		print $_;
+		print LOG $_;
+	    }
+	    close( BEBUILD );
+
+	    foreach $fe ( @felist ) {		   
+		# Now build each front end
+		print LOG "$Make MAKE='$Make -j $cpus' -C cmd/${fe}fe 2>&1 |\n";
+		open(FEBUILD, "$Make MAKE='$Make -j $cpus' -C cmd/${fe}fe 2>&1 |\n");
+		while (<FEBUILD>) {
+		    print $_;
+		    print LOG $_;
+		}
+		close(FEBUILD);
+	    }
+	} else {
+		print LOG "$Make MAKE='$Make -j $cpus' 2>&1 |\n";
+		open(BUILD, "$Make MAKE='$Make -j $cpus' 2>&1 |\n");
+		while (<BUILD>) {
+		    print $_;
+		    print LOG $_;
+		}
+		close(BUILD);
+	}
+
+	foreach $fe (@felist) {
+	    if (&BinaryExists($fe)) {
+		print LOG "export binary exists, build SUCCESSFUL!\n";
+		$BuildStatus = 0;
+	    }
+	    else {
+		print LOG "export binary missing, build FAILED\n";
+		$BuildStatus = 666;
+	    }
+	    
+	    print LOG "\nBuild Status = $BuildStatus\n";
+	    
+	    $BuildStatusStr = ( $BuildStatus ? 'busted' : 'success' );
+	    
+	    print LOG "tinderbox: tree: $BuildTree\n";
+	    print LOG "tinderbox: builddate: $StartTime\n";
+	    print LOG "tinderbox: status: $BuildStatusStr\n";
+	    print LOG "tinderbox: build: $BuildName $fe\n";
+	    print LOG "tinderbox: errorparser: unix\n";
+	    print LOG "tinderbox: buildfamily: unix\n";
+	    print LOG "tinderbox: END\n";	    
+	}
+	close(LOG);
+	chdir("$StartDir");
+	
+# this fun line added on 2/5/98. do not remove. Translated to english,
+# that's "take any line longer than 1000 characters, and split it into less
+# than 1000 char lines.  If any of the resulting lines is
+# a dot on a line by itself, replace that with a blank line."  
+# This is to prevent cases where a <cr>.<cr> occurs in the log file.  Sendmail
+# interprets that as the end of the mail, and truncates the log before
+# it gets to Tinderbox.  (terry weismann, chris yeh)
+#
+# This was replaced by a perl 'port' of the above, writen by 
+# preed@netscape.com; good things: no need for system() call, and now it's
+# all in perl, so we don't have to do OS checking like before.
+
+	open(LOG, "$logfile") || die "Couldn't open logfile: $!\n";
+	open(OUTLOG, ">${logfile}.last") || die "Couldn't open logfile: $!\n";
+	    
+	while (<LOG>) {
+	    $q = 0;
+	    
+	    for (;;) {
+		$val = $q * 1000;
+		$Output = substr($_, $val, 1000);
+		
+		last if $Output eq undef;
+		
+		$Output =~ s/^\.$//g;
+		$Output =~ s/\n//g;
+		print OUTLOG "$Output\n";
+		$q++;
+	    } #EndFor
+		
+	} #EndWhile
+	    
+	close(LOG);
+	close(OUTLOG);
+
+	system( "$mail $Tinderbox_server < ${logfile}.last" )
+	    if ($ReportStatus );
+	unlink("$logfile");
+	
+	# if this is a test run, set early_exit to 0. 
+	#This mean one loop of execution
+	$EarlyExit++ if ($BuildOnce);
+    }
+    
+} #EndSub-BuildIt
+
+sub CVSTime {
+    my($StartTimeArg) = @_;
+    my($RetTime, $StartTimeArg, $sec, $minute, $hour, $mday, $mon, $year);
+    
+    ($sec,$minute,$hour,$mday,$mon,$year) = localtime($StartTimeArg);
+    $mon++; # month is 0 based.
+    
+    sprintf("%02d/%02d/%02d %02d:%02d:00", $mon,$mday,$year,$hour,$minute );
+}
+
+sub StartBuild {
+    
+    my($fe, @felist);
+
+    @felist = split(/,/, $FE);
+
+#    die "SERVER: " . $Tinderbox_server . "\n";
+    open( LOG, "|$mail $Tinderbox_server" );
+    foreach $fe ( @felist ) {
+	print LOG "\n";
+	print LOG "tinderbox: tree: $BuildTree\n";
+	print LOG "tinderbox: builddate: $StartTime\n";
+	print LOG "tinderbox: status: building\n";
+	print LOG "tinderbox: build: $BuildName $fe\n";
+	print LOG "tinderbox: errorparser: unix\n";
+	print LOG "tinderbox: buildfamily: unix\n";
+	print LOG "tinderbox: END\n";
+	print LOG "\n";
+    }
+    close( LOG );
+}
+
+# check for the existence of the binary
+sub BinaryExists {
+    my($fe) = @_;
+    my($Binname);
+    $fe = 'x' if (!defined($fe)); 
+
+    if ($BuildClassic) {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/'. $BuildObjName . "/cmd/${fe}fe/" . $BinaryName{"$fe"};
+    } else {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName{"$fe"};
+    }
+    print LOG $BinName . "\n"; 
+    if ((-e $BinName) && (-x $BinName) && (-s $BinName)) {
+	1;
+    }
+    else {
+	0;
+    }
+}
+
+sub DeleteBinary {
+    my($fe) = @_;
+    my($BinName);
+    $fe = 'x' if (!defined($fe)); 
+
+    if ($BuildClassic) {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . "/cmd/${fe}fe/" . $BinaryName{"$fe"};
+    } else {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName{"$fe"};
+    }
+    print LOG "unlinking $BinName\n";
+    unlink ($BinName) || print LOG "unlinking $BinName failed\n";
+}
+
+sub ParseArgs {
+    my($i, $manArg);
+
+    if( @ARGV == 0 ) {
+	&PrintUsage;
+    }
+    $i = 0;
+    $manArg = 0;
+    while( $i < @ARGV ) {
+	if ($ARGV[$i] eq '--depend') {
+	    $BuildDepend = 1;
+ 	    $manArg++;
+	}
+	elsif ($ARGV[$i] eq '--clobber') {
+	    $BuildDepend = 0;
+	    $manArg++;
+	}
+	elsif ( $ARGV[$i] eq '--once' ) {
+	    $BuildOnce = 1;
+	    #$ReportStatus = 0;
+	}
+	elsif ($ARGV[$i] eq '--classic') {
+	    $BuildClassic = 1;
+	}
+	elsif ($ARGV[$i] eq '--noreport') {
+	    $ReportStatus = 0;
+	}
+	elsif ($ARGV[$i] eq '--version' || $ARGV[$i] eq '-v') {
+	    die "$0: version $Version\n";
+	}
+	elsif ( $ARGV[$i] eq '-tag' ) {
+	    $i++;
+	    $BuildTag = $ARGV[$i];
+	    if ( $BuildTag eq '' || $BuildTag eq '-t') {
+		&PrintUsage;
+	    }
+	}
+	elsif ( $ARGV[$i] eq '-t' ) {
+	    $i++;
+	    $BuildTree = $ARGV[$i];
+	    if ( $BuildTree eq '' ) {
+		&PrintUsage;
+	    }
+	} else {
+	    &PrintUsage;
+	}
+
+	$i++;
+    } #EndWhile
+
+    if ( $BuildTree =~ /^\s+$/i ) {
+	&PrintUsage;
+    }
+
+    if ($BuildDepend eq undef) {
+	&PrintUsage;
+    }
+
+    &PrintUsage if (! $manArg );
+
+} #EndSub-ParseArgs
+
+sub PrintUsage {
+    die "usage: $0 [--depend | --clobber] [-v | --version ] [--once --classic --noreport -tag TREETAG -t TREENAME ]\n";
+}
+
+sub PrintEnv {
+    my ($key);
+    foreach $key (keys %ENV) {
+	print LOG "$key = $ENV{$key}\n";
+	print "$key = $ENV{$key}\n";
+    }
+} #EndSub-PrintEnv
+
+# Main function
+&InitVars;
+&ParseArgs;
+&ConditionalArgs;
+&GetSystemInfo;
+&SetupEnv;
+&SetupPath;
+&BuildIt;
+
+1;

mozilla/webtools/tinderbox/examples/mozilla-windows.pl

@@ -0,0 +1,416 @@
+#!c:/nstools/bin/perl5
+
+use Cwd;
+
+$build_depend=1;      #depend or clobber
+$build_tree = '';
+$build_tag = '';
+$build_name = '';
+$build_continue = 0;
+$build_sleep=10;
+$no32 = 0;
+$no16 = 0;
+$original_path = $ENV{'PATH'};
+$early_exit = 1;
+$doawt11 = 0;
+
+$do_clobber = '';
+$client_param = 'pull_and_build_all';
+
+&parse_args;
+
+if( $build_test ){
+    $build_sleep=1;
+}
+
+$dirname = ($build_depend?'dep':'clob');
+
+
+$logfile = "${dirname}.log";
+
+if( $build_depend ){
+    $clobber_str = 'depend';
+}     
+else {
+    $clobber_str = 'clobber_all';
+}
+
+
+mkdir("$dirname", 0777);
+chdir("$dirname") || die "couldn't cd to $dirname";
+
+$start_dir = cwd;
+$last_time = 0;
+
+print "starting dir is :$start_dir\n";
+
+
+while( $early_exit ){
+    chdir("$start_dir");
+    if( time - $last_time < (60 * $build_sleep) ){
+        $sleep_time = (60 * $build_sleep) - (time - $last_time);
+        print "\n\nSleeping $sleep_time seconds ...\n";
+        sleep( $sleep_time );
+    }
+    $last_time = time;
+
+    $start_time = time-60*10;
+    $start_time_str = &cvs_time( $start_time );
+# call setup_env here in the loop, to update MOZ_DATE with each pass.
+# setup_env uses start_time_str for MOZ_DATE.
+    &setup_env;
+
+
+    $cur_dir = cwd;
+
+    if( $cur_dir ne $start_dir ){
+        print "startdir: $start_dir, curdir $cur_dir\n";
+        die "curdir != startdir";
+    }
+
+# build 32-bit with AWT_11=1
+    &setup32("1");
+    if( !$no32 ){
+    	if( !$noawt11 ){
+	    &do_build(1,$do_clobber);
+    	}
+    }
+
+    if ($build_test) {
+	$early_exit = 0;	# stops this while loop after one pass.
+    }
+    if( !$no16 ){
+
+# build 32-bit with AWT_11=0
+# necessary before building 16-bit because 16-bit cannot use AWT 1.1 classes
+	&setup32("0");
+	if( !$no32 ){
+	    if( !$noawt11 ){
+		&do_build(0,'');
+	    } else {
+		&do_build(1,$do_clobber);
+	    }
+	}
+
+        &setup16;
+
+# strip_conf fails to strip any variables from the real environemnt
+#	&strip_config;
+        &do_build(0,'');
+#	&restore_config;
+    }
+}
+
+sub copy_win16_dist {
+
+    system 'xcopy w:\ y:\ns\dist /S /E /F'; 
+    print "COPYCOPYCOPY\n";
+
+}
+
+sub build_NSPR20_Win16 {
+
+    &start_build;
+    unlink( "${logname}.last" );
+    rename( "${logname}","${logname}.last");
+
+    print "opening ${logname}\n";
+    open( LOG, ">${logname}" ) || print "can't open $?\n";
+    print LOG "current dir is :$cur_dir\n";
+
+    &print_env;
+
+    chdir("$moz_src/ns/nspr20") || die "couldn't chdir to '$moz_src/ns/nspr20'";
+    print LOG   "gmake |\n";
+    open( BUILDNSPR, "gmake 2>&1 |") || print "couldn't execute gmake\n";;
+
+    while( <BUILDNSPR> ) {
+        print $_;
+        print LOG $_;
+    }
+    close ( BUILDNSPR );
+
+    close( LOG );
+}
+
+sub setup32 {
+    local ($awt) = @_;
+
+    $ENV{"MOZ_BITS"}  = '32';
+    $ENV{"AWT_11"}    = $awt;
+    $doawt11 	      = $awt;
+
+    $ENV{"INCLUDE"}   = "$msdev\\include;$msdev\\mfc\\include";
+    $ENV{"LIB"}       = "$msdev\\lib;$msdev\\mfc\\lib";
+    $ENV{"PATH"}      = $original_path . ";$msdev\\bin";
+    $ENV{"OS_TARGET"} = 'WIN95';
+    $moz_src          = $ENV{'MOZ_SRC'} = $start_dir;
+    $build_name       = 'Win32 ' . ($build_depend?'Depend':'Clobber');
+    $do_clobber       = $clobber_str;
+    $logname          = "win32.log";
+}
+
+sub setup16 {
+    $moz_src = $ENV{'MOZ_SRC'} = $start_dir;
+    $ENV{"MOZ_BITS"} = '16';
+# perl 5 is fucked up.  you MUST set AWT_11=0. deleting the environment
+# variable doesn't work.  it's removed from the environment entry, but
+# is still defined as true for a build.
+    $ENV{"AWT_11"} = '0';
+    $moz_src = $ENV{'MOZ_SRC'} = "$src_16_drive";
+    $ENV{"OS_TARGET"} = 'WIN16';
+
+    $msvc_inc = "$moz_src\\ns\\msvc15\\include;$moz_src\\ns\\msvc15\\mfc\\include";
+    $msvc_lib = "$msvc\\lib;$msvc\\mfc\\lib";
+    $msvcpath = "$msvc\\bin;c:\\nstools\\bin;c:\\WINNT40;c:\\WINNT40\\system32;c:\\utils";
+    $ENV{"MSVC_INC"} = $msvc_inc;
+    $ENV{"MSVC_LIB"} = $msvc_lib;
+    $ENV{"MSVCPATH"} = $msvcpath;
+
+    $ENV{"INCLUDE"}  = $msvc_inc;
+    $ENV{"LIB"}      = $msvc_lib;
+    $ENV{"PATH"}     = $msvcpath;
+
+    $watcom = $ENV{"WATCOM"} = "C:\\WATCOM";
+    $ENV{"EDPATH"}   = "$watcom\\EDDAT";
+    $ENV{"WATC_INC"} = "$watcom\\h;$watcom\\h\win;$msvc_inc";
+    $ENV{"WATC_LIB"} = $msvc_lib;
+    $ENV{"WATCPATH"} = "$watcom\\BINNT;$watcom\\BINW;c:\\nstools\\bin";
+
+    $build_name = 'Win16 ' . ($build_depend?'Depend':'Clobber');
+    $do_clobber = $clobber_str;
+    $logname = "win16.log";
+
+    system "subst l: /d";
+    system "subst r: /d";
+    system "subst $src_16_drive /d";
+
+    system "subst $src_16_drive $start_dir";
+    system "subst r: $src_16_drive\\ns\\netsite\\ldap\\libraries\\msdos\\winsock";
+    system "subst l: $src_16_drive\\ns\\netsite";
+}
+
+sub do_build {
+    local ($pull, $do_clobber) = @_;
+
+    &start_build;
+
+    print "opening ${logname}\n";
+    open( LOG, ">${logname}" ) || print "can't open $?\n";
+    print LOG "current dir is :$cur_dir\n";
+
+    &print_env;
+    $build_status = 0;
+    if( $pull ){
+	if ( $build_tag eq '' ){
+	    print LOG   "cvs co -D\"$start_time_str\" mozilla/client.mak 2>&1 |\n";
+	    open( PULL, "cvs co -D\"$start_time_str\" mozilla/client.mak 2>&1 |") || print "couldn't execute cvs\n";;
+	} else{
+	    print LOG   "cvs co -r $build_tag mozilla/client.mak 2>&1 |\n";
+	    open( PULL, "cvs co -r $build_tag mozilla/client.mak 2>&1 |") || print "couldn't execute cvs\n";;
+	}
+
+        # tee the output
+        while( <PULL> ){
+            print $_;
+            print LOG $_;
+        }
+        close( PULL );
+     
+        $build_status = $?;
+    }
+
+    chdir("$moz_src/mozilla") || die "couldn't chdir to '$moz_src/mozilla'";
+
+    if( $do_clobber ne '' ){
+        print LOG   "nmake -f client.mak $do_clobber |\n";
+        print "nmake -f client.mak $do_clobber |\n";
+        open( PULL, "nmake -f client.mak $do_clobber 2>&1 |") || print "couldn't execute nmake\n";;
+
+        # tee the output
+        while( <PULL> ){
+            print $_;
+            print LOG $_;
+        }
+        close( PULL );
+    }
+
+
+    if (!$pull) {
+      $client_param = 'build_all';
+    }
+    else {
+      $client_param = 'pull_and_build_all';
+    }
+    if (!$doawt11) {
+      $client_param = 'build_dist';
+    }
+    
+    print LOG "nmake  -f client.mak $client_param 2>&1 |\n";
+    open( BUILD, "nmake -f client.mak $client_param 2>&1 |");
+
+    # tee the output
+    while( <BUILD> ){
+        print $_;
+        print LOG $_;
+    }
+    close( BUILD );
+    $build_status |= $?;
+
+    $build_status_str = ( $build_status ? 'busted' : 'success' );
+
+    print LOG "tinderbox: tree: $build_tree\n";
+    print LOG "tinderbox: builddate: $start_time\n";
+    print LOG "tinderbox: status: $build_status_str\n";
+    print LOG "tinderbox: build: $build_name\n";
+    print LOG "tinderbox: errorparser: windows\n";
+    print LOG "tinderbox: buildfamily: windows\n";
+
+    close( LOG );
+    chdir("$start_dir");
+    system( "$nstools\\bin\\blat ${logname} -t tinderbox-daemon\@warp" );
+}
+
+sub cvs_time {
+    local( $ret_time );
+
+    ($sec,$minute,$hour,$mday,$mon,$year) = localtime( $_[0] );
+    $mon++; # month is 0 based.
+
+    sprintf("%02d/%02d/%02d %02d:%02d:00",
+        $mon,$mday,$year,$hour,$minute );
+}
+
+
+sub start_build {
+    open( LOG, ">>logfile" );
+    print LOG "\n";
+    print LOG "tinderbox: tree: $build_tree\n";
+    print LOG "tinderbox: builddate: $start_time\n";
+    print LOG "tinderbox: status: building\n";
+    print LOG "tinderbox: build: $build_name\n";
+    print LOG "tinderbox: errorparser: windows\n";
+    print LOG "tinderbox: buildfamily: windows\n";
+    print LOG "\n";
+    close( LOG );
+    system("$nstools\\bin\\blat logfile -t tinderbox-daemon\@warp" );
+}
+
+sub parse_args {
+    local($i);
+
+    if( @ARGV == 0 ){
+        &usage;
+    }
+    $i = 0;
+    while( $i < @ARGV ){
+        if( $ARGV[$i] eq '--depend' ){
+            $build_depend = 1;
+        }
+        elsif ( $ARGV[$i] eq '--clobber' ){
+            $build_depend = 0;
+        }
+        elsif ( $ARGV[$i] eq '--continue' ){
+            $build_continue = 1;
+        }
+        elsif ( $ARGV[$i] eq '--noawt11' ){
+            $noawt11 = 1;
+        }
+        elsif ( $ARGV[$i] eq '--no32' ){
+            $no32 = 1;
+        }
+        elsif ( $ARGV[$i] eq '--no16' ){
+            $no16 = 1;
+        }
+        elsif ( $ARGV[$i] eq '--test' ){
+            $build_test = 1;
+        }
+        elsif ( $ARGV[$i] eq '-tag' ){
+            $i++;
+            $build_tag = $ARGV[$i];
+            if( $build_tag eq '' || $build_tag eq '-t'){
+                &usage;
+            }
+		}
+        elsif ( $ARGV[$i] eq '-t' ){
+            $i++;
+            $build_tree = $ARGV[$i];
+            if( $build_tree eq '' ){
+                &usage;
+            }
+        }
+        $i++;
+    }
+    if( $build_tree eq '' ){
+        &usage;
+    }
+}
+
+sub usage {
+    die "usage: buildit.pl [--depend | --clobber] [--no16] [--continue] [--test] [-tag TAGNAME] -t TREENAME\n";
+}
+
+sub setup_env {
+    local($p);
+    $ENV{"MOZ_DEBUG"} = '1';
+    $ENV{"MOZ_GOLD"} = '1';
+    $ENV{"NO_SECURITY"} = '1';
+    $ENV{"MOZ_MEDIUM"} = '1';
+    $ENV{"MOZ_CAFE"} = '1';
+    $ENV{"NSPR20"} = '1';
+    $ENV{"VERBOSE"} = '1';
+    $nstools = $ENV{"MOZ_TOOLS"};
+    if( $nstools eq '' ){
+        die "error: environment variable MOZ_TOOLS not set\n";
+    }
+    $msdev = $ENV{"MOZ_MSDEV"} = 'c:\msdev';
+    if( $msdev eq '' ){
+        die "error: environment variable MOZ_MSDEV not set\n";
+    }
+    $msvc = $ENV{"MOZ_MSVC"} = 'c:\msvc';
+    if( $msvc eq '' ){
+        die "error: environment variable MOZ_VC not set\n";
+    }
+    if ( $build_tag ne '' ) {
+	$ENV{"MOZ_BRANCH"} = $build_tag;
+    }
+    $moz_src = $ENV{"MOZ_SRC"} = $start_dir;
+    $ENV{"MOZ_DATE"} = $start_time_str;
+    $src_16_drive = 'y:';
+}
+
+sub print_env {
+    local( $k, $v);
+    print LOG "\nEnvironment\n";
+    print     "\nEnvironment\n";
+    for $k (sort keys %ENV){
+        $v = $ENV{$k};
+        print LOG "   $k=$v\n";
+        print     "   $k=$v\n";
+    }
+    print LOG "\n";
+    print     "\n";
+    system 'set';
+}
+
+sub strip_config {
+	$save_compname=$ENV{"COMPUTERNAME"};
+	$save_userdomain=$ENV{"USERDOMAIN"};
+	$save_username=$ENV{"USERNAME"};
+	$save_userprofile=$ENV{"USERPROFILE"};
+# most of these deletes have no effect.
+	delete($ENV{"COMPUTERNAME"});
+	delete($ENV{"USERDOMAIN"});
+	delete($ENV{"USERNAME"});
+	delete($ENV{"USERPROFILE"});
+#	delete($ENV{"WATCOM"});
+
+}
+
+sub restore_config {
+	$ENV{"COMPUTERNAME"}=$save_compname;
+	$ENV{"USERDOMAIN"}=$save_userdomain;
+	$ENV{"USERNAME"}=$save_username;
+	$ENV{"MSDevDir"}=$save_userprofile;
+	&print_env;
+}

mozilla/webtools/tinderbox/faq.html

@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.0b2 (WinNT; I) [Netscape]">
+</HEAD>
+<BODY>
+
+<H1>
+FAQ on Tinderbox&nbsp;</H1>
+<B><FONT SIZE=+2>Q. What is Tinderbox.</FONT></B>
+<BR><FONT SIZE=+2>A. Your very own automated build page.&nbsp; It shows you how builds
+are going on various platforms. fs</FONT>
+<BR><FONT SIZE=+2></FONT>
+<BR><B><FONT SIZE=+2>Q. I just checked in some code.&nbsp; How can I tell when
+I'm OK.</FONT></B>
+<BR><FONT SIZE=+2>A. You name will appear in the <I>guilty </I>column.&nbsp;
+When there are successful (<FONT COLOR="#00FF00">green</FONT>) builds in
+all the columns in a row <B>above</B> your name, you know you are ok.</FONT>
+<BR>
+<BR><B><FONT SIZE=+2>Q. The tree is broken, how do I find out what is busted
+(or who busted it).</FONT></B>
+<BR><FONT SIZE=+2>A. Clicking 'L' in the first red box (first build to break)
+above a green will show you a build log for the broken build.&nbsp; You
+can also click 'C' in this box and see what code was checked in.</FONT>
+<BR>
+<BR><B><FONT SIZE=+2>More Questions? Mail me <A HREF="mailto:ltabb@netscape.com">ltabb@netscape.com</A></FONT></B>
+<BR>
+
+</BODY>
+</HTML>

mozilla/webtools/tinderbox/fixupimages.pl

@@ -0,0 +1,217 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use Socket;
+
+require 'globals.pl';
+require 'imagelog.pl';
+
+# Port an old-style imagelog thing to a newstyle one
+
+open( IMAGELOG, "<$data_dir/imagelog.txt" ) || die "can't open file";
+open (OUT, ">$data_dir/newimagelog.txt") || die "can't open output file";
+select(OUT); $| = 1; select(STDOUT);
+
+while( <IMAGELOG> ){
+    chop;
+    ($url,$quote)  = split(/\`/);
+    print "$url\n";
+    $size = &URLsize($url);
+    $width = "";
+    $height = "";
+    if ($size =~ /WIDTH=([0-9]*)/) {
+        $width = $1;
+    }
+    if ($size =~ /HEIGHT=([0-9]*)/) {
+        $height = $1;
+    }
+    if ($width eq "" || $height eq "") {
+        print "Couldn't get image size; skipping.\n";
+    } else {
+        print OUT "$url`$width`$height`$quote\n";
+    }
+}
+
+
+
+
+
+
+sub imgsize {
+    local($file)= @_;
+
+    #first try to open the file
+    if( !open(STREAM, "<$file") ){
+        print "Can't open IMG $file"; 
+        $size="";
+    } else {
+        if ($file =~ /.jpg/i || $file =~ /.jpeg/i) {
+            $size = &jpegsize(STREAM);
+        } elsif($file =~ /.gif/i) {
+            $size = &gifsize(STREAM);
+        } elsif($file =~ /.xbm/i) {
+            $size = &xbmsize(STREAM);
+        } else {
+            return "";
+        }
+        $_ = $size;
+        if(  /\s*width\s*=\s*([0-9]*)\s*/i ){
+            ($newwidth)= /\s*width\s*=\s*(\d*)\s*/i;
+        }
+        if(  /\s*height\s*=\s*([0-9]*)\s*/i ){
+            ($newheight)=/\s*height\s*=\s*(\d*)\s*/i;
+        }
+        close(STREAM);
+    }
+    return $size;
+}
+
+###########################################################################
+# Subroutine gets the size of the specified GIF
+###########################################################################
+sub gifsize {
+    local($GIF) = @_;
+    read($GIF, $type, 6); 
+    if(!($type =~ /GIF8[7,9]a/) || 
+       !(read($GIF, $s, 4) == 4) ){
+        print "Invalid or Corrupted GIF"; 
+        $size="";
+    } else {
+        ($a,$b,$c,$d)=unpack("C"x4,$s);
+        $size=join ("", 'WIDTH=', $b<<8|$a, ' HEIGHT=', $d<<8|$c);
+    }
+    return $size;
+}
+
+sub xbmsize {
+    local($XBM) = @_;
+    local($input)="";
+
+    $input .= <$XBM>;
+    $input .= <$XBM>;
+    $_ = $input;
+    if( /#define\s*\S*\s*\d*\s*\n#define\s*\S*\s*\d*\s*\n/i ){
+       ($a,$b)=/#define\s*\S*\s*(\d*)\s*\n#define\s*\S*\s*(\d*)\s*\n/i;
+       $size=join ("", 'WIDTH=', $a, ' HEIGHT=', $b );
+   } else {
+       print "Hmmm... Doesn't look like an XBM file";
+   }
+    return $size;
+}
+
+# jpegsize : gets the width and height (in pixels) of a jpeg file
+# Andrew Tong, werdna@ugcs.caltech.edu           February 14, 1995
+# modified slightly by alex@ed.ac.uk
+sub jpegsize {
+    local($JPEG) = @_;
+    local($done)=0;
+    $size="";
+
+    read($JPEG, $c1, 1); read($JPEG, $c2, 1);
+    if( !((ord($c1) == 0xFF) && (ord($c2) == 0xD8))){
+        printf "This is not a JPEG! (Codes %02X %02X)\n", ord($c1), ord($c2);
+        $done=1;
+    }
+    while (ord($ch) != 0xDA && !$done) {
+        # Find next marker (JPEG markers begin with 0xFF)
+        # This can hang the program!!
+        while (ord($ch) != 0xFF) {  read($JPEG, $ch, 1); }
+        # JPEG markers can be padded with unlimited 0xFF's
+        while (ord($ch) == 0xFF) { read($JPEG, $ch, 1); }
+        # Now, $ch contains the value of the marker.
+            $marker=ord($ch);
+
+            if (($marker >= 0xC0) && ($marker <= 0xCF) &&
+            ($marker != 0xC4) && ($marker != 0xCC)) {  # it's a SOFn marker
+            read ($JPEG, $junk, 3); read($JPEG, $s, 4);
+            ($a,$b,$c,$d)=unpack("C"x4,$s);
+            $size=join("", 'HEIGHT=',$a<<8|$b,' WIDTH=',$c<<8|$d );
+            $done=1;
+        } else {
+            # We **MUST** skip variables, since FF's within variable 
+            # names are NOT valid JPEG markers
+            read ($JPEG, $s, 2); 
+            ($c1, $c2) = unpack("C"x2,$s); 
+            $length = $c1<<8|$c2;
+            if( ($length < 2) ){
+                print "Erroneous JPEG marker length";
+                $done=1;
+            } else {
+                read($JPEG, $junk, $length-2);
+            }
+        }
+    }
+    return $size;
+}
+
+###########################################################################
+# Subroutine grabs a gif from another server and gets its size
+###########################################################################
+
+
+sub URLsize {
+    my ($fullurl) = @_;
+    my($dummy, $dummy, $serverstring, $url) = split(/\//, $fullurl, 4);
+    my($them,$port) = split(/:/, $serverstring);
+    my $port = 80 unless $port;
+    $them = 'localhost' unless $them;
+    my $size="";
+
+    $_=$url;
+    if( /gif/i || /jpeg/i || /jpg/i || /xbm/i ) {
+        my ($remote, $iaddr, $paddr, $proto, $line);
+        $remote = $them;
+        if ($port =~ /\D/) { $port = getservbyname($port, 'tcp') }
+        die "No port" unless $port;
+        $iaddr   = inet_aton($remote)               || die "no host: $remote";
+        $paddr   = sockaddr_in($port, $iaddr);
+
+        $proto   = getprotobyname('tcp');
+        socket(S, PF_INET, SOCK_STREAM, $proto)  || return "socket: $!";
+        connect(S, $paddr)    || return "connect: $!";
+        select(S); $| = 1; select(STDOUT);
+
+
+
+        print S "GET /$url\n";
+        if ($url =~ /.jpg/i || $url =~ /.jpeg/i) {
+            $size = &jpegsize(S);
+        } elsif($url =~ /.gif/i) {
+            $size = &gifsize(S);
+        } elsif($url =~ /.xbm/i) {
+            $size = &xbmsize(S);
+        } else {
+            return "";
+        }               
+        $_ = $size;
+        if(  /\s*width\s*=\s*([0-9]*)\s*/i ){
+            ($newwidth)= /\s*width\s*=\s*(\d*)\s*/i;
+        }
+        if(  /\s*height\s*=\s*([0-9]*)\s*/i ){
+            ($newheight)=/\s*height\s*=\s*(\d*)\s*/i;
+        }
+    } else {
+        $size="";
+    }
+    return $size;
+}
+
+sub dokill {
+    kill 9,$child if $child;
+}

mozilla/webtools/tinderbox/globals.pl

@@ -0,0 +1,556 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+#
+# Global variabls and functions for tinderbox
+#
+
+#
+# Global variables
+#
+
+$td1 = {};
+$td2 = {};
+
+$build_list = [];           # array of all build records
+$build_name_index = {};
+$ignore_builds = {};
+$build_name_names = [];
+$name_count = 0;
+
+$build_time_index = {};
+$build_time_times = [];
+$time_count = 0;
+$mindate_time_count = 0;  # time_count that corresponds to the mindate
+
+$build_table = [];
+$who_list = [];
+$who_list2 = [];
+@note_array = ();
+
+
+#$body_tag = "<BODY TEXT=#000000 BGCOLOR=#8080C0 LINK=#FFFFFF VLINK=#800080 ALINK=#FFFF00>";
+#$body_tag = "<BODY TEXT=#000000 BGCOLOR=#FFFFC0 LINK=#0000FF VLINK=#800080 ALINK=#FF00FF>";
+if( $ENV{'USERNAME'} eq 'ltabb' ){
+    $gzip = 'gzip';
+}
+else {
+    $gzip = '/usr/local/bin/gzip';
+}
+
+$data_dir='data';
+
+$lock_count = 0;
+
+1;
+
+sub lock{
+    #if( $lock_count == 0 ){
+    #    print "locking $tree/LOCKFILE.lck\n";
+    #    open( LOCKFILE_LOCK, ">$tree/LOCKFILE.lck" );
+    #    flock( LOCKFILE_LOCK, 2 );
+    #}
+    #$lock_count++;
+
+}
+
+sub unlock{
+    #$lock_count--;
+    #if( $lock_count == 0 ){
+    #    flock( LOCKFILE_LOCK, 8 );
+    #    close( LOCKFILE_LOCK );
+    #}
+}
+
+sub print_time {
+  my ($t) = @_;
+  my ($minute,$hour,$mday,$mon);
+  (undef,$minute,$hour,$mday,$mon,undef) = localtime($t);
+  sprintf("%02d/%02d&nbsp;%02d:%02d",$mon+1,$mday,$hour,$minute);
+}
+
+sub url_encode {
+  my ($s) = @_;
+
+  $s =~ s/\%/\%25/g;
+  $s =~ s/\=/\%3d/g;
+  $s =~ s/\?/\%3f/g;
+  $s =~ s/ /\%20/g;
+  $s =~ s/\n/\%0a/g;
+  $s =~ s/\r//g;
+  $s =~ s/\"/\%22/g;
+  $s =~ s/\'/\%27/g;
+  $s =~ s/\|/\%7c/g;
+  $s =~ s/\&/\%26/g;
+  return $s;
+}
+
+sub url_decode {
+  my ($value) = @_;
+  $value =~ tr/+/ /;
+  $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+  return $value;
+}
+
+
+sub value_encode {
+  my ($s) = @_;
+  $s =~ s@&@&amp;@g;
+  $s =~ s@<@&lt;@g;
+  $s =~ s@>@&gt;@g;
+  $s =~ s@\"@&quot;@g;
+  return $s;
+}
+
+
+sub load_data {
+  $tree2 = $form{'tree2'};
+  if( $tree2 ne '' ){
+    require "$tree2/treedata.pl";
+    if( -r "$tree2/ignorebuilds.pl" ){
+      require "$tree2/ignorebuilds.pl";
+    }
+
+    $td2 = {};
+    $td2->{name} = $tree2;
+    $td2->{cvs_module} = $cvs_module;
+    $td2->{cvs_branch} = $cvs_branch;
+    $td2->{num} = 1;
+    $td2->{ignore_builds} = $ignore_builds;
+    if( $cvs_root eq '' ){
+      $cvs_root = '/m/src';
+    }
+    $td2->{cvs_root} = $cvs_root;
+    
+    $tree = $form{'tree'};
+    require "$tree/treedata.pl";
+    if( $cvs_root eq '' ){
+      $cvs_root = '/m/src';
+    }
+  }
+
+  $tree = $form{'tree'};
+
+  return unless $tree;
+  #die "the 'tree' parameter must be provided\n" unless $tree;
+  
+  if ( -r "$tree/treedata.pl" ) {
+    require "$tree/treedata.pl";
+  }
+
+  $ignore_builds = {};
+  if( -r "$tree/ignorebuilds.pl" ){
+    require "$tree/ignorebuilds.pl";
+  }
+        
+  $td1 = {};
+  $td1->{name} = $tree;
+  $td1->{num} = 0;
+  $td1->{cvs_module} = $cvs_module;
+  $td1->{cvs_branch} = $cvs_branch;
+  $td1->{ignore_builds} = $ignore_builds;
+  if( $cvs_root eq '' ){
+    $cvs_root = '/m/src';
+  }
+  $td1->{cvs_root} = $cvs_root;
+
+  &lock;
+  &load_buildlog;
+  &unlock;
+  
+  &get_build_name_index;
+  &get_build_time_index;
+  
+  &load_who($who_list, $td1);
+  if( $tree2 ne '' ){
+    &load_who($who_list2, $td2);
+  }
+
+  &make_build_table;
+}
+
+sub load_buildlog {
+  my $mailtime, $buildtime, $buildname, $errorparser;
+  my $buildstatus, $logfile,$binaryname;
+  my $buildrec, @treelist, $t;
+
+  if (not defined $maxdate) {
+    $maxdate = time();
+  }
+  if (not defined $mindate) {
+    $mindate = $maxdate - 24*60*60;
+  }
+  
+  if ($tree2 ne '') { 
+    @treelist = ($td1, $td2);
+  }
+  else {
+    @treelist = ($td1);
+  }
+  
+  for $t (@treelist) {
+    use Backwards;
+    my ($bw) = Backwards->new("$t->{name}/build.dat") or die;
+
+    my $tooearly = 0;
+    while( $_ = $bw->readline ) {
+      chomp;
+      ($mailtime, $buildtime, $buildname,
+       $errorparser, $buildstatus, $logfile, $binaryname) = split /\|/;
+
+      # Ignore stuff in the future.
+      next if $buildtime > $maxdate;
+
+      # Ignore stuff in the past (but get a 2 hours of extra data)
+      if ($buildtime < $mindate - 2*60*60) {
+        # Occasionally, a build might show up with a bogus time.  So,
+        # we won't judge ourselves as having hit the end until we
+        # hit a full 20 lines in a row that are too early.
+        last if $tooearly++ > 20;
+
+        next;
+      }
+      $tooearly = 0;
+      $buildrec = {    
+         mailtime    => $mailtime,
+         buildtime   => $buildtime,
+         buildname   => ($tree2 ne '' ? $t->{name} . ' ' : '' ) . $buildname,
+         errorparser => $errorparser,
+         buildstatus => $buildstatus,
+         logfile     => $logfile,
+         binaryname  => $binaryname,
+         td          => $t
+      };
+      if ($form{noignore} or not $t->{ignore_builds}->{$buildname}) {
+        push @{$build_list}, $buildrec;
+      }
+    }
+  }
+}
+
+sub loadquickparseinfo {
+  my ($tree, $build, $times) = (@_);
+
+  do "$tree/ignorebuilds.pl";
+    
+  use Backwards;
+
+  my ($bw) = Backwards->new("$form{tree}/build.dat") or die;
+    
+  my $latest_time = 0;
+  my $tooearly = 0;
+  while( $_ = $bw->readline ) {
+    chop;
+    my ($buildtime, $buildname, $buildstatus) = (split /\|/)[1,2,4];
+    
+    if ($buildstatus =~ /^success|busted|testfailed$/) {
+
+      # Ignore stuff in the future.
+      next if $buildtime > $maxdate;
+
+      $latest_time = $buildtime if $buildtime > $latest_time;
+
+      # Ignore stuff more than 12 hours old
+      if ($buildtime < $latest_time - 12*60*60) {
+        # Hack: A build may give a bogus time. To compensate, we will
+        # not stop until we hit 20 consecutive lines that are too early.
+
+        last if $tooearly++ > 20;
+        next;
+      }
+      $tooearly = 0;
+
+      next if exists $ignore_builds->{$buildname};
+      next if exists $build->{$buildname}
+              and $times->{$buildname} >= $buildtime;
+      
+      $build->{$buildname} = $buildstatus;
+      $times->{$buildname} = $buildtime;
+    }
+  }
+}
+
+sub load_who {
+  my ($who_list, $td) = @_;
+  my $d, $w, $i, $bfound;
+  
+  open(WHOLOG, "<$td->{name}/who.dat");
+  while (<WHOLOG>) {
+    $i = $time_count;
+    chop;
+    ($d,$w) = split /\|/;
+    $bfound = 0;
+    while ($i > 0 and not $bfound) {
+      if ($d <= $build_time_times->[$i]) {
+        $who_list->[$i+1]->{$w} = 1;
+        $bfound = 1;
+      }
+      else {
+        $i--;
+      }
+    }
+  }
+
+  # Ignore the last one
+  #
+  if ($time_count > 0) {
+    $who_list->[$time_count] = {};
+  }
+}
+    
+sub get_build_name_index {
+  my $i,$br;
+
+  # Get all the unique build names.
+  #
+  foreach $br (@{$build_list}) {
+    $build_name_index->{$br->{buildname}} = 1;
+  }
+    
+  $i = 1;
+  foreach $n (sort keys (%{$build_name_index})) {
+    $build_name_names->[$i] = $n;
+    $i++;
+  }
+
+  $name_count = @{$build_name_names}-1;
+
+  # Update the map so it points to the right index
+  #
+  for ($i=1; $i < $name_count+1; $i++) {
+    $build_name_index->{$build_name_names->[$i]} = $i;
+  }
+}
+
+sub get_build_time_index {
+  my $i,$br;
+
+  # Get all the unique build names.
+  #
+  foreach $br (@{$build_list}) {
+    $build_time_index->{$br->{buildtime}} = 1;
+  }
+
+  $i = 1;
+  foreach $n (sort {$b <=> $a} keys (%{$build_time_index})) {
+    $build_time_times->[$i] = $n;
+    $mindate_time_count = $i if $n >= $mindate;
+    $i++;
+  }
+
+  $time_count = @{$build_time_times}-1;
+
+  # Update the map so it points to the right index
+  #
+  for ($i=1; $i < $time_count+1; $i++) {
+    $build_time_index->{$build_time_times->[$i]} = $i;
+  }
+  
+  #for $i (@{$build_time_times}) {
+  #    print $i . "\n";
+  #}
+  
+  #while( ($k,$v) = each(%{$build_time_index})) {
+  #    print "$k=$v\n";
+  #}
+}
+
+sub make_build_table {
+  my $i,$ti,$bi,$ti1,$br;
+
+  # Create the build table
+  #
+  for ($i=1; $i <= $time_count; $i++){
+    $build_table->[$i] = [];
+  }
+
+  # Populate the build table with build data
+  #
+  foreach $br (reverse @{$build_list}) {
+    $ti = $build_time_index->{$br->{buildtime}};
+    $bi = $build_name_index->{$br->{buildname}};
+    $build_table->[$ti][$bi] = $br;
+  }
+
+  &load_notes;
+
+  for ($bi = $name_count; $bi > 0; $bi--) {
+    for ($ti = $time_count; $ti > 0; $ti--) {
+      if (defined($br = $build_table->[$ti][$bi])
+          and not defined($br->{rowspan})) {
+
+        # If the cell immediately after us is defined, then we 
+        #  can have a previousbuildtime.
+        if (defined($br1 = $build_table->[$ti+1][$bi])) {
+          $br->{previousbuildtime} = $br1->{buildtime};
+        }
+                                
+        $ti1 = $ti-1;
+        while ($ti1 > 0 and not defined($build_table->[$ti1][$bi])) {
+          $build_table->[$ti1][$bi] = -1;
+          $ti1--;
+        }
+        $br->{rowspan} = $ti - $ti1;
+        if ($br->{rowspan} != 1) {
+          $build_table->[$ti1+1][$bi] = $br;
+          $build_table->[$ti][$bi] = -1;
+        }
+      }
+    }
+  }
+}
+
+sub load_notes {
+  if ($tree2 ne '') { 
+    @treelist = ($td1, $td2);
+  }
+  else {
+    @treelist = ($td1);
+  }
+
+  foreach $t (@treelist) {
+    open(NOTES,"<$t->{name}/notes.txt") 
+      or print "<h2>warning: Couldn't open $t->{name}/notes.txt </h2>\n";
+    while (<NOTES>) {
+      chop;
+      ($nbuildtime,$nbuildname,$nwho,$nnow,$nenc_note) = split /\|/;
+      $nbuildname = "$t->{name} $nbuildname" if $tree2 ne '';
+      $ti = $build_time_index->{$nbuildtime};
+      $bi = $build_name_index->{$nbuildname};
+      #print "[ti = $ti][bi=$bi][buildname='$nbuildname' $_<br>";
+      if ($ti != 0 and $bi != 0) {
+        $build_table->[$ti][$bi]->{hasnote} = 1;
+        if (not defined($build_table->[$ti][$bi]->{noteid})) {
+          $build_table->[$ti][$bi]->{noteid} = (0+@note_array);
+        }
+        $noteid = $build_table->[$ti][$bi]->{noteid};
+        $now_str = &print_time($nnow);
+        $note = &url_decode($nenc_note);
+        $note_array[$noteid] = "<pre>\n[<b><a href=mailto:$nwho>"
+             ."$nwho</a> - $now_str</b>]\n$note\n</pre>"
+             .$note_array[$noteid];
+      }
+    }
+    close(NOTES);
+  }
+}
+
+sub last_success_time {
+  my ($row) = @_;
+
+  for (my $tt=1; $tt <= $time_count; $tt++) {
+    my $br = $build_table->[$tt][$row];
+    next unless defined $br;
+    next unless $br->{buildstatus} eq 'success';
+    return $build_time_times->[$tt + $br->{rowspan} ];
+  }
+  return 0;
+}
+
+sub last_status {
+  my ($row) = @_;
+
+  for (my $tt=1; $tt <= $time_count; $tt++) {
+    my $br = $build_table->[$tt][$row];
+    next unless defined $br;
+    next unless $br->{buildstatus} =~ /^(success|busted|testfailed)$/;
+    return $br->{buildstatus};
+  }
+  return 'building';
+}
+
+sub check_password {
+  if ($form{password} eq '') {
+    if (defined $cookie_jar{tinderbox_password}) {
+      $form{password} = $cookie_jar{tinderbox_password};
+    }
+  }
+  my $correct = '';
+    if (open(REAL, '<data/passwd')) {
+      $correct = <REAL>;
+      close REAL;
+      $correct =~ s/\s+$//;   # Strip trailing whitespace.
+    }
+  $form{password} =~ s/\s+$//;      # Strip trailing whitespace.
+  if ($form{password} ne '') {
+    open(TRAPDOOR, "../bonsai/data/trapdoor $form{'password'} |") 
+      or die "Can't run trapdoor func!";
+    my $encoded = <TRAPDOOR>;
+    close TRAPDOOR;
+    $encoded =~ s/\s+$//;   # Strip trailing whitespace.
+    if ($encoded eq $correct) {
+      if ($form{rememberpassword} ne '') {
+        print "Set-Cookie: tinderbox_password=$form{'password'} ;"
+             ." path=/ ; expires = Sun, 1-Mar-2020 00:00:00 GMT\n";
+      }
+      return;
+    }
+  }
+
+  require 'header.pl';
+
+  print "Content-type: text/html\n";
+  print "Set-Cookie: tinderbox_password= ; path=/ ; "
+       ." expires = Sun, 1-Mar-2020 00:00:00 GMT\n";
+  print "\n";
+
+  EmitHtmlHeader("What's the magic word?",
+                 "You need to know the magic word to use this page.");
+
+  if ($form{password} ne '') {
+    print "<B>Invalid password; try again.<BR></B>";
+  }
+  print q(
+    <FORM method=post>
+    <B>Password:</B>
+    <INPUT NAME=password TYPE=password><BR>
+    <INPUT NAME=rememberpassword TYPE=checkbox>
+    If correct, remember password as a cookie<BR>
+  );
+    
+  while (my ($key,$value) = each %form) {
+    next if $key eq "password" or $key eq "rememberpassword";
+
+    my $enc = value_encode($value);
+    print "<INPUT TYPE=HIDDEN NAME=$key VALUE='$enc'>\n";
+  }
+  print "<INPUT TYPE=SUBMIT value=Submit></FORM>\n";
+  exit;
+}
+
+sub find_build_record {
+  my ($tree, $logfile) = @_;
+
+  my $log_entry = `grep $logfile $tree/build.dat`;
+
+  chomp($log_entry);
+  my ($mailtime, $buildtime, $buildname, $errorparser,
+      $buildstatus, $logfile, $binaryname) = split /\|/, $log_entry;
+
+  $buildrec = {    
+    mailtime    => $mailtime,
+    buildtime   => $buildtime,
+    buildname   => $buildname,
+    errorparser => $errorparser,
+    buildstatus => $buildstatus,
+    logfile     => $logfile,
+    binaryname  => $binaryname,
+    td          => undef
+  };
+  return $buildrec;
+}

mozilla/webtools/tinderbox/handlemail.pl

@@ -0,0 +1,49 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+# Figure out which directory tinderbox is in by looking at argv[0].  Unless
+# there is a command line argument; if there is, just use that.
+
+$tinderboxdir = $0;
+$tinderboxdir =~ s:/[^/]*$::;      # Remove last word, and slash before it.
+if ($tinderboxdir eq "") {
+    $tinderboxdir = ".";
+}
+
+if (@ARGV > 0) {
+    $tinderboxdir = $ARGV[0];
+}
+
+print "tinderbox = $tinderboxdir\n"; 
+
+chdir $tinderboxdir || die "Couldn't chdir to $tinderboxdir"; 
+
+
+open(DF, ">data/tbx.$$") || die "could not open data/tbx.$$";
+while(<STDIN>){
+    print DF $_;
+}
+close(DF);
+
+$err = system("./processbuild.pl data/tbx.$$");
+
+if( $err ) {
+    die "processbuild.pl returned an error\n";
+}
+

mozilla/webtools/tinderbox/imagelog.pl

@@ -0,0 +1,43 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+1;
+
+sub add_imagelog {
+    local($url,$quote,$width,$height) = @_;
+    open( IMAGELOG, ">>$data_dir/imagelog.txt" ) || die "Oops; can't open imagelog.txt";
+    print IMAGELOG "$url`$width`$height`$quote\n";
+    close( IMAGELOG );
+}
+
+sub get_image{
+    local(@log,@ret,$i);
+
+    open( IMAGELOG, "<$data_dir/imagelog.txt" );
+    @log = <IMAGELOG>;
+
+    # return a random line
+    srand;
+    @ret = split(/\`/,$log[rand @log]);
+
+    close( IMAGELOG );
+    @ret;
+}
+
+

mozilla/webtools/tinderbox/index.html

@@ -0,0 +1,12 @@
+<TITLE>tinderbox</TITLE>
+<META HTTP-EQUIV="Refresh" CONTENT="1; URL=showbuilds.cgi">
+<BODY   BGCOLOR="#FFFFFF" TEXT="#000000"
+        LINK="#0000EE" VLINK="#551A8B" ALINK="#FF0000">
+<CENTER>
+<TABLE BORDER=0 WIDTH="100%" HEIGHT="100%"><TR><TD ALIGN=CENTER VALIGN=CENTER>
+<FONT SIZE="+2">
+You're looking for 
+<A HREF="showbuilds.cgi">showbuilds.cgi</A>.
+</FONT>
+</TD></TR></TABLE>
+</CENTER>

mozilla/webtools/tinderbox/processbuild.pl

@@ -0,0 +1,241 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+require 'globals.pl';
+require 'timelocal.pl';
+
+umask 0;
+
+#$logfile = '';
+
+%MAIL_HEADER = ();
+$DONE = 0;
+$building = 0;
+$endsection = 0;
+
+open( LOG, "<$ARGV[0]") || die "cant open $!";
+&parse_mail_header;
+while ($DONE == 0) {
+    %tbx = ();
+    &get_variables;
+
+    # run thru if EOF and we haven't hit our section end marker
+ 
+    if ( !$DONE || !$endsection) {
+        &check_required_vars;
+        $tree = $tbx{'tree'} if (!defined($tree));
+        $logfile = "$builddate.$$.gz" if (!defined($logfile));
+	$building++ if ($tbx{'status'} =~ m/building/);
+        &lock;
+        &write_build_data;
+        &unlock;
+    }
+}
+close(LOG);
+
+&compress_log_file;
+&unlink_log_file;
+
+system "./buildwho.pl $tree";
+
+# Build static pages for Sidebar flash and tinderbox panels.
+$ENV{QUERY_STRING}="tree=$tree&static=1";
+system './showbuilds.cgi';
+
+# end of main
+######################################################################
+
+
+# This routine will scan through log looking for 'tinderbox:' variables
+#
+sub  get_variables{
+
+    #while( ($k,$v) = each( %MAIL_HEADER ) ){
+    #    print "$k='$v'\n";
+    #}
+
+    &parse_log_variables;
+
+    #while( ($k,$v) = each( %tbx ) ){
+    #    print "$k='$v'\n";
+    #}
+}
+
+
+sub parse_log_variables {
+    my ($line, $stop);
+    $stop = 0;
+    while($stop == 0){
+        $line = <LOG>;
+        $DONE++, return if !defined($line);
+        chomp($line);
+        if( $line =~ /^tinderbox\:/ ){
+            if( $line =~ /^tinderbox\:[ \t]*([^:]*)\:[ \t]*([^\n]*)/ ){
+                $tbx{$1} = $2;
+            } elsif ( $line =~ /^tinderbox: END/ ) {
+                $stop++, $endsection++;
+            }
+        }
+    }
+}
+
+sub parse_mail_header {
+    my $line;
+    my $name = '';
+    while($line = <LOG> ){
+        chomp($line);
+
+        if( $line eq '' ){
+            return;
+        }
+
+        if( $line =~ /([^ :]*)\:[ \t]+([^\n]*)/ ){
+            $name = $1;
+            $name =~ tr/A-Z/a-z/;
+            $MAIL_HEADER{$name} = $2;
+            #print "$name $2\n";
+        }
+        elsif( $name ne '' ){
+            $MAIL_HEADER{$name} .= $2;
+        }
+    }
+
+}
+
+sub check_required_vars {
+    $err_string = '';
+    if( $tbx{'tree'} eq ''){
+        $err_string .= "Variable 'tinderbox:tree' not set.\n";
+    }
+    elsif( ! -r $tbx{'tree'} ){
+        $err_string .= "Variable 'tinderbox:tree' not set to a valid tree.\n";
+    }
+    elsif(($MAIL_HEADER{'to'} =~ /external/i ||
+           $MAIL_HEADER{'cc'} =~ /external/i) &&
+          $tbx{'tree'} !~ /external/i) {
+        $err_string .= "Data from an external source didn't specify an 'external' tree.";
+    }
+    if( $tbx{'build'} eq ''){
+        $err_string .= "Variable 'tinderbox:build' not set.\n";
+    }
+    if( $tbx{'errorparser'} eq ''){
+        $err_string .= "Variable 'tinderbox:errorparser' not set.\n";
+    }
+
+    #
+    # Grab the date in the form of mm/dd/yy hh:mm:ss
+    #
+    # Or a GMT unix date
+    #
+    if( $tbx{'builddate'} eq ''){
+        $err_string .= "Variable 'tinderbox:builddate' not set.\n";
+    }
+    else {
+        if( $tbx{'builddate'} =~ 
+            /([0-9]*)\/([0-9]*)\/([0-9]*)[ \t]*([0-9]*)\:([0-9]*)\:([0-9]*)/ ){
+            
+            $builddate = timelocal($6,$5,$4,$2,$1-1,$3);
+                        
+        }
+        elsif( $tbx{'builddate'} > 7000000 ){
+            $builddate = $tbx{'builddate'};
+        }
+        else {
+            $err_string .= "Variable 'tinderbox:builddate' not of the form MM/DD/YY HH:MM:SS or unix date\n";
+        }
+
+    }
+
+    #
+    # Build Status
+    #
+    if( $tbx{'status'} eq ''){
+        $err_string .= "Variable 'tinderbox:status' not set.\n";
+    }
+    elsif( ! $tbx{'status'} =~ /success|busted|building|testfailed/ ){
+        $err_string .= "Variable 'tinderbox:status' must be 'success', 'busted', 'testfailed', or 'building'\n";
+    }
+
+    #
+    # Report errors
+    #
+    if( $err_string ne ''  ){
+        die $err_string;
+    }
+}
+
+sub write_build_data {
+    $t = time;
+    open( BUILDDATA, ">>$tbx{'tree'}/build.dat" )|| die "can't open $! for writing";
+    print BUILDDATA "$t|$builddate|$tbx{'build'}|$tbx{'errorparser'}|$tbx{'status'}|$logfile|$tbx{binaryname}\n";
+    close( BUILDDATA );
+}
+
+sub compress_log_file {
+    local( $done, $line);
+
+    return if ( $building );
+
+    open( LOG2, "<$ARGV[0]") || die "cant open $!";
+
+    #
+    # Skip past the the RFC822.HEADER
+    #
+    $done = 0;
+    while( !$done && ($line = <LOG2>) ){
+        chomp($line);
+        $done = ($line eq '');
+    }
+
+    open( ZIPLOG, "| $gzip -c > ${tree}/$logfile" ) || die "can't open $! for writing";
+    $inBinary = 0;
+    $hasBinary = ($tbx{'binaryname'} ne '');
+    while( $line = <LOG2> ){
+        if( !$inBinary ){
+            print ZIPLOG $line;
+            if( $hasBinary ){
+                $inBinary = ($line =~ /^begin [0-7][0-7][0-7] /);
+            }
+        }
+        else {
+            if( $line =~ /^end\n/ ){
+                $inBinary = 0;
+            }
+        }
+    }
+    close( ZIPLOG );
+    close( LOG2 );
+
+    #
+    # If a uuencoded binary is part of the build, unpack it.
+    #
+    if( $hasBinary ){
+        $bin_dir = "$tbx{'tree'}/bin/$builddate/$tbx{'build'}";
+        $bin_dir =~ s/ //g;
+
+        system("mkdir -m 0777 -p $bin_dir");
+
+        # LTNOTE: I'm not sure this is cross platform.
+        system("/tools/ns/bin/uudecode --output-file=$bin_dir/$tbx{binaryname} < $ARGV[0]");
+    }
+}
+        
+sub unlink_log_file {
+    unlink( $ARGV[0] );
+}