Use __FBSDID().

11 files changed, 37 insertions, 16 deletions

diff --git a/sys/opencrypto/cast.c b/sys/opencrypto/cast.c
index 6e0af0e..d1129a4 100644
--- a/sys/opencrypto/cast.c
+++ b/sys/opencrypto/cast.c
@@ -1,6 +1,4 @@
-/*	$FreeBSD$	*/
 /*      $OpenBSD: cast.c,v 1.2 2000/06/06 06:49:47 deraadt Exp $       */
-
 /*
  *	CAST-128 in C
  *	Written by Steve Reid <sreid@sea-to-sky.net>
@@ -8,6 +6,9 @@
  *	Released 1997.10.11
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <opencrypto/cast.h>
 #include <opencrypto/castsb.h>
diff --git a/sys/opencrypto/criov.c b/sys/opencrypto/criov.c
index f8799f9..4831fac 100644
--- a/sys/opencrypto/criov.c
+++ b/sys/opencrypto/criov.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*      $OpenBSD: criov.c,v 1.9 2002/01/29 15:48:29 jason Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/opencrypto/crmbuf.c b/sys/opencrypto/crmbuf.c
index a57322b..ca80c11 100644
--- a/sys/opencrypto/crmbuf.c
+++ b/sys/opencrypto/crmbuf.c
@@ -28,10 +28,11 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_param.h"
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c
index e559912..d44820a 100644
--- a/sys/opencrypto/crypto.c
+++ b/sys/opencrypto/crypto.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: crypto.c,v 1.38 2002/06/11 11:14:29 beck Exp $	*/
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -20,6 +19,10 @@
  * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
  * PURPOSE.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define	CRYPTO_TIMING				/* enable timing support */
 
 #include <sys/param.h>
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
index e9a1129..e711125 100644
--- a/sys/opencrypto/cryptodev.c
+++ b/sys/opencrypto/cryptodev.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $	*/
 
 /*
@@ -30,9 +29,11 @@
  * Effort sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c
index 09c429b..5093753 100644
--- a/sys/opencrypto/cryptosoft.c
+++ b/sys/opencrypto/cryptosoft.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $	*/
 
 /*
@@ -22,6 +21,9 @@
  * PURPOSE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/opencrypto/deflate.c b/sys/opencrypto/deflate.c
index af13ee6..6ffc7a7 100644
--- a/sys/opencrypto/deflate.c
+++ b/sys/opencrypto/deflate.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /* $OpenBSD: deflate.c,v 1.3 2001/08/20 02:45:22 hugh Exp $ */
 
 /*
@@ -33,6 +32,9 @@
  * functions using the zlib library (see net/zlib.{c,h})
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/param.h>
diff --git a/sys/opencrypto/rijndael.c b/sys/opencrypto/rijndael.c
index 5d346d5..a0081ca 100644
--- a/sys/opencrypto/rijndael.c
+++ b/sys/opencrypto/rijndael.c
@@ -1,6 +1,4 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: rijndael.c,v 1.12 2002/07/10 17:53:54 deraadt Exp $ */
-
 /**
  * rijndael-alg-fst.c
  *
@@ -27,6 +25,9 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/opencrypto/rmd160.c b/sys/opencrypto/rmd160.c
index 39268e2..3a05588 100644
--- a/sys/opencrypto/rmd160.c
+++ b/sys/opencrypto/rmd160.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: rmd160.c,v 1.3 2001/09/26 21:40:13 markus Exp $	*/
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -23,11 +22,16 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /*
  * Preneel, Bosselaers, Dobbertin, "The Cryptographic Hash Function RIPEMD-160",
  * RSA Laboratories, CryptoBytes, Volume 3, Number 2, Autumn 1997,
  * ftp://ftp.rsasecurity.com/pub/cryptobytes/crypto3n2.pdf
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
diff --git a/sys/opencrypto/skipjack.c b/sys/opencrypto/skipjack.c
index 8ba0a42..7fb59f2 100644
--- a/sys/opencrypto/skipjack.c
+++ b/sys/opencrypto/skipjack.c
@@ -1,6 +1,4 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: skipjack.c,v 1.3 2001/05/05 00:31:34 angelos Exp $	*/
-
 /* 
  * Further optimized test implementation of SKIPJACK algorithm 
  * Mark Tillotson <markt@chaos.org.uk>, 25 June 98

@@ -14,6 +12,9 @@
  * 29 May 1998
 */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 
 #include <opencrypto/skipjack.h>
@@ -62,6 +63,7 @@ static const u_int8_t ftable[0x100] =
  * the tables are hopefully pointed to by register allocated variables
  * k0, k1..k9
  */
+
 void
 subkey_table_gen (u_int8_t *key, u_int8_t **key_tables)
 {
diff --git a/sys/opencrypto/xform.c b/sys/opencrypto/xform.c
index f3bac85..e63659c 100644
--- a/sys/opencrypto/xform.c
+++ b/sys/opencrypto/xform.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: xform.c,v 1.16 2001/08/28 12:20:43 ben Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -37,6 +36,9 @@
  * PURPOSE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>