mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 18:40:43 +03:00
OpenZFS 4185 - add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R
Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Approved by: Garrett D'Amore <garrett@damore.org> Ported by: Tony Hutter <hutter2@llnl.gov> OpenZFS-issue: https://www.illumos.org/issues/4185 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/45818ee Porting Notes: This code is ported on top of the Illumos Crypto Framework code: https://github.com/zfsonlinux/zfs/pull/4329/commits/b5e030c8dbb9cd393d313571dee4756fbba8c22d The list of porting changes includes: - Copied module/icp/include/sha2/sha2.h directly from illumos - Removed from module/icp/algs/sha2/sha2.c: #pragma inline(SHA256Init, SHA384Init, SHA512Init) - Added 'ctx' to lib/libzfs/libzfs_sendrecv.c:zio_checksum_SHA256() since it now takes in an extra parameter. - Added CTASSERT() to assert.h from for module/zfs/edonr_zfs.c - Added skein & edonr to libicp/Makefile.am - Added sha512.S. It was generated from sha512-x86_64.pl in Illumos. - Updated ztest.c with new fletcher_4_*() args; used NULL for new CTX argument. - In icp/algs/edonr/edonr_byteorder.h, Removed the #if defined(__linux) section to not #include the non-existant endian.h. - In skein_test.c, renane NULL to 0 in "no test vector" array entries to get around a compiler warning. - Fixup test files: - Rename <sys/varargs.h> -> <varargs.h>, <strings.h> -> <string.h>, - Remove <note.h> and define NOTE() as NOP. - Define u_longlong_t - Rename "#!/usr/bin/ksh" -> "#!/bin/ksh -p" - Rename NULL to 0 in "no test vector" array entries to get around a compiler warning. - Remove "for isa in $($ISAINFO); do" stuff - Add/update Makefiles - Add some userspace headers like stdio.h/stdlib.h in places of sys/types.h. - EXPORT_SYMBOL *_Init/*_Update/*_Final... routines in ICP modules. - Update scripts/zfs2zol-patch.sed - include <sys/sha2.h> in sha2_impl.h - Add sha2.h to include/sys/Makefile.am - Add skein and edonr dirs to icp Makefile - Add new checksums to zpool_get.cfg - Move checksum switch block from zfs_secpolicy_setprop() to zfs_check_settable() - Fix -Wuninitialized error in edonr_byteorder.h on PPC - Fix stack frame size errors on ARM32 - Don't unroll loops in Skein on 32-bit to save stack space - Add memory barriers in sha2.c on 32-bit to save stack space - Add filetest_001_pos.ksh checksum sanity test - Add option to write psudorandom data in file_write utility
This commit is contained in:
Tony Hutter
@@ -1,116 +0,0 @@
|
||||
/*
|
||||
* CDDL HEADER START
|
||||
*
|
||||
* The contents of this file are subject to the terms of the
|
||||
* Common Development and Distribution License (the "License").
|
||||
* You may not use this file except in compliance with the License.
|
||||
*
|
||||
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
||||
* or http://www.opensolaris.org/os/licensing.
|
||||
* See the License for the specific language governing permissions
|
||||
* and limitations under the License.
|
||||
*
|
||||
* When distributing Covered Code, include this CDDL HEADER in each
|
||||
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
||||
* If applicable, add the following below this CDDL HEADER, with the
|
||||
* fields enclosed by brackets "[]" replaced with your own identifying
|
||||
* information: Portions Copyright [yyyy] [name of copyright owner]
|
||||
*
|
||||
* CDDL HEADER END
|
||||
*/
|
||||
/*
|
||||
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
|
||||
* Use is subject to license terms.
|
||||
*/
|
||||
/* Copyright 2013 Saso Kiselkov. All rights reserved. */
|
||||
|
||||
#ifndef _SYS_SHA2_H
|
||||
#define _SYS_SHA2_H
|
||||
|
||||
#include <sys/types.h> /* for uint_* */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define SHA2_HMAC_MIN_KEY_LEN 1 /* SHA2-HMAC min key length in bytes */
|
||||
#define SHA2_HMAC_MAX_KEY_LEN INT_MAX /* SHA2-HMAC max key length in bytes */
|
||||
|
||||
#define SHA256_DIGEST_LENGTH 32 /* SHA256 digest length in bytes */
|
||||
|
||||
#define SHA256_HMAC_BLOCK_SIZE 64 /* SHA256-HMAC block size */
|
||||
|
||||
#define SHA256 0
|
||||
#define SHA256_HMAC 1
|
||||
#define SHA256_HMAC_GEN 2
|
||||
|
||||
/*
|
||||
* SHA2 context.
|
||||
* The contents of this structure are a private interface between the
|
||||
* Init/Update/Final calls of the functions defined below.
|
||||
* Callers must never attempt to read or write any of the fields
|
||||
* in this structure directly.
|
||||
*/
|
||||
typedef struct {
|
||||
uint32_t algotype; /* Algorithm Type */
|
||||
|
||||
/* state (ABCDEFGH) */
|
||||
union {
|
||||
uint32_t s32[8]; /* for SHA256 */
|
||||
uint64_t s64[8]; /* for SHA384/512 */
|
||||
} state;
|
||||
/* number of bits */
|
||||
union {
|
||||
uint32_t c32[2]; /* for SHA256 , modulo 2^64 */
|
||||
uint64_t c64[2]; /* for SHA384/512, modulo 2^128 */
|
||||
} count;
|
||||
union {
|
||||
uint8_t buf8[128]; /* undigested input */
|
||||
uint32_t buf32[32]; /* realigned input */
|
||||
uint64_t buf64[16]; /* realigned input */
|
||||
} buf_un;
|
||||
} SHA2_CTX;
|
||||
|
||||
typedef SHA2_CTX SHA256_CTX;
|
||||
typedef SHA2_CTX SHA384_CTX;
|
||||
typedef SHA2_CTX SHA512_CTX;
|
||||
|
||||
extern void SHA2Init(uint64_t mech, SHA2_CTX *);
|
||||
|
||||
extern void SHA2Update(SHA2_CTX *, const void *, size_t);
|
||||
|
||||
extern void SHA2Final(void *, SHA2_CTX *);
|
||||
|
||||
extern void SHA256Init(SHA256_CTX *);
|
||||
|
||||
extern void SHA256Update(SHA256_CTX *, const void *, size_t);
|
||||
|
||||
extern void SHA256Final(void *, SHA256_CTX *);
|
||||
|
||||
#ifdef _SHA2_IMPL
|
||||
/*
|
||||
* The following types/functions are all private to the implementation
|
||||
* of the SHA2 functions and must not be used by consumers of the interface
|
||||
*/
|
||||
|
||||
/*
|
||||
* List of support mechanisms in this module.
|
||||
*
|
||||
* It is important to note that in the module, division or modulus calculations
|
||||
* are used on the enumerated type to determine which mechanism is being used;
|
||||
* therefore, changing the order or additional mechanisms should be done
|
||||
* carefully
|
||||
*/
|
||||
typedef enum sha2_mech_type {
|
||||
SHA256_MECH_INFO_TYPE, /* SUN_CKM_SHA256 */
|
||||
SHA256_HMAC_MECH_INFO_TYPE, /* SUN_CKM_SHA256_HMAC */
|
||||
SHA256_HMAC_GEN_MECH_INFO_TYPE, /* SUN_CKM_SHA256_HMAC_GENERAL */
|
||||
} sha2_mech_type_t;
|
||||
|
||||
#endif /* _SHA2_IMPL */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _SYS_SHA2_H */
|
||||
@@ -26,6 +26,8 @@
|
||||
#ifndef _SHA2_IMPL_H
|
||||
#define _SHA2_IMPL_H
|
||||
|
||||
#include <sys/sha2.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user