From c0e3b3338ee72ac8fba67e7f1608cfd207eafd97 Mon Sep 17 00:00:00 2001 From: "Bruno E. O. Meneguele" Date: Wed, 6 Sep 2017 10:52:17 -0300 Subject: [PATCH 1/5] - New upstream release - Fix OpenSSL 1.1 incompatibility issues adding OpenSSL 1.0 compat package on BuildRequires. Related: BZ#1423736 --- .gitignore | 1 + ima-evm-utils.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c40b7ea..c7cea8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ima-evm-utils-0.6.tar.gz /ima-evm-utils-0.9.tar.gz +/ima-evm-utils-1.0.tar.gz diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec index fd21562..a32a752 100644 --- a/ima-evm-utils.spec +++ b/ima-evm-utils.spec @@ -1,13 +1,13 @@ Summary: IMA/EVM support utilities Name: ima-evm-utils -Version: 0.9 -Release: 7%{?dist} +Version: 1.0 +Release: 1%{?dist} License: GPLv2 Url: http://linux-ima.sourceforge.net/ Source: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz Group: Applications/Internet BuildRequires: autoconf automake libtool m4 asciidoc libxslt -BuildRequires: openssl-devel libattr-devel keyutils-libs-devel +BuildRequires: compat-openssl10-devel libattr-devel keyutils-libs-devel Patch1: manpage.patch %description @@ -41,6 +41,11 @@ make DESTDIR=%{buildroot} install %{_mandir}/man1/* %changelog +* Tue Sep 05 2017 Bruno E. O. Meneguele - 1.0-1 +- New upstream release +- Fix OpenSSL 1.1 incompatibility issues adding OpenSSL 1.0 compat package on + BuildRequires. + * Wed Aug 02 2017 Fedora Release Engineering - 0.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 336b40a..17e6d4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b4005df0bcf63ec33744c6dea5e670b2 ima-evm-utils-0.9.tar.gz +SHA512 (ima-evm-utils-1.0.tar.gz) = f7edec4c2cd0f72291045c0096d198bff49bf892f5c5f7bf772f104613295e7522e96cccb89261c0ac035b0265c9574c14758359ab84c47180095630cf60802a From c40253b5264d98aa76fec990df2ae362204719a9 Mon Sep 17 00:00:00 2001 From: "Bruno E. O. Meneguele" Date: Mon, 20 Nov 2017 18:42:01 -0200 Subject: [PATCH 2/5] Adjusted docbook xsl path to match the correct stylesheet (BZ#1514985) --- manpage.patch => docbook-xsl-path.patch | 8 ++++---- ima-evm-utils.spec | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) rename manpage.patch => docbook-xsl-path.patch (54%) diff --git a/manpage.patch b/docbook-xsl-path.patch similarity index 54% rename from manpage.patch rename to docbook-xsl-path.patch index a4bfe0c..03e5664 100644 --- a/manpage.patch +++ b/docbook-xsl-path.patch @@ -1,12 +1,12 @@ -diff -urNp ima-evm-utils-0.9/Makefile.am ima-evm-utils-0.9-patch/Makefile.am ---- ima-evm-utils-0.9/Makefile.am 2014-09-23 08:09:05.000000000 -0400 -+++ ima-evm-utils-0.9-patch/Makefile.am 2014-10-31 13:00:03.492295123 -0400 +diff -urNp ima-evm-utils-1.0-orig/Makefile.am ima-evm-utils-1.0/Makefile.am +--- ima-evm-utils-1.0-orig/Makefile.am 2015-07-30 15:28:53.000000000 -0300 ++++ ima-evm-utils-1.0/Makefile.am 2017-11-20 16:20:04.245591165 -0200 @@ -24,7 +24,7 @@ rpm: $(tarname) rpmbuild -ba --nodeps $(SPEC) # requires asciidoc, xslproc, docbook-xsl -MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl -+MANPAGE_DOCBOOK_XSL = http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl ++MANPAGE_DOCBOOK_XSL = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl evmctl.1.html: README @asciidoc -o $@ $< diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec index a32a752..2b60ea3 100644 --- a/ima-evm-utils.spec +++ b/ima-evm-utils.spec @@ -1,14 +1,14 @@ Summary: IMA/EVM support utilities Name: ima-evm-utils Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Url: http://linux-ima.sourceforge.net/ Source: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz Group: Applications/Internet BuildRequires: autoconf automake libtool m4 asciidoc libxslt BuildRequires: compat-openssl10-devel libattr-devel keyutils-libs-devel -Patch1: manpage.patch +Patch1: docbook-xsl-path.patch %description The Trusted Computing Group(TCG) run-time Integrity Measurement Architecture @@ -41,6 +41,9 @@ make DESTDIR=%{buildroot} install %{_mandir}/man1/* %changelog +* Mon Nov 20 2017 Bruno E. O. Meneguele - 1.0-2 +- Adjusted docbook xsl path to match the correct stylesheet + * Tue Sep 05 2017 Bruno E. O. Meneguele - 1.0-1 - New upstream release - Fix OpenSSL 1.1 incompatibility issues adding OpenSSL 1.0 compat package on From 07386590067dcb9ac8ef7d1f08ea0ef330b19d5e Mon Sep 17 00:00:00 2001 From: "Bruno E. O. Meneguele" Date: Wed, 14 Feb 2018 14:32:03 -0200 Subject: [PATCH 3/5] - Add OpenSSL 1.1 API support for the package, avoiding the need of compat-openssl10-devel package (BZ#1541274) --- ima-evm-utils.spec | 12 +- openssl1-1-interface.patch | 224 +++++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+), 2 deletions(-) create mode 100644 openssl1-1-interface.patch diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec index 2b60ea3..92f9db1 100644 --- a/ima-evm-utils.spec +++ b/ima-evm-utils.spec @@ -1,14 +1,15 @@ Summary: IMA/EVM support utilities Name: ima-evm-utils Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Url: http://linux-ima.sourceforge.net/ Source: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz Group: Applications/Internet BuildRequires: autoconf automake libtool m4 asciidoc libxslt -BuildRequires: compat-openssl10-devel libattr-devel keyutils-libs-devel +BuildRequires: openssl-devel libattr-devel keyutils-libs-devel Patch1: docbook-xsl-path.patch +Patch2: openssl1-1-interface.patch %description The Trusted Computing Group(TCG) run-time Integrity Measurement Architecture @@ -21,6 +22,9 @@ ima-evm-utils is used to prepare the file system for these extended attributes. %prep %setup -q %patch1 -p1 +if pkgconf --atleast-version=1.1 openssl; then +%patch2 -p1 +fi %build #Is running autoreconf a good idea @@ -41,6 +45,10 @@ make DESTDIR=%{buildroot} install %{_mandir}/man1/* %changelog +* Wed Feb 14 2018 Bruno E. O. Meneguele - 1.0-3 +- Add OpenSSL 1.1 API support for the package, avoiding the need of + compat-openssl10-devel package + * Mon Nov 20 2017 Bruno E. O. Meneguele - 1.0-2 - Adjusted docbook xsl path to match the correct stylesheet diff --git a/openssl1-1-interface.patch b/openssl1-1-interface.patch new file mode 100644 index 0000000..e00fb2f --- /dev/null +++ b/openssl1-1-interface.patch @@ -0,0 +1,224 @@ +diff -urNp ima-evm-utils-1.0-orig/src/libimaevm.c ima-evm-utils-1.0/src/libimaevm.c +--- ima-evm-utils-1.0-orig/src/libimaevm.c 2015-07-30 15:28:53.000000000 -0300 ++++ ima-evm-utils-1.0/src/libimaevm.c 2017-12-01 12:01:28.008705290 -0200 +@@ -269,7 +269,7 @@ int ima_calc_hash(const char *file, uint + { + const EVP_MD *md; + struct stat st; +- EVP_MD_CTX ctx; ++ EVP_MD_CTX *ctx; + unsigned int mdlen; + int err; + +@@ -286,25 +286,30 @@ int ima_calc_hash(const char *file, uint + return 1; + } + +- err = EVP_DigestInit(&ctx, md); ++ ctx = EVP_MD_CTX_new(); ++ if (!ctx) { ++ log_err("EVP_MD_CTX_new() failed\n"); ++ return 1; ++ } ++ err = EVP_DigestInit_ex(ctx, md, NULL); + if (!err) { +- log_err("EVP_DigestInit() failed\n"); ++ log_err("EVP_DigestInit_ex() failed\n"); + return 1; + } + + switch (st.st_mode & S_IFMT) { + case S_IFREG: +- err = add_file_hash(file, &ctx); ++ err = add_file_hash(file, ctx); + break; + case S_IFDIR: +- err = add_dir_hash(file, &ctx); ++ err = add_dir_hash(file, ctx); + break; + case S_IFLNK: +- err = add_link_hash(file, &ctx); ++ err = add_link_hash(file, ctx); + break; + case S_IFIFO: case S_IFSOCK: + case S_IFCHR: case S_IFBLK: +- err = add_dev_hash(&st, &ctx); ++ err = add_dev_hash(&st, ctx); + break; + default: + log_errno("Unsupported file type"); +@@ -314,11 +319,12 @@ int ima_calc_hash(const char *file, uint + if (err) + return err; + +- err = EVP_DigestFinal(&ctx, hash, &mdlen); ++ err = EVP_DigestFinal_ex(ctx, hash, &mdlen); + if (!err) { +- log_err("EVP_DigestFinal() failed\n"); ++ log_err("EVP_DigestFinal_ex() failed\n"); + return 1; + } ++ EVP_MD_CTX_free(ctx); + + return mdlen; + } +@@ -547,6 +553,7 @@ int key2bin(RSA *key, unsigned char *pub + { + int len, b, offset = 0; + struct pubkey_hdr *pkh = (struct pubkey_hdr *)pub; ++ const BIGNUM *n, *e; + + /* add key header */ + pkh->version = 1; +@@ -556,18 +563,19 @@ int key2bin(RSA *key, unsigned char *pub + + offset += sizeof(*pkh); + +- len = BN_num_bytes(key->n); +- b = BN_num_bits(key->n); ++ RSA_get0_key(key, &n, &e, NULL); ++ len = BN_num_bytes(n); ++ b = BN_num_bits(n); + pub[offset++] = b >> 8; + pub[offset++] = b & 0xff; +- BN_bn2bin(key->n, &pub[offset]); ++ BN_bn2bin(n, &pub[offset]); + offset += len; + +- len = BN_num_bytes(key->e); +- b = BN_num_bits(key->e); ++ len = BN_num_bytes(e); ++ b = BN_num_bits(e); + pub[offset++] = b >> 8; + pub[offset++] = b & 0xff; +- BN_bn2bin(key->e, &pub[offset]); ++ BN_bn2bin(e, &pub[offset]); + offset += len; + + return offset; + +diff -urNp ima-evm-utils-1.0-orig/src/evmctl.c ima-evm-utils-1.0/src/evmctl.c +--- ima-evm-utils-1.0-orig/src/evmctl.c 2015-07-30 15:28:53.000000000 -0300 ++++ ima-evm-utils-1.0/src/evmctl.c 2017-12-01 12:00:39.683306265 -0200 +@@ -305,7 +305,7 @@ static int calc_evm_hash(const char *fil + struct stat st; + int err; + uint32_t generation = 0; +- EVP_MD_CTX ctx; ++ EVP_MD_CTX *ctx; + unsigned int mdlen; + char **xattrname; + char xattr_value[1024]; +@@ -345,9 +345,14 @@ static int calc_evm_hash(const char *fil + return -1; + } + +- err = EVP_DigestInit(&ctx, EVP_sha1()); ++ ctx = EVP_MD_CTX_new(); ++ if (!ctx) { ++ log_err("EVP_MD_CTX_new() failed\n"); ++ return 1; ++ } ++ err = EVP_DigestInit_ex(ctx, EVP_sha1(), NULL); + if (!err) { +- log_err("EVP_DigestInit() failed\n"); ++ log_err("EVP_DigestInit_ex() failed\n"); + return 1; + } + +@@ -364,7 +369,7 @@ static int calc_evm_hash(const char *fil + /*log_debug("name: %s, value: %s, size: %d\n", *xattrname, xattr_value, err);*/ + log_info("name: %s, size: %d\n", *xattrname, err); + log_debug_dump(xattr_value, err); +- err = EVP_DigestUpdate(&ctx, xattr_value, err); ++ err = EVP_DigestUpdate(ctx, xattr_value, err); + if (!err) { + log_err("EVP_DigestUpdate() failed\n"); + return 1; +@@ -412,7 +417,7 @@ static int calc_evm_hash(const char *fil + log_debug("hmac_misc (%d): ", hmac_size); + log_debug_dump(&hmac_misc, hmac_size); + +- err = EVP_DigestUpdate(&ctx, &hmac_misc, hmac_size); ++ err = EVP_DigestUpdate(ctx, &hmac_misc, hmac_size); + if (!err) { + log_err("EVP_DigestUpdate() failed\n"); + return 1; +@@ -423,18 +428,19 @@ static int calc_evm_hash(const char *fil + if (err) + return -1; + +- err = EVP_DigestUpdate(&ctx, (const unsigned char *)uuid, sizeof(uuid)); ++ err = EVP_DigestUpdate(ctx, (const unsigned char *)uuid, sizeof(uuid)); + if (!err) { + log_err("EVP_DigestUpdate() failed\n"); + return 1; + } + } + +- err = EVP_DigestFinal(&ctx, hash, &mdlen); ++ err = EVP_DigestFinal_ex(ctx, hash, &mdlen); + if (!err) { + log_err("EVP_DigestFinal() failed\n"); + return 1; + } ++ EVP_MD_CTX_free(ctx); + + return mdlen; + } +@@ -844,7 +850,7 @@ static int calc_evm_hmac(const char *fil + struct stat st; + int err = -1; + uint32_t generation = 0; +- HMAC_CTX ctx; ++ HMAC_CTX *ctx; + unsigned int mdlen; + char **xattrname; + unsigned char xattr_value[1024]; +@@ -900,10 +906,15 @@ static int calc_evm_hmac(const char *fil + goto out; + } + +- err = !HMAC_Init(&ctx, evmkey, sizeof(evmkey), EVP_sha1()); ++ ctx = HMAC_CTX_new(); ++ if (!ctx) { ++ log_err("HMAC_MD_CTX_new() failed\n"); ++ goto out; ++ } ++ err = !HMAC_Init_ex(ctx, evmkey, sizeof(evmkey), EVP_sha1(), NULL); + if (err) { + log_err("HMAC_Init() failed\n"); +- goto out; ++ goto out_ctx_cleanup; + } + + for (xattrname = evm_config_xattrnames; *xattrname != NULL; xattrname++) { +@@ -919,7 +930,7 @@ static int calc_evm_hmac(const char *fil + /*log_debug("name: %s, value: %s, size: %d\n", *xattrname, xattr_value, err);*/ + log_info("name: %s, size: %d\n", *xattrname, err); + log_debug_dump(xattr_value, err); +- err = !HMAC_Update(&ctx, xattr_value, err); ++ err = !HMAC_Update(ctx, xattr_value, err); + if (err) { + log_err("HMAC_Update() failed\n"); + goto out_ctx_cleanup; +@@ -960,16 +971,16 @@ static int calc_evm_hmac(const char *fil + log_debug("hmac_misc (%d): ", hmac_size); + log_debug_dump(&hmac_misc, hmac_size); + +- err = !HMAC_Update(&ctx, (const unsigned char *)&hmac_misc, hmac_size); ++ err = !HMAC_Update(ctx, (const unsigned char *)&hmac_misc, hmac_size); + if (err) { + log_err("HMAC_Update() failed\n"); + goto out_ctx_cleanup; + } +- err = !HMAC_Final(&ctx, hash, &mdlen); ++ err = !HMAC_Final(ctx, hash, &mdlen); + if (err) + log_err("HMAC_Final() failed\n"); + out_ctx_cleanup: +- HMAC_CTX_cleanup(&ctx); ++ HMAC_CTX_free(ctx); + out: + free(key); + return err ?: mdlen; From 8ec3a62d072f855fef75f9d851516e72a0d202ec Mon Sep 17 00:00:00 2001 From: "Bruno E. O. Meneguele" Date: Wed, 21 Feb 2018 17:18:15 -0300 Subject: [PATCH 4/5] - New upstream release - Support for OpenSSL 1.1 was added directly to the source code in upstream, thus removing specific patch for it - Docbook xsl stylesheet updated to a local path --- .gitignore | 1 + docbook-xsl-path.patch | 2 +- ima-evm-utils.spec | 14 ++++++++------ sources | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c7cea8a..d1d52cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /ima-evm-utils-0.6.tar.gz /ima-evm-utils-0.9.tar.gz /ima-evm-utils-1.0.tar.gz +/ima-evm-utils-1.1.tar.gz diff --git a/docbook-xsl-path.patch b/docbook-xsl-path.patch index 03e5664..e4ee8e5 100644 --- a/docbook-xsl-path.patch +++ b/docbook-xsl-path.patch @@ -6,7 +6,7 @@ diff -urNp ima-evm-utils-1.0-orig/Makefile.am ima-evm-utils-1.0/Makefile.am # requires asciidoc, xslproc, docbook-xsl -MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl -+MANPAGE_DOCBOOK_XSL = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl ++MANPAGE_DOCBOOK_XSL = /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl evmctl.1.html: README @asciidoc -o $@ $< diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec index 92f9db1..2fd9c77 100644 --- a/ima-evm-utils.spec +++ b/ima-evm-utils.spec @@ -1,7 +1,7 @@ Summary: IMA/EVM support utilities Name: ima-evm-utils -Version: 1.0 -Release: 3%{?dist} +Version: 1.1 +Release: 1%{?dist} License: GPLv2 Url: http://linux-ima.sourceforge.net/ Source: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz @@ -9,7 +9,6 @@ Group: Applications/Internet BuildRequires: autoconf automake libtool m4 asciidoc libxslt BuildRequires: openssl-devel libattr-devel keyutils-libs-devel Patch1: docbook-xsl-path.patch -Patch2: openssl1-1-interface.patch %description The Trusted Computing Group(TCG) run-time Integrity Measurement Architecture @@ -22,9 +21,6 @@ ima-evm-utils is used to prepare the file system for these extended attributes. %prep %setup -q %patch1 -p1 -if pkgconf --atleast-version=1.1 openssl; then -%patch2 -p1 -fi %build #Is running autoreconf a good idea @@ -45,6 +41,12 @@ make DESTDIR=%{buildroot} install %{_mandir}/man1/* %changelog +* Wed Feb 21 2018 Bruno E. O. Meneguele - 1.1-1 +- New upstream release +- Support for OpenSSL 1.1 was added directly to the source code in upstream, + thus removing specific patch for it +- Docbook xsl stylesheet updated to a local path + * Wed Feb 14 2018 Bruno E. O. Meneguele - 1.0-3 - Add OpenSSL 1.1 API support for the package, avoiding the need of compat-openssl10-devel package diff --git a/sources b/sources index 17e6d4e..baf9168 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ima-evm-utils-1.0.tar.gz) = f7edec4c2cd0f72291045c0096d198bff49bf892f5c5f7bf772f104613295e7522e96cccb89261c0ac035b0265c9574c14758359ab84c47180095630cf60802a +SHA512 (ima-evm-utils-1.1.tar.gz) = fc7efc890812233db888eef210dc4357bee838b56fd95efd9a9e141d684b0b354670a3c053dd93a94a1402dd826074d4a83a4637c8e6c1d90ead3132354a5776 From 36a11b60e9d5e66cda869e718e76e576be122496 Mon Sep 17 00:00:00 2001 From: "Bruno E. O. Meneguele" Date: Fri, 2 Mar 2018 12:04:32 -0300 Subject: [PATCH 5/5] - Remove libtool files - Run ldconfig scriptlets after un/installing - Add -devel subpackage to handle include files and examples - Disable any static file in the package Related: BZ#1548698 --- ima-evm-utils.spec | 33 ++++-- openssl1-1-interface.patch | 224 ------------------------------------- 2 files changed, 25 insertions(+), 232 deletions(-) delete mode 100644 openssl1-1-interface.patch diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec index 2fd9c77..901a1ab 100644 --- a/ima-evm-utils.spec +++ b/ima-evm-utils.spec @@ -1,11 +1,10 @@ Summary: IMA/EVM support utilities Name: ima-evm-utils Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Url: http://linux-ima.sourceforge.net/ Source: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz -Group: Applications/Internet BuildRequires: autoconf automake libtool m4 asciidoc libxslt BuildRequires: openssl-devel libattr-devel keyutils-libs-devel Patch1: docbook-xsl-path.patch @@ -18,29 +17,47 @@ systems extended attributes. The Extended Verification Module (EVM) prevents unauthorized changes to these extended attributes on the file system. ima-evm-utils is used to prepare the file system for these extended attributes. +%package devel +Summary: Development files for %{name} + +%description devel +This package provides the header files for %{name} + %prep %setup -q %patch1 -p1 %build -#Is running autoreconf a good idea mkdir -p m4 autoreconf -f -i -%configure +%configure --disable-static make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install +find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete + +%ldconfig_scriptlets + +%files devel +%{_pkgdocdir}/*.sh +%{_includedir}/* +%{_libdir}/libimaevm.so %files -%doc ChangeLog README AUTHORS COPYING +%doc ChangeLog README AUTHORS +%license COPYING %{_bindir}/* -%{_pkgdocdir}/*.sh -%{_libdir}/libimaevm.* -%{_includedir}/* +%{_libdir}/libimaevm.so.* %{_mandir}/man1/* %changelog +* Fri Mar 02 2018 Bruno E. O. Meneguele - 1.1-2 +- Remove libtool files +- Run ldconfig scriptlets after un/installing +- Add -devel subpackage to handle include files and examples +- Disable any static file in the package + * Wed Feb 21 2018 Bruno E. O. Meneguele - 1.1-1 - New upstream release - Support for OpenSSL 1.1 was added directly to the source code in upstream, diff --git a/openssl1-1-interface.patch b/openssl1-1-interface.patch deleted file mode 100644 index e00fb2f..0000000 --- a/openssl1-1-interface.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff -urNp ima-evm-utils-1.0-orig/src/libimaevm.c ima-evm-utils-1.0/src/libimaevm.c ---- ima-evm-utils-1.0-orig/src/libimaevm.c 2015-07-30 15:28:53.000000000 -0300 -+++ ima-evm-utils-1.0/src/libimaevm.c 2017-12-01 12:01:28.008705290 -0200 -@@ -269,7 +269,7 @@ int ima_calc_hash(const char *file, uint - { - const EVP_MD *md; - struct stat st; -- EVP_MD_CTX ctx; -+ EVP_MD_CTX *ctx; - unsigned int mdlen; - int err; - -@@ -286,25 +286,30 @@ int ima_calc_hash(const char *file, uint - return 1; - } - -- err = EVP_DigestInit(&ctx, md); -+ ctx = EVP_MD_CTX_new(); -+ if (!ctx) { -+ log_err("EVP_MD_CTX_new() failed\n"); -+ return 1; -+ } -+ err = EVP_DigestInit_ex(ctx, md, NULL); - if (!err) { -- log_err("EVP_DigestInit() failed\n"); -+ log_err("EVP_DigestInit_ex() failed\n"); - return 1; - } - - switch (st.st_mode & S_IFMT) { - case S_IFREG: -- err = add_file_hash(file, &ctx); -+ err = add_file_hash(file, ctx); - break; - case S_IFDIR: -- err = add_dir_hash(file, &ctx); -+ err = add_dir_hash(file, ctx); - break; - case S_IFLNK: -- err = add_link_hash(file, &ctx); -+ err = add_link_hash(file, ctx); - break; - case S_IFIFO: case S_IFSOCK: - case S_IFCHR: case S_IFBLK: -- err = add_dev_hash(&st, &ctx); -+ err = add_dev_hash(&st, ctx); - break; - default: - log_errno("Unsupported file type"); -@@ -314,11 +319,12 @@ int ima_calc_hash(const char *file, uint - if (err) - return err; - -- err = EVP_DigestFinal(&ctx, hash, &mdlen); -+ err = EVP_DigestFinal_ex(ctx, hash, &mdlen); - if (!err) { -- log_err("EVP_DigestFinal() failed\n"); -+ log_err("EVP_DigestFinal_ex() failed\n"); - return 1; - } -+ EVP_MD_CTX_free(ctx); - - return mdlen; - } -@@ -547,6 +553,7 @@ int key2bin(RSA *key, unsigned char *pub - { - int len, b, offset = 0; - struct pubkey_hdr *pkh = (struct pubkey_hdr *)pub; -+ const BIGNUM *n, *e; - - /* add key header */ - pkh->version = 1; -@@ -556,18 +563,19 @@ int key2bin(RSA *key, unsigned char *pub - - offset += sizeof(*pkh); - -- len = BN_num_bytes(key->n); -- b = BN_num_bits(key->n); -+ RSA_get0_key(key, &n, &e, NULL); -+ len = BN_num_bytes(n); -+ b = BN_num_bits(n); - pub[offset++] = b >> 8; - pub[offset++] = b & 0xff; -- BN_bn2bin(key->n, &pub[offset]); -+ BN_bn2bin(n, &pub[offset]); - offset += len; - -- len = BN_num_bytes(key->e); -- b = BN_num_bits(key->e); -+ len = BN_num_bytes(e); -+ b = BN_num_bits(e); - pub[offset++] = b >> 8; - pub[offset++] = b & 0xff; -- BN_bn2bin(key->e, &pub[offset]); -+ BN_bn2bin(e, &pub[offset]); - offset += len; - - return offset; - -diff -urNp ima-evm-utils-1.0-orig/src/evmctl.c ima-evm-utils-1.0/src/evmctl.c ---- ima-evm-utils-1.0-orig/src/evmctl.c 2015-07-30 15:28:53.000000000 -0300 -+++ ima-evm-utils-1.0/src/evmctl.c 2017-12-01 12:00:39.683306265 -0200 -@@ -305,7 +305,7 @@ static int calc_evm_hash(const char *fil - struct stat st; - int err; - uint32_t generation = 0; -- EVP_MD_CTX ctx; -+ EVP_MD_CTX *ctx; - unsigned int mdlen; - char **xattrname; - char xattr_value[1024]; -@@ -345,9 +345,14 @@ static int calc_evm_hash(const char *fil - return -1; - } - -- err = EVP_DigestInit(&ctx, EVP_sha1()); -+ ctx = EVP_MD_CTX_new(); -+ if (!ctx) { -+ log_err("EVP_MD_CTX_new() failed\n"); -+ return 1; -+ } -+ err = EVP_DigestInit_ex(ctx, EVP_sha1(), NULL); - if (!err) { -- log_err("EVP_DigestInit() failed\n"); -+ log_err("EVP_DigestInit_ex() failed\n"); - return 1; - } - -@@ -364,7 +369,7 @@ static int calc_evm_hash(const char *fil - /*log_debug("name: %s, value: %s, size: %d\n", *xattrname, xattr_value, err);*/ - log_info("name: %s, size: %d\n", *xattrname, err); - log_debug_dump(xattr_value, err); -- err = EVP_DigestUpdate(&ctx, xattr_value, err); -+ err = EVP_DigestUpdate(ctx, xattr_value, err); - if (!err) { - log_err("EVP_DigestUpdate() failed\n"); - return 1; -@@ -412,7 +417,7 @@ static int calc_evm_hash(const char *fil - log_debug("hmac_misc (%d): ", hmac_size); - log_debug_dump(&hmac_misc, hmac_size); - -- err = EVP_DigestUpdate(&ctx, &hmac_misc, hmac_size); -+ err = EVP_DigestUpdate(ctx, &hmac_misc, hmac_size); - if (!err) { - log_err("EVP_DigestUpdate() failed\n"); - return 1; -@@ -423,18 +428,19 @@ static int calc_evm_hash(const char *fil - if (err) - return -1; - -- err = EVP_DigestUpdate(&ctx, (const unsigned char *)uuid, sizeof(uuid)); -+ err = EVP_DigestUpdate(ctx, (const unsigned char *)uuid, sizeof(uuid)); - if (!err) { - log_err("EVP_DigestUpdate() failed\n"); - return 1; - } - } - -- err = EVP_DigestFinal(&ctx, hash, &mdlen); -+ err = EVP_DigestFinal_ex(ctx, hash, &mdlen); - if (!err) { - log_err("EVP_DigestFinal() failed\n"); - return 1; - } -+ EVP_MD_CTX_free(ctx); - - return mdlen; - } -@@ -844,7 +850,7 @@ static int calc_evm_hmac(const char *fil - struct stat st; - int err = -1; - uint32_t generation = 0; -- HMAC_CTX ctx; -+ HMAC_CTX *ctx; - unsigned int mdlen; - char **xattrname; - unsigned char xattr_value[1024]; -@@ -900,10 +906,15 @@ static int calc_evm_hmac(const char *fil - goto out; - } - -- err = !HMAC_Init(&ctx, evmkey, sizeof(evmkey), EVP_sha1()); -+ ctx = HMAC_CTX_new(); -+ if (!ctx) { -+ log_err("HMAC_MD_CTX_new() failed\n"); -+ goto out; -+ } -+ err = !HMAC_Init_ex(ctx, evmkey, sizeof(evmkey), EVP_sha1(), NULL); - if (err) { - log_err("HMAC_Init() failed\n"); -- goto out; -+ goto out_ctx_cleanup; - } - - for (xattrname = evm_config_xattrnames; *xattrname != NULL; xattrname++) { -@@ -919,7 +930,7 @@ static int calc_evm_hmac(const char *fil - /*log_debug("name: %s, value: %s, size: %d\n", *xattrname, xattr_value, err);*/ - log_info("name: %s, size: %d\n", *xattrname, err); - log_debug_dump(xattr_value, err); -- err = !HMAC_Update(&ctx, xattr_value, err); -+ err = !HMAC_Update(ctx, xattr_value, err); - if (err) { - log_err("HMAC_Update() failed\n"); - goto out_ctx_cleanup; -@@ -960,16 +971,16 @@ static int calc_evm_hmac(const char *fil - log_debug("hmac_misc (%d): ", hmac_size); - log_debug_dump(&hmac_misc, hmac_size); - -- err = !HMAC_Update(&ctx, (const unsigned char *)&hmac_misc, hmac_size); -+ err = !HMAC_Update(ctx, (const unsigned char *)&hmac_misc, hmac_size); - if (err) { - log_err("HMAC_Update() failed\n"); - goto out_ctx_cleanup; - } -- err = !HMAC_Final(&ctx, hash, &mdlen); -+ err = !HMAC_Final(ctx, hash, &mdlen); - if (err) - log_err("HMAC_Final() failed\n"); - out_ctx_cleanup: -- HMAC_CTX_cleanup(&ctx); -+ HMAC_CTX_free(ctx); - out: - free(key); - return err ?: mdlen;