This commit was manufactured by cvs2svn to create branch 'SSU_PERSONAL_M13'.

git-svn-id: svn://10.0.0.236/branches/SSU_PERSONAL_M13@54297 18797224-902f-48f8-a5cc-f745e15eee43
1999-11-23 20:00:21 +00:00
5 changed files with 98 additions and 4739 deletions
--- a/mozilla/security/nss/lib/softoken/sdb.c
+++ b/mozilla/security/nss/lib/softoken/sdb.c
--- a/mozilla/security/nss/lib/softoken/sftkdb.c
+++ b/mozilla/security/nss/lib/softoken/sftkdb.c
--- a/mozilla/security/nss/lib/softoken/sftkdbti.h
+++ b/mozilla/security/nss/lib/softoken/sftkdbti.h
@@ -1,88 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape security libraries.
- *
- * The Initial Developer of the Original Code is
- * Red Hat Inc.
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef SFTKDBTI_H
-#define SFTKDBTI_H 1
-
-/*
- * private defines
- */
-struct SFTKDBHandleStr {
-    SDB   *db;
-    PRInt32 ref;
-    CK_OBJECT_HANDLE  type;
-    SECItem passwordKey;
-    SECItem *newKey;
-    PZLock *passwordLock;
-    SFTKDBHandle *peerDB;
-    SDB   *update;
-};
-
-#define SFTK_KEYDB_TYPE 0x40000000
-#define SFTK_CERTDB_TYPE 0x00000000
-#define SFTK_OBJ_TYPE_MASK 0xc0000000
-#define SFTK_OBJ_ID_MASK (~SFTK_OBJ_TYPE_MASK)
-#define SFTK_TOKEN_TYPE 0x80000000
-
-/* the following is the number of id's to handle on the stack at a time,
- * it's not an upper limit of IDS that can be stored in the database */
-#define SFTK_MAX_IDS 10
-
-#define SFTK_GET_SDB(handle) \
-	((handle)->update ? (handle)->update : (handle)->db)
-
-SECStatus sftkdb_DecryptAttribute(SECItem *passKey, SECItem *cipherText,
-			SECItem **plainText);
-SECStatus sftkdb_EncryptAttribute(PLArenaPool *arena, SECItem *passKey,
-			SECItem *plainText, SECItem **cipherText);
-SECStatus sftkdb_SignAttribute(PLArenaPool *arena, SECItem *passKey,
-			CK_OBJECT_HANDLE objectID,
-			CK_ATTRIBUTE_TYPE attrType,
-			SECItem *plainText, SECItem **sigText);
-SECStatus sftkdb_VerifyAttribute(SECItem *passKey,
-			CK_OBJECT_HANDLE objectID,
-			CK_ATTRIBUTE_TYPE attrType,
-			SECItem *plainText, SECItem *sigText);
-
-void sftk_ULong2SDBULong(unsigned char *data, CK_ULONG value);
-CK_RV sftkdb_Update(SFTKDBHandle *handle, SECItem *key);
-CK_RV sftkdb_PutAttributeSignature(SFTKDBHandle *handle, 
-		SDB *keyTarget, CK_OBJECT_HANDLE objectID, 
-		CK_ATTRIBUTE_TYPE type, SECItem *signText);
-
-
-
-#endif
--- a/mozilla/security/nss/lib/softoken/sftkpwd.c
+++ b/mozilla/security/nss/lib/softoken/sftkpwd.c
--- a/mozilla/xpinstall/wizard/windows/setup/update.html
+++ b/mozilla/xpinstall/wizard/windows/setup/update.html
@@ -0,0 +1,98 @@
+<html>
+<head>
+   <title>Commercial build update</title>
+</head>
+<body>
+<script>
+
+var xpi = new Object();
+var numxpi = 0;
+var numstatus = 0;
+
+function showprops(obj) {
+  var props = "";
+  for (i in obj) {
+     props += i+":"+obj[i]+"\n  ";
+  }
+  alert(props);
+}
+
+function statusCallback(url,status) {
+    for (i in xpi) {
+        if ( url.indexOf(xpi[i]) != -1 ) {
+            xpi[i] = status;
+            numstatus++;
+            break;
+        }
+    }
+
+    // if we've gotten all results then display them
+    if (numstatus == numxpi)
+    {
+        var text;
+        var restart = false;
+        dlg = window.open("","resultWindow");
+        dlg.document.write("<head><title>XPInstall Results</title></head>");
+        dlg.document.write("<body><h1>XPInstall Results</h1>");
+        for (i in xpi)
+        {
+            text = "    "+i+": ";
+            switch (status) {
+              case 999:
+                 restart = true;     // fall-through
+              case 0:
+                 text += "Successful";
+                 break;
+              default:
+                 text += "Error encountered -- "+status;
+                 break;
+            }
+            text += "<br>";
+            dlg.document.write(text);
+        }
+        if (restart) {
+            dlg.document.write("<p>Some files were in use, you must restart to complete the installation");
+        }
+
+        dlg.document.write("</body>");
+        dlg.document.close();
+    }
+}
+
+function launch() {
+    for (var i = 0; i < document.installForm.elements.length; i++)
+    {
+       e = document.installForm.elements[i];
+       if (e.type.match(/checkbox/i) && e.checked )
+       {
+         xpi[e.value] = "xpi/"+e.name+".xpi";
+         numxpi++;
+       }
+    }
+
+    // showprops(xpi);
+    InstallTrigger.install(xpi,statusCallback);
+}
+</script>
+
+
+<h2>Commercial Build update</h2>
+
+
+Select the parts of Seamonkey you wish to update and press the Launch button. 
+<p>
+Update all of the pieces you use at once; mismatched versions
+will cause you grief.
+
+<form name="installForm">
+<input type="checkbox" name="core"         value="Navigator" checked> Navigator   <br>
+<input type="checkbox" name="security"     value="SSL/HTTP"  checked> SSL/HTTP    <br>
+<input type="checkbox" name="mail"         value="Mail"      checked> Mail        <br>
+<input type="checkbox" name="aim"          value="Instant Messenger" checked> Instant Messenger <br>
+<input type="checkbox" name="fullcircle"   value="FullCircle"> FullCircle          <br>
+<input type="checkbox" name="spellchecker" value="Spelling Checker"> Spelling Checker <br>
+<input type="checkbox" name="psm"          value="Cartman"> Cartman             <br>
+<input type="button" value="Launch XPInstall" onclick="launch()">
+</form>
+</body>
+</html>