5082781 copyright cleanup, round one

6295369 some (more) files were over- or under-CDDL'd
6298350 some files need copyright/SCCS keywords cleanup
6307123 prototype files need to have CDDL "Version 1.0 only" license text removed

4 files changed, 21 insertions, 103 deletions

diff --git a/usr/src/lib/crypt_modules/bsdbf/arc4random.c b/usr/src/lib/crypt_modules/bsdbf/arc4random.c
index 77f45a3f70..c9cc3cb239 100644
--- a/usr/src/lib/crypt_modules/bsdbf/arc4random.c
+++ b/usr/src/lib/crypt_modules/bsdbf/arc4random.c
@@ -1,24 +1,10 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (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 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 /*	$OpenBSD: arc4random.c,v 1.6 2001/06/05 05:05:38 pvalchev Exp $	*/
 
 /*
@@ -31,12 +17,6 @@
  */
 
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
  * This code is derived from section 17.1 of Applied Cryptography,
  * second edition, which describes a stream cipher allegedly
  * compatible with RSA Labs "RC4" cipher (the actual description of
diff --git a/usr/src/lib/crypt_modules/bsdbf/bcrypt.c b/usr/src/lib/crypt_modules/bsdbf/bcrypt.c
index b5df2c3f09..4daa30f52e 100644
--- a/usr/src/lib/crypt_modules/bsdbf/bcrypt.c
+++ b/usr/src/lib/crypt_modules/bsdbf/bcrypt.c
@@ -1,24 +1,10 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (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 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 /*	$OpenBSD: bcrypt.c,v 1.16 2002/02/19 19:39:36 millert Exp $	*/
 
 /*
@@ -51,12 +37,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /* This password hashing algorithm was designed by David Mazieres
  * <dm@lcs.mit.edu> and works as follows:
  *
diff --git a/usr/src/lib/crypt_modules/bsdbf/blf.h b/usr/src/lib/crypt_modules/bsdbf/blf.h
index e80db738a7..1b85ee2d87 100644
--- a/usr/src/lib/crypt_modules/bsdbf/blf.h
+++ b/usr/src/lib/crypt_modules/bsdbf/blf.h
@@ -1,24 +1,3 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (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
- */
 /* $OpenBSD: blf.h,v 1.6 2002/02/16 21:27:17 millert Exp $ */
 /*
  * Blowfish - a fast block cipher designed by Bruce Schneier
diff --git a/usr/src/lib/crypt_modules/bsdbf/blowfish.c b/usr/src/lib/crypt_modules/bsdbf/blowfish.c
index eb8f1c529b..460da7ac2a 100644
--- a/usr/src/lib/crypt_modules/bsdbf/blowfish.c
+++ b/usr/src/lib/crypt_modules/bsdbf/blowfish.c
@@ -1,24 +1,16 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (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 2002 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * The above Sun copyright is included due to changes made to this code
+ * for US export control.  No changes to the algorithm implementations have
+ * been made.
  */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 /* $OpenBSD: blowfish.c,v 1.16 2002/02/19 19:39:36 millert Exp $ */
 /*
  * Blowfish block cipher for OpenBSD
@@ -54,19 +46,6 @@
  */
 
 /*
- * Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*
- * The above Sun copyright is included due to changes made to this code
- * for US export control.  No changes to the algorithm implementations have
- * been made.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
  * This code is derived from section 14.3 and the given source
  * in section V of Applied Cryptography, second edition.
  * Blowfish is an unpatented fast block cipher designed by