From owner-svn-src-all@freebsd.org Wed Dec 13 16:30:42 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A6F7EA3241; Wed, 13 Dec 2017 16:30:42 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA227778C1; Wed, 13 Dec 2017 16:30:41 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBDGUepw055427; Wed, 13 Dec 2017 16:30:40 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBDGUeoK055417; Wed, 13 Dec 2017 16:30:40 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201712131630.vBDGUeoK055417@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Wed, 13 Dec 2017 16:30:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326828 - in head: lib/libmd sys/fs/ext2fs sys/kern sys/sys X-SVN-Group: head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: in head: lib/libmd sys/fs/ext2fs sys/kern sys/sys X-SVN-Commit-Revision: 326828 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Dec 2017 16:30:42 -0000 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 __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): * 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 * 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.