svn commit: r326828 - in head: lib/libmd sys/fs/ext2fs sys/kern sys/sys

[Pedro F. Giffuni]

Author: pfg
Date: Wed Dec 13 16:30:39 2017
New Revision: 326828
URL: https://svnweb.freebsd.org/changeset/base/326828

Log:
  SPDX: some uses of the RSA-MD license.

Modified:
  head/lib/libmd/md4.h
  head/lib/libmd/md4c.c
  head/lib/libmd/md5c.c
  head/lib/libmd/mdXhl.c
  head/lib/libmd/shadriver.c
  head/lib/libmd/skeindriver.c
  head/sys/fs/ext2fs/ext2_hash.c
  head/sys/kern/md4c.c
  head/sys/sys/md4.h
  head/sys/sys/md5.h

Modified: head/lib/libmd/md4.h
==============================================================================
--- head/lib/libmd/md4.h	Wed Dec 13 16:22:02 2017	(r326827)
+++ head/lib/libmd/md4.h	Wed Dec 13 16:30:39 2017	(r326828)
@@ -2,7 +2,10 @@
  * $FreeBSD$
  */
 
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+/*-
+   SPDX-License-Identifier: RSA-MD
+
+   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
    rights reserved.
 
    License to copy and use this software is granted provided that it

Modified: head/lib/libmd/md4c.c
==============================================================================
--- head/lib/libmd/md4c.c	Wed Dec 13 16:22:02 2017	(r326827)
+++ head/lib/libmd/md4c.c	Wed Dec 13 16:30:39 2017	(r326828)
@@ -4,7 +4,10 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-/* Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.
+/*-
+   SPDX-License-Identifier: RSA-MD
+
+   Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.
 
    License to copy and use this software is granted provided that it
    is identified as the "RSA Data Security, Inc. MD4 Message-Digest

Modified: head/lib/libmd/md5c.c
==============================================================================
--- head/lib/libmd/md5c.c	Wed Dec 13 16:22:02 2017	(r326827)
+++ head/lib/libmd/md5c.c	Wed Dec 13 16:30:39 2017	(r326828)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: RSA-MD
+ *
  * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
  *
  * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All

Modified: head/lib/libmd/mdXhl.c
==============================================================================
--- head/lib/libmd/mdXhl.c	Wed Dec 13 16:22:02 2017	(r326827)
+++ head/lib/libmd/mdXhl.c	Wed Dec 13 16:30:39 2017	(r326828)
@@ -1,4 +1,6 @@
-/* mdXhl.c
+/*- mdXhl.c
+ * SPDX-License-Identifier: Beerware
+ *
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
  * <phk at FreeBSD.org> wrote this file.  As long as you retain this notice you

Modified: head/lib/libmd/shadriver.c
==============================================================================
--- head/lib/libmd/shadriver.c	Wed Dec 13 16:22:02 2017	(r326827)
+++ head/lib/libmd/shadriver.c	Wed Dec 13 16:30:39 2017	(r326828)
@@ -1,6 +1,9 @@
 /* SHADRIVER.C - test driver for SHA-1 (and SHA-2) */
 
-/* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All rights
+/*-
+ * SPDX-License-Identifier: RSA-MD
+ *
+ * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All rights
  * reserved.
  * 
  * RSA Data Security, Inc. makes no representations concerning either the

Modified: head/lib/libmd/skeindriver.c
==============================================================================
--- head/lib/libmd/skeindriver.c	Wed Dec 13 16:22:02 2017	(r326827)
+++ head/lib/libmd/skeindriver.c	Wed Dec 13 16:30:39 2017	(r326828)
@@ -1,6 +1,9 @@
 /* SKEINDRIVER.C - test driver for SKEIN */
 
-/* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All rights
+/*-
+ * SPDX-License-Identifier: RSA-MD
+ *
+ * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All rights
  * reserved.
  * 
  * RSA Data Security, Inc. makes no representations concerning either the

Modified: head/sys/fs/ext2fs/ext2_hash.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_hash.c	Wed Dec 13 16:22:02 2017	(r326827)
+++ head/sys/fs/ext2fs/ext2_hash.c	Wed Dec 13 16:30:39 2017	(r326828)
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND RSA-MD)
  *
  * Copyright (c) 2010, 2013 Zheng Liu <lz at freebsd.org>
  * Copyright (c) 2012, Vyacheslav Matyushin

Modified: head/sys/kern/md4c.c
==============================================================================
--- head/sys/kern/md4c.c	Wed Dec 13 16:22:02 2017	(r326827)
+++ head/sys/kern/md4c.c	Wed Dec 13 16:30:39 2017	(r326828)
@@ -2,6 +2,8 @@
  */
 
 /*-
+   SPDX-License-Identifier: RSA-MD
+
    Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.
 
    License to copy and use this software is granted provided that it

Modified: head/sys/sys/md4.h
==============================================================================
--- head/sys/sys/md4.h	Wed Dec 13 16:22:02 2017	(r326827)
+++ head/sys/sys/md4.h	Wed Dec 13 16:30:39 2017	(r326828)
@@ -3,6 +3,8 @@
  */
 
 /*-
+   SPDX-License-Identifier: RSA-MD
+
    Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
    rights reserved.
 

Modified: head/sys/sys/md5.h
==============================================================================
--- head/sys/sys/md5.h	Wed Dec 13 16:22:02 2017	(r326827)
+++ head/sys/sys/md5.h	Wed Dec 13 16:30:39 2017	(r326828)
@@ -3,6 +3,8 @@
  */
 
 /*-
+ SPDX-License-Identifier: RSA-MD
+
  Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
 rights reserved.