diff --git a/parsec.changes b/parsec.changes index 91e6d5f..cbda27e 100644 --- a/parsec.changes +++ b/parsec.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 13 14:19:05 UTC 2020 - Guillaume GARDET + +- Enable 'all-providers' which adds 'pkcs11-provider' compared to + previous config +- Drop unneeded patch: + * pkcs11-libloading-issue.patch + ------------------------------------------------------------------- Fri Oct 23 15:10:32 UTC 2020 - Guillaume GARDET diff --git a/parsec.spec b/parsec.spec index c475b20..44142d7 100644 --- a/parsec.spec +++ b/parsec.spec @@ -17,7 +17,7 @@ %global rustflags '-Clink-arg=-Wl,-z,relro,-z,now' # Features available: mbed-crypto-provider, pkcs11-provider, tpm-provider, all-providers -%define features "mbed-crypto-provider,tpm-provider" +%define features "all-providers" %{?systemd_ordering} Name: parsec Version: 0.6.0 @@ -32,14 +32,11 @@ Source3: parsec.service Source4: config.toml Source5: parsec.conf Source6: system-user-parsec.conf -# Borrowed from Fedora - https://src.fedoraproject.org/rpms/parsec/blob/master/f/pkcs11-libloading-issue.patch -Patch1: pkcs11-libloading-issue.patch BuildRequires: cargo BuildRequires: clang-devel BuildRequires: cmake BuildRequires: llvm-devel BuildRequires: protobuf-devel -BuildRequires: pkcs11-helper-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(tss2-esys) >= 2.3.3 BuildRequires: python3 @@ -57,11 +54,10 @@ enabling cloud-native delivery flows within the data center and at the edge. %prep %setup -qa1 -%patch1 -p1 mkdir .cargo cp %{SOURCE2} .cargo/config sed -i -e 's#default = \[\]##' Cargo.toml -echo 'default = ["tpm-provider", "mbed-crypto-provider"]' >> Cargo.toml +echo 'default = ["all-providers"]' >> Cargo.toml %build export PROTOC=%{_bindir}/protoc diff --git a/pkcs11-libloading-issue.patch b/pkcs11-libloading-issue.patch deleted file mode 100644 index 6f542b3..0000000 --- a/pkcs11-libloading-issue.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/providers/pkcs11/utils.rs b/src/providers/pkcs11/utils.rs -index 7f51e8d..1755226 100644 ---- a/src/providers/pkcs11/utils.rs -+++ b/src/providers/pkcs11/utils.rs -@@ -284,7 +284,10 @@ impl CkMechanism { - /// of memory, hardware failure, corruption detection, lack of entropy and unsupported operations. - pub fn to_response_status(error: Error) -> ResponseStatus { - match error { -- Error::Io(e) => ResponseStatus::from(e), -+ Error::LibraryLoading{err} => { -+ format_error!("PKCS11 error to PsaErrorCommunicationFailure", err); -+ ResponseStatus::PsaErrorCommunicationFailure -+ }, - Error::Module(e) | Error::InvalidInput(e) => { - format_error!("Conversion of error to PsaErrorCommunicationFailure", e); - ResponseStatus::PsaErrorCommunicationFailure