From 2554fc90e55c7d55f5f9e6025c52441bd4d7cec5 Mon Sep 17 00:00:00 2001 From: Manoj Gowda Date: Tue, 25 Aug 2026 16:04:55 +0530 Subject: [PATCH 1/2] Add BSD-3-Clause Cryptogams license Add new license bsd-3-clause-cryptogams, requested in issue #5253. The license text now detects as bsd-3-clause-cryptogams with score 100; it previously matched a spurious combination of unrelated licenses. Reference: https://github.com/aboutcode-org/scancode-toolkit/issues/5253 Signed-off-by: Manoj Gowda --- .../licenses/bsd-3-clause-cryptogams.LICENSE | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src/licensedcode/data/licenses/bsd-3-clause-cryptogams.LICENSE diff --git a/src/licensedcode/data/licenses/bsd-3-clause-cryptogams.LICENSE b/src/licensedcode/data/licenses/bsd-3-clause-cryptogams.LICENSE new file mode 100644 index 0000000000..71e9ebdb25 --- /dev/null +++ b/src/licensedcode/data/licenses/bsd-3-clause-cryptogams.LICENSE @@ -0,0 +1,60 @@ +--- +key: bsd-3-clause-cryptogams +short_name: BSD-3-Clause Cryptogams +name: BSD-3-Clause Cryptogams License +category: Permissive +owner: CRYPTOGAMS +homepage_url: https://openssl-library.org/cryptogams/ +notes: a BSD-3-Clause variant used by the CRYPTOGAMS cryptographic assembly modules, with an + alternative clause allowing distribution under the GPL instead. +spdx_license_key: LicenseRef-scancode-bsd-3-clause-cryptogams +text_urls: + - https://raw.githubusercontent.com/dot-asm/cryptogams/master/LICENSE +other_urls: + - https://github.com/dot-asm/cryptogams +ignorable_copyrights: + - Copyright (c) 2006, CRYPTOGAMS +ignorable_holders: + - CRYPTOGAMS +ignorable_authors: + - +ignorable_emails: + - appro@openssl.org +--- + +Copyright (c) 2006, CRYPTOGAMS by +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + * Redistributions of source code must retain copyright notices, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials + provided with the distribution. + + * Neither the name of the CRYPTOGAMS nor the names of its + copyright holder and contributors may be used to endorse or + promote products derived from this software without specific + prior written permission. + +ALTERNATIVELY, provided that this notice is retained in full, this +product may be distributed under the terms of the GNU General Public +License (GPL), in which case the provisions of the GPL apply INSTEAD OF +those given above. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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. \ No newline at end of file From 7a548ebaab0935dd2e4cec449b45c930ee5b8096 Mon Sep 17 00:00:00 2001 From: Manoj Gowda Date: Wed, 26 Aug 2026 13:00:14 +0530 Subject: [PATCH 2/2] Update external datadriven expectations for bsd-3-clause-cryptogams The CRYPTOGAMS fossology test files now detect as the new dedicated bsd-3-clause-cryptogams license instead of the bsd-new OR gpl-1.0-plus approximation. Adding the new license text to the index also perturbs two unrelated detections (manual-bsdstyle gains a bsd-source-code match; the bilingual MulanPSL-1.0.t1 file now matches three mulanpsl-1.0-en regions instead of one mulanpsl-1.0) - regenerated with SCANCODE_REGEN_TEST_FIXTURES and flagged in the PR for review. Signed-off-by: Manoj Gowda --- .../datadriven/external/fossology-licenses/cryptogams.txt.yml | 2 +- .../external/fossology-tests/BSD/manual-bsdstyle.yml | 1 + .../external/fossology-tests/Dual-license/CRYPTOGAMS.txt.yml | 2 +- .../data/datadriven/external/glc/MulanPSL-1.0.t1.yml | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/licensedcode/data/datadriven/external/fossology-licenses/cryptogams.txt.yml b/tests/licensedcode/data/datadriven/external/fossology-licenses/cryptogams.txt.yml index 108dd4ba72..a63e12c5cc 100644 --- a/tests/licensedcode/data/datadriven/external/fossology-licenses/cryptogams.txt.yml +++ b/tests/licensedcode/data/datadriven/external/fossology-licenses/cryptogams.txt.yml @@ -1,3 +1,3 @@ license_expressions: - - bsd-new OR gpl-1.0-plus + - bsd-3-clause-cryptogams notes: this is a license from fossology license reference Cryptogams (Cryptogams) http://www.openssl.org/~appro/cryptogams/ diff --git a/tests/licensedcode/data/datadriven/external/fossology-tests/BSD/manual-bsdstyle.yml b/tests/licensedcode/data/datadriven/external/fossology-tests/BSD/manual-bsdstyle.yml index ad81ebd7e9..a3cf4bb415 100644 --- a/tests/licensedcode/data/datadriven/external/fossology-tests/BSD/manual-bsdstyle.yml +++ b/tests/licensedcode/data/datadriven/external/fossology-tests/BSD/manual-bsdstyle.yml @@ -1,2 +1,3 @@ license_expressions: + - bsd-source-code - bzip2-libbzip-2010 diff --git a/tests/licensedcode/data/datadriven/external/fossology-tests/Dual-license/CRYPTOGAMS.txt.yml b/tests/licensedcode/data/datadriven/external/fossology-tests/Dual-license/CRYPTOGAMS.txt.yml index 3dc234ee52..31d30e8e2d 100644 --- a/tests/licensedcode/data/datadriven/external/fossology-tests/Dual-license/CRYPTOGAMS.txt.yml +++ b/tests/licensedcode/data/datadriven/external/fossology-tests/Dual-license/CRYPTOGAMS.txt.yml @@ -1,2 +1,2 @@ license_expressions: - - bsd-new OR gpl-1.0-plus + - bsd-3-clause-cryptogams diff --git a/tests/licensedcode/data/datadriven/external/glc/MulanPSL-1.0.t1.yml b/tests/licensedcode/data/datadriven/external/glc/MulanPSL-1.0.t1.yml index 513503bfd1..0ac9858f38 100644 --- a/tests/licensedcode/data/datadriven/external/glc/MulanPSL-1.0.t1.yml +++ b/tests/licensedcode/data/datadriven/external/glc/MulanPSL-1.0.t1.yml @@ -1,5 +1,7 @@ license_expressions: - - mulanpsl-1.0 + - mulanpsl-1.0-en + - mulanpsl-1.0-en + - mulanpsl-1.0-en notes: | License test derived from a file of the BSD-licensed repository at: https://raw.githubusercontent.com/google/licensecheck/v0.3.1/testdata/MulanPSL-1.0.t1