From e11cf14dc2a3a1f1f10e2d646b5b9a8b9bb8ce24 Mon Sep 17 00:00:00 2001
From: pfg <pfg@FreeBSD.org>
Date: Wed, 13 Dec 2017 16:30:39 +0000
Subject: [PATCH] SPDX: some uses of the RSA-MD license.

---
 lib/libmd/md4.h           | 5 ++++-
 lib/libmd/md4c.c          | 5 ++++-
 lib/libmd/md5c.c          | 4 +++-
 lib/libmd/mdXhl.c         | 4 +++-
 lib/libmd/shadriver.c     | 5 ++++-
 lib/libmd/skeindriver.c   | 5 ++++-
 sys/fs/ext2fs/ext2_hash.c | 2 +-
 sys/kern/md4c.c           | 2 ++
 sys/sys/md4.h             | 2 ++
 sys/sys/md5.h             | 2 ++
 10 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/lib/libmd/md4.h b/lib/libmd/md4.h
index b6e6ebab7e95..c05c690f80e1 100644
--- a/lib/libmd/md4.h
+++ b/lib/libmd/md4.h
@@ -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
diff --git a/lib/libmd/md4c.c b/lib/libmd/md4c.c
index de1a7b4acb9c..a30027b1fb45 100644
--- a/lib/libmd/md4c.c
+++ b/lib/libmd/md4c.c
@@ -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
diff --git a/lib/libmd/md5c.c b/lib/libmd/md5c.c
index 75b1e5eb1e8c..a2c71b6a6960 100644
--- a/lib/libmd/md5c.c
+++ b/lib/libmd/md5c.c
@@ -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
diff --git a/lib/libmd/mdXhl.c b/lib/libmd/mdXhl.c
index 397c85bd5e2d..40be65f52d3c 100644
--- a/lib/libmd/mdXhl.c
+++ b/lib/libmd/mdXhl.c
@@ -1,4 +1,6 @@
-/* mdXhl.c
+/*- mdXhl.c
+ * SPDX-License-Identifier: Beerware
+ *
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
  * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
diff --git a/lib/libmd/shadriver.c b/lib/libmd/shadriver.c
index b643f964802a..a0472f016364 100644
--- a/lib/libmd/shadriver.c
+++ b/lib/libmd/shadriver.c
@@ -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
diff --git a/lib/libmd/skeindriver.c b/lib/libmd/skeindriver.c
index 5960457e4082..ee70ef7cd7dc 100644
--- a/lib/libmd/skeindriver.c
+++ b/lib/libmd/skeindriver.c
@@ -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
diff --git a/sys/fs/ext2fs/ext2_hash.c b/sys/fs/ext2fs/ext2_hash.c
index dfaf2472d1ce..33e84a2292dd 100644
--- a/sys/fs/ext2fs/ext2_hash.c
+++ b/sys/fs/ext2fs/ext2_hash.c
@@ -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@freebsd.org>
  * Copyright (c) 2012, Vyacheslav Matyushin
diff --git a/sys/kern/md4c.c b/sys/kern/md4c.c
index dcfbe20bac35..68d19485b433 100644
--- a/sys/kern/md4c.c
+++ b/sys/kern/md4c.c
@@ -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
diff --git a/sys/sys/md4.h b/sys/sys/md4.h
index bae52a3b02c5..78873d9f7e8e 100644
--- a/sys/sys/md4.h
+++ b/sys/sys/md4.h
@@ -3,6 +3,8 @@
  */
 
 /*-
+   SPDX-License-Identifier: RSA-MD
+
    Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
    rights reserved.
 
diff --git a/sys/sys/md5.h b/sys/sys/md5.h
index 4b59842ca96a..f5ddd9c48cd1 100644
--- a/sys/sys/md5.h
+++ b/sys/sys/md5.h
@@ -3,6 +3,8 @@
  */
 
 /*-
+ SPDX-License-Identifier: RSA-MD
+
  Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
 rights reserved.