Mercurial > illumos > illumos-gate

changeset 3433:2971a4d3cf72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6509342 Code licenses for KMF need to be cleaned up.
author haimay
date Wed, 17 Jan 2007 14:35:03 -0800
parents 222a221acf16
children 5142e1d7d0bc
files usr/src/lib/libkmf/ber_der/common/clasn1.c usr/src/lib/libkmf/ber_der/common/decode.c usr/src/lib/libkmf/ber_der/common/encode.c usr/src/lib/libkmf/ber_der/common/io.c usr/src/lib/libkmf/ber_der/inc/ber_der.h usr/src/lib/libkmf/ber_der/inc/kmfber_int.h usr/src/lib/libkmf/cdsa_license.txt usr/src/lib/libkmf/include/algorithm.h usr/src/lib/libkmf/include/kmftypes.h usr/src/lib/libkmf/include/oidsalg.h usr/src/lib/libkmf/include/pem_encode.h usr/src/lib/libkmf/include/rdn_parser.h usr/src/lib/libkmf/libkmf/common/algoid.c usr/src/lib/libkmf/libkmf/common/algorithm.c usr/src/lib/libkmf/libkmf/common/certgetsetop.c usr/src/lib/libkmf/libkmf/common/certop.c usr/src/lib/libkmf/libkmf/common/csrcrlop.c usr/src/lib/libkmf/libkmf/common/keyop.c usr/src/lib/libkmf/libkmf/common/kmfoids.c usr/src/lib/libkmf/libkmf/common/pem_encode.c usr/src/lib/libkmf/libkmf/common/pk11keys.c usr/src/lib/libkmf/libkmf/common/rdn_parser.c usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c
diffstat 23 files changed, 165 insertions(+), 426 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/libkmf/ber_der/common/clasn1.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/ber_der/common/clasn1.c	Wed Jan 17 14:35:03 2007 -0800
@@ -1,32 +1,9 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- *
- *
- * File: CLASN1.C
- *
+ */
+/*
  * Copyright (c) 1995-1999 Intel Corporation. All rights reserved.
- *
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
--- a/usr/src/lib/libkmf/ber_der/common/decode.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/ber_der/common/decode.c	Wed Jan 17 14:35:03 2007 -0800
@@ -1,25 +1,5 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 /*
--- a/usr/src/lib/libkmf/ber_der/common/encode.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/ber_der/common/encode.c	Wed Jan 17 14:35:03 2007 -0800
@@ -1,24 +1,3 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
 /*
  * -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
@@ -51,7 +30,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
--- a/usr/src/lib/libkmf/ber_der/common/io.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/ber_der/common/io.c	Wed Jan 17 14:35:03 2007 -0800
@@ -1,24 +1,3 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
 /*
  * -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
@@ -50,7 +29,7 @@
  * is provided ``as is'' without express or implied warranty.
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
--- a/usr/src/lib/libkmf/ber_der/inc/ber_der.h	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/ber_der/inc/ber_der.h	Wed Jan 17 14:35:03 2007 -0800
@@ -1,43 +1,29 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
- * File: BER_DER.H
+ * Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
  *
- * Copyright (c) 1995-2000 Intel Corporation. All rights reserved.
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0(the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http:/ /www.mozilla.org/NPL/
  *
- * Portions:
- * (C) COPYRIGHT International Business Machines Corp. 1996, 1997
- * All Rights Reserved
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
  *
- * US Government Users Restricted Rights - Use, duplication or
- * disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright(C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 /*
  * This is the header file for some Basic Encoding Rules and Distinguished
  * Encoding Rules (BER/DER) routines.
--- a/usr/src/lib/libkmf/ber_der/inc/kmfber_int.h	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/ber_der/inc/kmfber_int.h	Wed Jan 17 14:35:03 2007 -0800
@@ -1,23 +1,3 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
 /*
  * -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
@@ -49,7 +29,7 @@
  * is provided ``as is'' without express or implied warranty.
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libkmf/cdsa_license.txt	Wed Jan 17 14:35:03 2007 -0800
@@ -0,0 +1,57 @@
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. By
+downloading, copying, installing or using the software you agree to
+this license. If you do not agree to this license, do not download,
+install, copy or use the software.
+
+     Intel Open Source License for CDSA/CSSM Implementation
+                (BSD License with Export Notice)
+
+Copyright (c) 1996-2001 Intel Corporation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
++ Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
++ Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in
+  the documentation and/or other materials provided with the
+  distribution.
+
++ Neither the name of the Intel Corporation nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+EXPORT LAWS: THIS LICENSE ADDS NO RESTRICTIONS TO THE EXPORT LAWS
+OF YOUR JURISDICTION. It is licensee's responsibility to comply with
+any export regulations applicable in licensee's jurisdiction.
+This software is subject to the U.S. Export Administration Regulations
+and other U.S. law, and may not be exported or re-exported to certain
+countries (currently Afghanistan (Taliban-controlled areas), Cuba, Iran,
+Iraq, Libya, North Korea, Serbia (except Kosovo), Sudan and Syria)
+or to persons or entities prohibited from receiving U.S. exports
+(including Denied Parties, Specially Designated Nationals, and
+entities on the Bureau of Export Administration Entity List or involved
+with missile technology or nuclear, chemical or biological weapons).
+
+_____________________________________________________________________
+Copyright (c) 1996-2001 Intel Corporation. All rights reserved.
+* Other brands and names are the property of their respective owners.
--- a/usr/src/lib/libkmf/include/algorithm.h	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/include/algorithm.h	Wed Jan 17 14:35:03 2007 -0800
@@ -1,30 +1,8 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- *
- *
- * File: ALGORITHM.H
- *
  * Copyright (c) 1995-2000 Intel Corporation. All rights reserved.
  */
 
--- a/usr/src/lib/libkmf/include/kmftypes.h	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/include/kmftypes.h	Wed Jan 17 14:35:03 2007 -0800
@@ -1,28 +1,7 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
+ * Copyright (c) 1995-2000 Intel Corporation. All rights reserved.
  */
 /*
- * File: kmftypes.h
- *
- * Copyright (c) 1995-2000 Intel Corporation. All rights reserved.
- *
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
--- a/usr/src/lib/libkmf/include/oidsalg.h	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/include/oidsalg.h	Wed Jan 17 14:35:03 2007 -0800
@@ -1,29 +1,8 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- *
- * File: oidsalg.h
- *
+ */
+/*
  * Copyright (c) 1995-2000 Intel Corporation. All rights reserved.
  *
  */
--- a/usr/src/lib/libkmf/include/pem_encode.h	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/include/pem_encode.h	Wed Jan 17 14:35:03 2007 -0800
@@ -1,25 +1,5 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
--- a/usr/src/lib/libkmf/include/rdn_parser.h	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/include/rdn_parser.h	Wed Jan 17 14:35:03 2007 -0800
@@ -1,25 +1,5 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
--- a/usr/src/lib/libkmf/libkmf/common/algoid.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/libkmf/common/algoid.c	Wed Jan 17 14:35:03 2007 -0800
@@ -1,32 +1,9 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- * ----------------------------------------------------------------------
- * File: algoid.c
- *
  * Copyright (c) 1995-2000 Intel Corporation. All rights reserved.
- * ----------------------------------------------------------------------
- *
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- *
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
--- a/usr/src/lib/libkmf/libkmf/common/algorithm.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/libkmf/common/algorithm.c	Wed Jan 17 14:35:03 2007 -0800
@@ -1,28 +1,8 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- * File: algorithm.c
- *
  * Copyright (c) 1995-2000 Intel Corporation. All rights reserved.
- *
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -33,7 +13,7 @@
 
 typedef struct _pkcs_key_type_map
 {
-	KMF_ALGORITHM_INDEX CssmAlgorithmId;
+	KMF_ALGORITHM_INDEX kmfAlgorithmId;
 	CK_KEY_TYPE ckKeyType;
 }
 PKCS_KEY_TYPE_MAP;
@@ -121,10 +101,10 @@
 #define	PKCS_ALGORITHM_NOT_FOUND    ((uint32_t)(~0))
 
 /*
- * Name: PKCSConv_GetMechanism
+ * Name: PKCS_GetAlgorithmMap
  *
  * Description:
- *  Searches the _PKCS2KMFMap table for a matching set of CSSM alg.
+ *  Searches the _PKCS2KMFMap table for a matching set of alg.
  *  description parameters.
  *
  * Parameters:
@@ -162,7 +142,7 @@
 		sizeof (PKCS_KEY_TYPE_MAP);
 
 	for (uIndex = 0; uIndex < uMapSize; uIndex++) {
-		if (_PKCS2KMFKeyTypeMap[uIndex].CssmAlgorithmId == AlgId) {
+		if (_PKCS2KMFKeyTypeMap[uIndex].kmfAlgorithmId == AlgId) {
 			*pckKeyType = _PKCS2KMFKeyTypeMap[uIndex].ckKeyType;
 			return (1);
 		}
--- a/usr/src/lib/libkmf/libkmf/common/certgetsetop.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/libkmf/common/certgetsetop.c	Wed Jan 17 14:35:03 2007 -0800
@@ -19,10 +19,8 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- *
- * Copyright(c) 1995-2000 Intel Corporation. All rights reserved.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
--- a/usr/src/lib/libkmf/libkmf/common/certop.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/libkmf/common/certop.c	Wed Jan 17 14:35:03 2007 -0800
@@ -21,8 +21,6 @@
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- *
- * Copyright(c) 1995-2000 Intel Corporation. All rights reserved.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
--- a/usr/src/lib/libkmf/libkmf/common/csrcrlop.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/libkmf/common/csrcrlop.c	Wed Jan 17 14:35:03 2007 -0800
@@ -19,10 +19,8 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- *
- * Copyright(c) 1995-2000 Intel Corporation. All rights reserved.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
--- a/usr/src/lib/libkmf/libkmf/common/keyop.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/libkmf/common/keyop.c	Wed Jan 17 14:35:03 2007 -0800
@@ -19,10 +19,8 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- *
- * Copyright(c) 1995-2000 Intel Corporation. All rights reserved.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
--- a/usr/src/lib/libkmf/libkmf/common/kmfoids.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/libkmf/common/kmfoids.c	Wed Jan 17 14:35:03 2007 -0800
@@ -1,27 +1,8 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- *
  * Copyright(c) 1995-2000 Intel Corporation. All rights reserved.
  */
 
--- a/usr/src/lib/libkmf/libkmf/common/pem_encode.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/libkmf/common/pem_encode.c	Wed Jan 17 14:35:03 2007 -0800
@@ -1,25 +1,5 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
--- a/usr/src/lib/libkmf/libkmf/common/pk11keys.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/libkmf/common/pk11keys.c	Wed Jan 17 14:35:03 2007 -0800
@@ -1,31 +1,9 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- *
- * File: KEYS.C
- *
  * Copyright (c) 1995-2000 Intel Corporation. All rights reserved.
- *
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
--- a/usr/src/lib/libkmf/libkmf/common/rdn_parser.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/libkmf/common/rdn_parser.c	Wed Jan 17 14:35:03 2007 -0800
@@ -1,23 +1,3 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
 /*
  * The contents of this file are subject to the Mozilla Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -51,7 +31,7 @@
  * GPL.
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  * File: rdn_parser.c
--- a/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c	Wed Jan 17 13:28:22 2007 -0800
+++ b/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c	Wed Jan 17 14:35:03 2007 -0800
@@ -1,28 +1,65 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- * OpenSSL keystore wrapper
- *
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2000.
+ */
+/*
+ * ====================================================================
+ * Copyright (c) 2000-2004 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"