From 4807c0badb130ae70cf6f0887b4be1648f217f1a Mon Sep 17 00:00:00 2001 From: Tom Caputi Date: Tue, 12 Sep 2017 16:15:11 -0400 Subject: Encryption patch follow-up * PBKDF2 implementation changed to OpenSSL implementation. * HKDF implementation moved to its own file and tests added to ensure correctness. * Removed libzfs's now unnecessary dependency on libzpool and libicp. * Ztest can now create and test encrypted datasets. This is currently disabled until issue #6526 is resolved, but otherwise functions as advertised. * Several small bug fixes discovered after enabling ztest to run on encrypted datasets. * Fixed coverity defects added by the encryption patch. * Updated man pages for encrypted send / receive behavior. * Fixed a bug where encrypted datasets could receive DRR_WRITE_EMBEDDED records. * Minor code cleanups / consolidation. Signed-off-by: Tom Caputi --- COPYRIGHT | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'COPYRIGHT') diff --git a/COPYRIGHT b/COPYRIGHT index 6d01ffaa7..9b94f927f 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -23,7 +23,17 @@ approved for release under LLNL-CODE-403049. Unless otherwise noted, all files in this distribution are released under the Common Development and Distribution License (CDDL). -Exceptions are noted within the associated source files. See the file -OPENSOLARIS.LICENSE for more information. +Exceptions are noted within the associated source files. A few notable +exceptions and their respective licenses include: + +Skein Checksum Implementation: module/icp/algs/skein/THIRDPARTYLICENSE +AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman +AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl +PBKDF2 Implementation: lib/libzfs/THIRDPARTYLICENSE.openssl + +This product includes software developed by the OpenSSL Project for use +in the OpenSSL Toolkit (http://www.openssl.org/) + +See the file OPENSOLARIS.LICENSE for more information. Refer to the git commit log for authoritative copyright attribution. -- cgit v1.2.3