Fix copyright headers, mac build.

4 files changed, 63 insertions, 15 deletions

diff --git a/security/nss/lib/rdb/manifest.mn b/security/nss/lib/rdb/manifest.mn
index f1c8c03c4..2a0ed102e 100644
--- a/security/nss/lib/rdb/manifest.mn
+++ b/security/nss/lib/rdb/manifest.mn
@@ -12,11 +12,11 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Original Code is the Netscape security libraries.
+# The Original Code is Red Hat, Inc.
 #
 # The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# Red Hat, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2005
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
@@ -36,8 +36,6 @@
 # ***** END LICENSE BLOCK *****
 CORE_DEPTH = ../../..
 
-# DEFINES = -DTRACE
-
 MODULE = rdb
 MAPFILE = $(OBJDIR)/rdb.def
 
@@ -46,11 +44,6 @@ CSRCS = \
 	$(NULL)
 
 
-REQUIRES = dbm nss sqlite
-
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
+REQUIRES = dbm nss sqlite nspr
 
 LIBRARY_NAME = rdb
-#LIBRARY_VERSION = 3
diff --git a/security/nss/lib/rdb/rdb.c b/security/nss/lib/rdb/rdb.c
index 114c55f47..3d31ef8e4 100644
--- a/security/nss/lib/rdb/rdb.c
+++ b/security/nss/lib/rdb/rdb.c
@@ -1,10 +1,61 @@
+/* ***** 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 Red Hat, Inc.
+ *
+ * The Initial Developer of the Original Code is
+ * Red Hat, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Robert Relyea (rrelyea@redhat.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 /*
- * the following data structures are from rdb.h.
+ * This file implements PKCS 11 on top of our existing security modules
+ *
+ * For more information about PKCS 11 See PKCS 11 Token Inteface Standard.
+ *   This implementation has two slots:
+ *	slot 1 is our generic crypto support. It does not require login.
+ *   It supports Public Key ops, and all they bulk ciphers and hashes. 
+ *   It can also support Private Key ops for imported Private keys. It does 
+ *   not have any token storage.
+ *	slot 2 is our private key support. It requires a login before use. It
+ *   can store Private Keys and Certs as token objects. Currently only private
+ *   keys and their associated Certificates are saved on the token.
+ *
+ *   In this implementation, session objects are only visible to the session
+ *   that created or generated them.
  */
 #include "sqlite3.h"
 #include "mcom_db.h"
 #include "errno.h"
+#ifndef DARWIN
 #include "malloc.h"
+#endif
 #include "stdlib.h"
 #include "string.h"
 #include "sys/stat.h"
@@ -16,6 +67,9 @@
 #include "unistd.h"
 #endif
 
+/*
+ * the following data structures should be moved to a 'rdb.h'.
+ */
 #define STATIC_CMD_SIZE 2048
 struct RDBStr {
     DB  db;
diff --git a/security/nss/lib/rdb/rdb.def b/security/nss/lib/rdb/rdb.def
index 5496c7c2a..79b805ad2 100644
--- a/security/nss/lib/rdb/rdb.def
+++ b/security/nss/lib/rdb/rdb.def
@@ -12,11 +12,11 @@
 ;+# for the specific language governing rights and limitations under the
 ;+# License.
 ;+#
-;+# The Original Code is the Netscape security libraries.
+;+# The Original Code is Red Hat, Inc.
 ;+#
 ;+# The Initial Developer of the Original Code is
-;+# Netscape Communications Corporation.
-;+# Portions created by the Initial Developer are Copyright (C) 2000
+;+# Red Hat, Inc.
+;+# Portions created by the Initial Developer are Copyright (C) 2005
 ;+# the Initial Developer. All Rights Reserved.
 ;+#
 ;+# Contributor(s):
diff --git a/security/nss/lib/rdb/rdb.rc b/security/nss/lib/rdb/rdb.rc
index 5dc6ca62a..7c595e433 100644
--- a/security/nss/lib/rdb/rdb.rc
+++ b/security/nss/lib/rdb/rdb.rc
@@ -19,6 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Robert Relyea (rrelyea@redhat.com)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or