diff options
| author | Jason King <jason.king@joyent.com> | 2019-08-23 16:16:09 -0500 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2019-08-26 20:15:43 -0400 |
| commit | 4a3c0cdaf405cda95f1af235054ff0d94cd926c9 (patch) | |
| tree | 7e85089d7c9e67fbd1f6e9f873af4ec5ea9729af | |
| parent | 06756f4eb3dca79934574cacc46bd5a99cee195d (diff) | |
| download | illumos-joyent-4a3c0cdaf405cda95f1af235054ff0d94cd926c9.tar.gz | |
11613 libzfs_crypto doesn't need to use kmfapi.h
11614 libzfs_crypto.c doesn't need to use pkcs11_getrandom
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Gordon Ross <gwr@nexenta.com>
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_crypto.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_crypto.c b/usr/src/lib/libzfs/common/libzfs_crypto.c index c7233e5348..72c2992f4b 100644 --- a/usr/src/lib/libzfs/common/libzfs_crypto.c +++ b/usr/src/lib/libzfs/common/libzfs_crypto.c @@ -15,6 +15,7 @@ /* * Copyright (c) 2017, Datto, Inc. All rights reserved. + * Copyright 2019 Joyent, Inc. */ #include <string.h> @@ -25,9 +26,9 @@ #include <sys/fs/zfs.h> #include <sys/dsl_crypt.h> #ifdef sun -#include <kmfapi.h> -#include <security/pkcs11.h> -#include <cryptoutil.h> +#include <stdlib.h> +#include <security/cryptoki.h> +#include <cryptoutil.h> /* for pkcs11_strerror */ #else #include <sys/crypto/icp.h> #endif @@ -573,13 +574,7 @@ populate_create_encryption_params_nvlists(libzfs_handle_t *hdl, /* passphrase formats require a salt and pbkdf2 iters property */ if (keyformat == ZFS_KEYFORMAT_PASSPHRASE) { #ifdef sun - /* always generate a new salt */ - ret = pkcs11_get_random(&salt, sizeof (uint64_t)); - if (ret != 0) { - zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "Failed to generate salt.")); - goto error; - } + arc4random_buf(&salt, sizeof (salt)); #else random_init(); |