address deprecated warnings
Mimi Zohar
maintainerv3 cover address deprecated warnings
Between travis/ci and OpenSSL v3 a large number of deprecated warnings are being emitted when compiling ima-evm-utils. Start addressing these deprecated warnings by replacing the low level SHA1 and HMAC calls with the EVP_ functions. IMA signature version 1 also uses low level calls, but instead of fixing it, deprecate it as nobody should be using it anyway.
OpenSSL v3 "engine" support is deprecated and replaced with "providers". Engine support will continue to work for a while, but results in deprecated declaration and other messages. Define a "--disable-engine" and the equivalent "--enable-engine=no" configuration option.
Changelog v3:
- Make the SM2/SM3 tests dependent on the OpenSSL v3, rather than compiling OpenSSL v3.
- Re-use the existing infrastructure for compiling OpenSSL to compile OpenSSL without engine support. ima-evm-utils compiles cleanly without any deprecated messages.
- Instead of using the distro OpenSSL version on jammy, compile OpenSSL to test building ima-evm-utils without OpenSSL engine support.
- Make sure the keyfile is a regular file before using it.
- Based on Vitaly's suggestion: undefine CONFIG_ENGINE when OpenSSL engine support is not configured, run the tests normally without checking whether engine support is configured.
- Add Stefan's Reviewed-by tags.
Changelog v2:
- Based on Vitaly's comments, base enabling engine support on OPENSSL_NO_ENGINE/OPENSSL_NO_DYNAMIC_ENGINE support. Also don't limit disabling ima-evm-utils engine support to v3, make it generic.
- Added Stefan's Reviewed-by tags.
Changelog v1:
- Based on Stefan's comments, removed deprecated functions when not used and added missing word. Updated the usage and options accordingly.
- Based on Vitaly's comments, explicitly require "--disable-engine" configuration to compile ima-evm-utils without OpenSSL v3 engine support and typo.
- Based on Petr's comments, addressed the "return 77" by removing it, updated the travis patch description, and added his Reviewed-by tags.
Mimi Zohar (15):
travis: update dist=focal
Update configure.ac to address a couple of obsolete warnings Deprecate IMA signature version 1
Replace the low level SHA1 calls when calculating the TPM 1.2 PCRs Replace the low level HMAC calls when calculating the EVM HMAC Add missing EVP_MD_CTX_free() call in calc_evm_hash() Disable use of OpenSSL "engine" support
Fix potential use after free in read_tpm_banks()
Limit the file hash algorithm name length
Missing template data size lower bounds checking
Limit configuring OpenSSL engine support
Base sm2/sm3 test on openssl version installed
Compile a newer version of OpenSSL
Build OpenSSL without engine support
Fix d2i_x509_fp failure
.github/workflows/ci.yml | 10 +- .travis.yml | 10 +- acinclude.m4 | 2 +- build.sh | 8 ++ configure.ac | 15 ++- m4/manpage-docbook-xsl.m4 | 2 +- src/Makefile.am | 18 +++ src/evmctl.c | 228 +++++++++++++++++++++++++++++--------- src/imaevm.h | 6 + src/libimaevm.c | 40 ++++++- tests/functions.sh | 2 +- tests/ima_hash.test | 1 + tests/install-openssl3.sh | 9 +- tests/sign_verify.test | 23 ++-- 14 files changed, 289 insertions(+), 85 deletions(-)
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 1/15 travis: update dist=focal
Although Github Actions is available on Github Enterprise Server 3.x single server edition, as well as the unpaid version, it is not available in Github Enterprise Server 3.x cluster edition[1].
Continue updating travis.yml.
[1] https://docs.github.com/en/[email protected]/admin/release-notes#github-packages
--- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
.travis.yml +1 -1
@@ -1,6 +1,6 @@ # Copyright (c) 2017-2021 Petr Vorel <[email protected]> -dist: bionic +dist: focal language: C services: - docker
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 2/15 Update configure.ac to address a couple of obsolete warnings
In reply to Mimi ZoharRemove AC_PROG_LIBTOOL and AC_HEAD_STDC. Replace AC_HELP_STRING with AS_HELP_STRING.
--- acinclude.m4 | 2 +- configure.ac | 4 ---- m4/manpage-docbook-xsl.m4 | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-)
acinclude.m4 +1 -1
@@ -2,7 +2,7 @@ AC_DEFUN([PKG_ARG_ENABLE], [ AC_MSG_CHECKING(whether to enable $1) - AC_ARG_ENABLE([$1], AC_HELP_STRING([--enable-$1], [enable $1 (default is $2)]), + AC_ARG_ENABLE([$1], AS_HELP_STRING([--enable-$1], [enable $1 (default is $2)]), [pkg_cv_enable_$1=$enableval], [AC_CACHE_VAL([pkg_cv_enable_$1], [pkg_cv_enable_$1=$2])]) if test $pkg_cv_enable_$1 = yes; then
configure.ac +0 -4
@@ -15,16 +15,12 @@ AM_PROG_CC_C_O #AC_PROG_CXX #AC_PROG_CPP AC_PROG_INSTALL -AC_PROG_LIBTOOL #AC_PROG_LN_S LT_INIT # FIXME: Replace `main' with a function in `-lpthread': #AC_CHECK_LIB([pthread], [main]) -# Checks for header files. -AC_HEADER_STDC - PKG_CHECK_MODULES(LIBCRYPTO, [libcrypto >= 0.9.8 ]) AC_SUBST(KERNEL_HEADERS) AC_CHECK_HEADER(unistd.h)
m4/manpage-docbook-xsl.m4 +1 -1
@@ -7,7 +7,7 @@ AC_DEFUN([EVMCTL_MANPAGE_DOCBOOK_XSL], [ AC_PATH_PROGS(XMLCATALOG, xmlcatalog) AC_ARG_WITH([xml-catalog], - AC_HELP_STRING([--with-xml-catalog=CATALOG], + AS_HELP_STRING([--with-xml-catalog=CATALOG], [path to xml catalog to use]),, [with_xml_catalog=/etc/xml/catalog]) XML_CATALOG_FILE="$with_xml_catalog"
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 3/15 Deprecate IMA signature version 1
In reply to Mimi ZoharThe original IMA file signatures were based on a SHA1 hash. Kernel support for other hash algorithms was subsequently upstreamed. Deprecate "--rsa" support.
Define "--enable-sigv1" option to configure signature v1 support.
--- configure.ac | 6 ++++++ src/Makefile.am | 10 ++++++++++ src/evmctl.c | 20 ++++++++++++++++---- src/libimaevm.c | 22 +++++++++++++++++++--- tests/sign_verify.test | 18 ++++++++++++------ 5 files changed, 63 insertions(+), 13 deletions(-)
configure.ac +6 -0
@@ -49,6 +49,11 @@ AC_ARG_ENABLE([openssl_conf], AC_DEFINE(DISABLE_OPENSSL_CONF, 1, [Define to disable loading of openssl config by evmctl.]) fi], [enable_openssl_conf=yes]) +AC_ARG_ENABLE(sigv1, + AS_HELP_STRING([--enable-sigv1], [Build ima-evm-utils with signature v1 support])) + AM_CONDITIONAL([CONFIG_SIGV1], [test "x$enable_sigv1" = "xyes"]) + AS_IF([test "$enable_sigv1" != "yes"], [enable_sigv1="no"]) + #debug support - yes for a while PKG_ARG_ENABLE(debug, "yes", DEBUG, [Enable Debug support]) if test $pkg_cv_enable_debug = yes; then
@@ -83,5 +88,6 @@ echo " openssl-conf: $enable_openssl_conf" echo " tss2-esys: $ac_cv_lib_tss2_esys_Esys_Free" echo " tss2-rc-decode: $ac_cv_lib_tss2_rc_Tss2_RC_Decode" echo " ibmtss: $ac_cv_header_ibmtss_tss_h" +echo " sigv1: $enable_sigv1" echo " doc: $have_doc" echo
src/Makefile.am +10 -0
@@ -7,6 +7,10 @@ libimaevm_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCRYPTO_CFLAGS) libimaevm_la_LDFLAGS = -version-info 3:0:0 libimaevm_la_LIBADD = $(LIBCRYPTO_LIBS) +if CONFIG_SIGV1 +libimaevm_la_CFLAGS = -DCONFIG_SIGV1 +endif + include_HEADERS = imaevm.h nodist_libimaevm_la_SOURCES = hash_info.h
@@ -22,6 +26,12 @@ evmctl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCRYPTO_CFLAGS) evmctl_LDFLAGS = $(LDFLAGS_READLINE) evmctl_LDADD = $(LIBCRYPTO_LIBS) -lkeyutils libimaevm.la +# Enable IMA signature version 1 +if CONFIG_SIGV1 +evmctl_CFLAGS = -DCONFIG_SIGV1 +endif + + # USE_PCRTSS uses the Intel TSS if USE_PCRTSS evmctl_SOURCES += pcr_tss.c
src/evmctl.c +16 -4
@@ -987,7 +987,6 @@ static int cmd_verify_ima(struct command *cmd)init_public_keys ("/etc/keys/x509_evm.der" ); } - errno =0 ;if (!file) {log_err ("Parameters missing\n" );print_usage (cmd);
@@ -1004,6 +1003,7 @@ static int cmd_verify_ima(struct command *cmd)return fails >0 ; } +#if CONFIG_SIGV1 static int cmd_convert (struct command *cmd) {char *inkey;
@@ -1034,6 +1034,7 @@ static int cmd_convert(struct command *cmd)RSA_free (key); return err; } +#endif static int cmd_import (struct command *cmd) {
@@ -1088,6 +1089,7 @@ static int cmd_import(struct command *cmd)calc_keyid_v2 ((uint32_t *)keyid, name, pkey);EVP_PKEY_free (pkey); }else { +#if CONFIG_SIGV1 RSA *key =read_pub_key (inkey, imaevm_params.x509);if (!key)
@@ -1095,6 +1097,10 @@ static int cmd_import(struct command *cmd) len =key2bin (key, pub);calc_keyid_v1 (keyid, name, pub, len);RSA_free (key); +#else +log_info ("Importing public RSA key is not supported\n" ); +return 1 ; +#endif }log_info ("Importing public key %s from file %s into keyring %d\n" , name, inkey, id);
@@ -2598,7 +2604,9 @@ static void usage(void) " -d, --imahash make IMA hash\n" " -f, --sigfile store IMA signature in .sig file instead of xattr\n" " --xattr-user store xattrs in user namespace (for testing purposes)\n" -" --rsa use RSA key type and signing scheme v1\n" +#if CONFIG_SIGV1 + " --rsa use RSA key type and signing scheme v1 (deprecated)\n" +#endif" -k, --key path to signing key (default: /etc/keys/{privkey,pubkey}_evm.pem)\n" " or a pkcs11 URI\n" " --keyid n overwrite signature keyid with a 32-bit value in hex (for signing)\n"
@@ -2637,8 +2645,12 @@ static void usage(void)struct command cmds[] = { {"--version" ,NULL ,0 ,"" }, {"help" , cmd_help,0 ,"<command>" }, - {"import" , cmd_import,0 ,"[--rsa] pubkey keyring" ,"Import public key into the keyring.\n" }, - {"convert" , cmd_convert,0 ,"key" ,"convert public key into the keyring.\n" }, +#if CONFIG_SIGV1 + {"import" , cmd_import,0 ,"[--rsa] pubkey keyring" ,"Import public key into the keyring. ([--rsa] deprecated)\n" }, + {"convert" , cmd_convert,0 ,"key" ,"convert public key into the keyring. (deprecated)\n" }, +#else + {"import" , cmd_import,0 ,"pubkey keyring" ,"Import public key into the keyring.\n" }, +#endif {"sign" , cmd_sign_evm,0 ,"[-r] [--imahash | --imasig ] [--key key] [--pass [password] file" ,"Sign file metadata.\n" }, {"verify" , cmd_verify_evm,0 ,"file" ,"Verify EVM signature (for debugging).\n" }, {"ima_sign" , cmd_sign_ima,0 ,"[--sigfile] [--key key] [--pass [password] file" ,"Make file content signature.\n" },
src/libimaevm.c +19 -3
@@ -292,6 +292,7 @@ out:return pkey; } +#if CONFIG_SIGV1 RSA *read_pub_key (const char *keyfile,int x509) {EVP_PKEY *pkey;
@@ -351,6 +352,7 @@ static int verify_hash_v1(const char *file, const unsigned char *hash, int size,return 0 ; } +#endif /* CONFIG_SIGV1 */ struct public_key_entry {struct public_key_entry *next;
@@ -686,6 +688,7 @@ int verify_hash(const char *file, const unsigned char *hash, int size, {/* Get signature type from sig header */ if (sig[1 ] ==DIGSIG_VERSION_1 ) { +#if CONFIG_SIGV1 const char *key =NULL ;/* Read pubkey from RSA key */
@@ -695,6 +698,10 @@ int verify_hash(const char *file, const unsigned char *hash, int size, key = imaevm_params.keyfile;return verify_hash_v1 (file, hash, size, sig +1 , siglen -1 , key); +#else +log_info ("Signature version 1 deprecated." ); +return -1 ; +#endif }else if (sig[1 ] ==DIGSIG_VERSION_2 ) {return verify_hash_v2 (file, hash, size, sig, siglen); }else if (sig[1 ] ==DIGSIG_VERSION_3 ) {
@@ -742,6 +749,7 @@ int ima_verify_signature(const char *file, unsigned char *sig, int siglen,return verify_hash (file, hash, hashlen, sig, siglen); } +#if CONFIG_SIGV1 /* * Create binary key representation suitable for kernel */
@@ -800,6 +808,7 @@ void calc_keyid_v1(uint8_t *keyid, char *str, const unsigned char *pkey, int lenif (imaevm_params.verbose >LOG_INFO ) log_info("keyid-v1: %s\n", str); } +#endif /* CONFIG_SIGV1 */ /* * Calculate keyid of the public_key part of EVP_PKEY
@@ -990,6 +999,7 @@ err_engine:return NULL ; } +#if CONFIG_SIGV1 static RSA *read_priv_key (const char *keyfile,const char *keypass) {EVP_PKEY *pkey;
@@ -1100,6 +1110,7 @@ out:RSA_free (key); return len; } +#endif /* CONFIG_SIGV1 */ /* * @sig is assumed to be of (MAX_SIGNATURE_SIZE - 1) size
@@ -1214,9 +1225,14 @@ int sign_hash(const char *hashalgo, const unsigned char *hash, int size, const cif (keypass) imaevm_params.keypass = keypass; -return imaevm_params.x509 ? -sign_hash_v2 (hashalgo, hash, size, keyfile, sig) : -sign_hash_v1 (hashalgo, hash, size, keyfile, sig); +if (imaevm_params.x509) +return sign_hash_v2 (hashalgo, hash, size, keyfile, sig); +#if CONFIG_SIGV1 + else + return sign_hash_v1(hashalgo, hash, size, keyfile, sig); +#endif +log_info ("Signature version 1 deprecated." ); +return -1 ; }static void libinit ()
tests/sign_verify.test +12 -6
@@ -17,6 +17,7 @@ cd "$(dirname "$0")" || exit 1 PATH=../src:$PATH +SIGV1=0 source ./functions.sh _require cmp evmctl getfattr openssl xxd
@@ -368,13 +369,18 @@ try_different_sigs() { ## Test v1 signatures # Signature v1 only supports sha1 and sha256 so any other should fail -expect_fail \ - check_sign TYPE=ima KEY=rsa1024 ALG=md5 PREFIX=0x0301 OPTS=--rsa +if [ $SIGV1 -eq 0 ]; then + __skip() { echo "IMA signature v1 tests are skipped: not supported"; return $SKIP; } + expect_pass __skip +else + expect_fail \ + check_sign TYPE=ima KEY=rsa1024 ALG=md5 PREFIX=0x0301 OPTS=--rsa -sign_verify rsa1024 sha1 0x0301 --rsa -sign_verify rsa1024 sha256 0x0301 --rsa - try_different_keys - try_different_sigs + sign_verify rsa1024 sha1 0x0301 --rsa + sign_verify rsa1024 sha256 0x0301 --rsa + try_different_keys + try_different_sigs +fi ## Test v2 signatures with RSA PKCS#1 # List of allowed hashes much greater but not all are supported.
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 4/15 Replace the low level SHA1 calls when calculating the TPM 1.2 PCRs
In reply to Mimi ZoharOpenSSL v3 emits deprecated warnings for SHA1 functions. Use the EVP_ functions when walking the TPM 1.2 binary bios measurements to calculate the TPM 1.2 PCRs.
--- src/evmctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 6 deletions(-)
src/evmctl.c +59 -6
@@ -2295,6 +2295,11 @@ static int cmd_ima_measurement(struct command *cmd)return ima_measurement (file); } +/* +* read_binary_bios_measurements - read the TPM 1.2 event log +* +* Returns 0 on success, 1 on failure. +*/ #define MAX_EVENT_DATA_SIZE 200000static int read_binary_bios_measurements (char *file,struct tpm_bank_info *bank) {
@@ -2307,12 +2312,19 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank) } header;unsigned char data[MAX_EVENT_DATA_SIZE ]; } event; +EVP_MD_CTX *mdctx; +const EVP_MD *md; +unsigned int mdlen; +int evp_err =1 ;/* success */ struct stat s;FILE *fp; -SHA_CTX c;int err =0 ;int len;int i; +#if OPENSSL_VERSION_NUMBER <0x10100000 +EVP_MD_CTX ctx; + mdctx = &ctx; +#endif if (stat (file, &s) ==-1 ) { errno =0 ;
@@ -2334,6 +2346,23 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank)if (imaevm_params.verbose >LOG_INFO )log_info ("Reading the TPM 1.2 event log %s.\n" , file); + md =EVP_get_digestbyname (bank->algo_name); +if (!md) { +log_errno ("Unknown message digest %s\n" , bank->algo_name); + errno =0 ; +fclose (fp); +return 1 ; + } + +#if OPENSSL_VERSION_NUMBER >=0x10100000 + mdctx =EVP_MD_CTX_new (); +if (!mdctx) { +log_err ("EVP_MD_CTX_new failed\n" ); +fclose (fp); +return 1 ; + } +#endif +/* Extend the pseudo TPM PCRs with the event digest */ while (fread (&event,sizeof (event.header),1 , fp) ==1 ) {if (imaevm_params.verbose >LOG_INFO ) {
@@ -2342,13 +2371,30 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank) }if (event.header.pcr >=NUM_PCRS ) {log_err ("Invalid PCR %d.\n" , event.header.pcr); - err =1 ;break ; } -SHA1_Init (&c); -SHA1_Update (&c, bank->pcr[event.header.pcr],20 ); -SHA1_Update (&c, event.header.digest,20 ); -SHA1_Final (bank->pcr[event.header.pcr], &c); + + evp_err =EVP_DigestInit (mdctx, md); +if (evp_err ==0 ) { +log_err ("EVP_DigestInit() failed\n" ); +break ; + } + + evp_err =EVP_DigestUpdate (mdctx, bank->pcr[event.header.pcr],20 ); +if (evp_err ==0 ) { +log_err ("EVP_DigestUpdate() failed\n" ); +break ; + } + evp_err =EVP_DigestUpdate (mdctx, event.header.digest,20 ); +if (evp_err ==0 ) { +log_err ("EVP_DigestUpdate() failed\n" ); +break ; + } + evp_err =EVP_DigestFinal (mdctx, bank->pcr[event.header.pcr], &mdlen); +if (evp_err ==0 ) { +log_err ("EVP_DigestFinal() failed\n" ); +break ; + }if (event.header.len >MAX_EVENT_DATA_SIZE ) {log_err ("Event data event too long.\n" ); err =1 ;
@@ -2357,10 +2403,17 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank) len =fread (event.data, event.header.len,1 , fp);if (len !=1 ) {log_errno ("Failed reading event data (short read)\n" ); + err =1 ;break ; } } + +if (evp_err ==0 )/* EVP_ functions return 1 on success, 0 on failure */ + err =1 ;fclose (fp); +#if OPENSSL_VERSION_NUMBER >=0x10100000 +EVP_MD_CTX_free (mdctx); +#endif if (imaevm_params.verbose <=LOG_INFO )return err;
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 5/15 Replace the low level HMAC calls when calculating the EVM HMAC
In reply to Mimi ZoharCalculating the EVM HMAC and labeling the filesystem was originally included in ima-evm-utils for debugging purposes only. For now, instead of removing EVM HMAC support just replace the low level HMAC_ calls with EVP_ calls.
The '-a, --hashalgo' specifies the IMA hash or signature algorithm. The kernel EVM HMAC is limited to SHA1. Fix ima-evm-utils by hard coding the EVM HMAC algorithm to SHA1.
--- src/evmctl.c | 58 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 25 deletions(-)
src/evmctl.c +33 -25
@@ -61,6 +61,7 @@#include <openssl/asn1.h> #include <openssl/sha.h> #include <openssl/pem.h> +#include <openssl/evp.h> #include <openssl/hmac.h> #include <openssl/err.h> #include <openssl/rsa.h>
@@ -1159,12 +1160,12 @@ static int cmd_setxattr_ima(struct command *cmd)static int calc_evm_hmac (const char *file,const char *keyfile,unsigned char *hash) { -const EVP_MD *md; +size_t mdlen; +EVP_MD_CTX *pctx; +EVP_PKEY *pkey =NULL ;struct stat st;int err =-1 ;uint32_t generation =0 ; -HMAC_CTX *pctx; -unsigned int mdlen;char **xattrname;unsigned char xattr_value[1024 ];unsigned char *key;
@@ -1175,10 +1176,8 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *hstruct h_misc_64 hmac_misc;int hmac_size;#if OPENSSL_VERSION_NUMBER <0x10100000 -HMAC_CTX ctx; +EVP_MD_CTX ctx; pctx = &ctx; -#else - pctx =HMAC_CTX_new ();#endif key =file2bin (keyfile,NULL , &keylen);
@@ -1226,19 +1225,26 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *h goto out; } - md =EVP_get_digestbyname (imaevm_params.hash_algo); -if (!md) { -log_err ("EVP_get_digestbyname(%s) failed\n" , - imaevm_params.hash_algo); +#if OPENSSL_VERSION_NUMBER >=0x10100000 + pctx =EVP_MD_CTX_new (); +if (!pctx) { +log_err ("EVP_MD_CTX_new failed\n" ); goto out; } +#endif - err = !HMAC_Init_ex (pctx, evmkey,sizeof (evmkey), md,NULL ); -if (err) { + pkey =EVP_PKEY_new_mac_key (EVP_PKEY_HMAC ,NULL , evmkey,sizeof (evmkey)); +if (!pkey) {log_err ("HMAC_Init() failed\n" ); goto out; } + err =EVP_DigestSignInit (pctx,NULL ,EVP_sha1 (),NULL , pkey); +if (err !=1 ) { +log_err ("EVP_DigestSignInit() failed\n" ); + goto out; + } +for (xattrname = evm_config_xattrnames; *xattrname !=NULL ; xattrname++) { err =lgetxattr (file, *xattrname, xattr_value,sizeof (xattr_value));if (err <0 ) {
@@ -1249,12 +1255,12 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *hlog_info ("skipping xattr: %s\n" , *xattrname);continue ; } -/*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 (pctx, xattr_value, err); -if (err) { -log_err ("HMAC_Update() failed\n" ); + + err =EVP_DigestSignUpdate (pctx, xattr_value, err); +if (err !=1 ) { +log_err ("EVP_DigestSignUpdate() failed\n" ); goto out_ctx_cleanup; } }
@@ -1293,23 +1299,24 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *hlog_debug ("hmac_misc (%d): " , hmac_size);log_debug_dump (&hmac_misc, hmac_size); - err = !HMAC_Update (pctx, (const unsigned char *)&hmac_misc, hmac_size); -if (err) { + err =EVP_DigestSignUpdate (pctx, &hmac_misc, hmac_size); +if (err !=1 ) {log_err ("HMAC_Update() failed\n" ); goto out_ctx_cleanup; } - err = !HMAC_Final (pctx, hash, &mdlen); -if (err) + err =EVP_DigestSignFinal (pctx, hash, &mdlen); +if (err !=1 )log_err ("HMAC_Final() failed\n" ); out_ctx_cleanup: -#if OPENSSL_VERSION_NUMBER <0x10100000 -HMAC_CTX_cleanup (pctx); -#else -HMAC_CTX_free (pctx); +EVP_PKEY_free (pkey); +#if OPENSSL_VERSION_NUMBER >=0x10100000 +EVP_MD_CTX_free (pctx);#endif out:free (key); -return err ?: mdlen; +if (err ==1 ) +return mdlen; +return err; }static int hmac_evm (const char *file,const char *key)
@@ -1333,6 +1340,7 @@ static int hmac_evm(const char *file, const char *key) err =lsetxattr (file, xattr_evm, sig, len +1 ,0 );if (err <0 ) {log_err ("setxattr failed: %s\n" , file); + errno =0 ;return err; } }
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 6/15 Add missing EVP_MD_CTX_free() call in calc_evm_hash()
In reply to Mimi ZoharWhen EVP_MD_CTX_new() call was added, the corresponding EVP_MD_CTX_free() was never called. Properly free it.
--- src/evmctl.c | 57 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 17 deletions(-)
src/evmctl.c +40 -17
@@ -332,11 +332,17 @@ err:return -1 ; } +/* +* calc_evm_hash - calculate the file metadata hash +* +* Returns 0 for EVP_ function failures. Return -1 for other failures. +* Return hash algorithm size on success. +*/ static int calc_evm_hash (const char *file,unsigned char *hash) {const EVP_MD *md;struct stat st; -int err; +int err =-1 ;uint32_t generation =0 ;EVP_MD_CTX *pctx;unsigned int mdlen;
@@ -350,12 +356,11 @@ static int calc_evm_hash(const char *file, unsigned char *hash)#if OPENSSL_VERSION_NUMBER <0x10100000 EVP_MD_CTX ctx; pctx = &ctx; -#else - pctx =EVP_MD_CTX_new ();#endif if (lstat (file, &st)) {log_err ("Failed to stat: %s\n" , file); + errno =0 ;return -1 ; }
@@ -392,20 +397,30 @@ static int calc_evm_hash(const char *file, unsigned char *hash) list_size =llistxattr (file, list,sizeof (list));if (list_size <0 ) {log_err ("llistxattr() failed\n" ); + errno =0 ;return -1 ; } +#if OPENSSL_VERSION_NUMBER >=0x10100000 + pctx =EVP_MD_CTX_new (); +if (!pctx) { +log_err ("EVP_MD_CTX_new() failed\n" ); +return 0 ; + } +#endif + md =EVP_get_digestbyname (imaevm_params.hash_algo);if (!md) {log_err ("EVP_get_digestbyname(%s) failed\n" , imaevm_params.hash_algo); -return 1 ; + err =0 ; + goto out; } err =EVP_DigestInit (pctx, md);if (!err) {log_err ("EVP_DigestInit() failed\n" ); -return 1 ; + goto out; }for (xattrname = evm_config_xattrnames; *xattrname !=NULL ; xattrname++) {
@@ -416,7 +431,8 @@ static int calc_evm_hash(const char *file, unsigned char *hash)if (err >sizeof (xattr_value)) {log_err ("selinux[%u] value is too long to fit into xattr[%zu]\n" , err,sizeof (xattr_value)); -return -1 ; + err =-1 ; + goto out; }strcpy (xattr_value, selinux_str); }else if (!strcmp (*xattrname,XATTR_NAME_IMA ) && ima_str) {
@@ -424,7 +440,8 @@ static int calc_evm_hash(const char *file, unsigned char *hash)if (err >sizeof (xattr_value)) {log_err ("ima[%u] value is too long to fit into xattr[%zu]\n" , err,sizeof (xattr_value)); -return -1 ; + err =-1 ; + goto out; }hex2bin (xattr_value, ima_str, err); }else if (!strcmp (*xattrname,XATTR_NAME_IMA ) && evm_portable){
@@ -433,7 +450,7 @@ static int calc_evm_hash(const char *file, unsigned char *hash)if (err <0 ) {log_err ("EVM portable sig: %s required\n" , xattr_ima); -return -1 ; + goto out; } use_xattr_ima =1 ; }else if (!strcmp (*xattrname,XATTR_NAME_CAPS ) && (hmac_flags &HMAC_FLAG_CAPS_SET )) {
@@ -443,7 +460,8 @@ static int calc_evm_hash(const char *file, unsigned char *hash)if (err >=sizeof (xattr_value)) {log_err ("caps[%u] value is too long to fit into xattr[%zu]\n" , err +1 ,sizeof (xattr_value)); -return -1 ; + err =-1 ; + goto out; }strcpy (xattr_value, caps_str); }else {
@@ -464,7 +482,7 @@ static int calc_evm_hash(const char *file, unsigned char *hash) err =EVP_DigestUpdate (pctx, xattr_value, err);if (!err) {log_err ("EVP_DigestUpdate() failed\n" ); -return 1 ; + goto out; } }
@@ -518,29 +536,33 @@ static int calc_evm_hash(const char *file, unsigned char *hash) err =EVP_DigestUpdate (pctx, &hmac_misc, hmac_size);if (!err) {log_err ("EVP_DigestUpdate() failed\n" ); -return 1 ; + goto out; }if (!evm_immutable && !evm_portable && !(hmac_flags &HMAC_FLAG_NO_UUID )) { err =get_uuid (&st, uuid);if (err) -return -1 ; + goto out; err =EVP_DigestUpdate (pctx, (const unsigned char *)uuid,sizeof (uuid));if (!err) {log_err ("EVP_DigestUpdate() failed\n" ); -return 1 ; + goto out; } } err =EVP_DigestFinal (pctx, hash, &mdlen); -if (!err) { +if (!err)log_err ("EVP_DigestFinal() failed\n" ); -return 1 ; - } -return mdlen; +out: +#if OPENSSL_VERSION_NUMBER >=0x10100000 +EVP_MD_CTX_free (pctx); +#endif +if (err ==1 ) +return mdlen; +return err; }static int sign_evm (const char *file,const char *key)
@@ -576,6 +598,7 @@ static int sign_evm(const char *file, const char *key) err =lsetxattr (file, xattr_evm, sig, len,0 );if (err <0 ) {log_err ("setxattr failed: %s\n" , file); + errno =0 ;return err; } }
Signature · 1 line
2.31.1
Re: [PATCH ima-evm-utils v3 06/15] Add missing EVP_MD_CTX_free() call in calc_evm_hash()
Mimi,
Quoted 35 lines · Mimi Zohar
When
EVP_MD_CTX_new()call was added, the correspondingEVP_MD_CTX_free()was never called. Properly free it.Fixes 81010f0d87ef ("ima-evm-utils: Add backward compatible support for openssl 1.1")Reviewed-by Petr Vorel <[email protected]>Reviewed-by Stefan Berger <[email protected]>Signed-off-by Mimi Zohar <[email protected]>--- src/evmctl.c | 57 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 17 deletions(-)src/evmctl.c +7
-1@@ -332,11 +332,17 @@ err:return -1 ; } +/* +* calc_evm_hash - calculate the file metadata hash +* +* Returns 0 for EVP_ function failures. Return -1 for other failures. +* Return hash algorithm size on success. +*/ static int calc_evm_hash (const char *file,unsigned char *hash) {const EVP_MD *md;struct stat st; -int err; +int err =-1 ;uint32_t generation =0 ;EVP_MD_CTX *pctx;unsigned int mdlen;
src/evmctl.c static int calc_evm_hash(const char *file, unsigned char *hash) · line 363
Quoted 10 lines
src/evmctl.c +1
-2@@ -350,12 +356,11 @@ static int calc_evm_hash(const char *file, unsigned char *hash)#if OPENSSL_VERSION_NUMBER <0x10100000 EVP_MD_CTX ctx; pctx = &ctx; -#else - pctx =EVP_MD_CTX_new ();#endif if (lstat (file, &st)) {log_err ("Failed to stat: %s\n" , file); + errno =0 ;
Why it clears errno (here and below)?
errno(3) says "The value of errno is never set to zero by any system call or library function."
Thanks,
Quoted 135 lines
src/evmctl.c +32
-14return -1 ; }@@ -392,20 +397,30 @@ static int calc_evm_hash(const char *file, unsigned char *hash) list_size =llistxattr (file, list,sizeof (list));if (list_size <0 ) {log_err ("llistxattr() failed\n" ); + errno =0 ;return -1 ; } +#if OPENSSL_VERSION_NUMBER >=0x10100000 + pctx =EVP_MD_CTX_new (); +if (!pctx) { +log_err ("EVP_MD_CTX_new() failed\n" ); +return 0 ; + } +#endif + md =EVP_get_digestbyname (imaevm_params.hash_algo);if (!md) {log_err ("EVP_get_digestbyname(%s) failed\n" , imaevm_params.hash_algo); -return 1 ; + err =0 ; + goto out; } err =EVP_DigestInit (pctx, md);if (!err) {log_err ("EVP_DigestInit() failed\n" ); -return 1 ; + goto out; }for (xattrname = evm_config_xattrnames; *xattrname !=NULL ; xattrname++) {@@ -416,7 +431,8 @@ static int calc_evm_hash(const char *file, unsigned char *hash)if (err >sizeof (xattr_value)) {log_err ("selinux[%u] value is too long to fit into xattr[%zu]\n" , err,sizeof (xattr_value)); -return -1 ; + err =-1 ; + goto out; }strcpy (xattr_value, selinux_str); }else if (!strcmp (*xattrname,XATTR_NAME_IMA ) && ima_str) {@@ -424,7 +440,8 @@ static int calc_evm_hash(const char *file, unsigned char *hash)if (err >sizeof (xattr_value)) {log_err ("ima[%u] value is too long to fit into xattr[%zu]\n" , err,sizeof (xattr_value)); -return -1 ; + err =-1 ; + goto out; }hex2bin (xattr_value, ima_str, err); }else if (!strcmp (*xattrname,XATTR_NAME_IMA ) && evm_portable){@@ -433,7 +450,7 @@ static int calc_evm_hash(const char *file, unsigned char *hash)if (err <0 ) {log_err ("EVM portable sig: %s required\n" , xattr_ima); -return -1 ; + goto out; } use_xattr_ima =1 ; }else if (!strcmp (*xattrname,XATTR_NAME_CAPS ) && (hmac_flags &HMAC_FLAG_CAPS_SET )) {@@ -443,7 +460,8 @@ static int calc_evm_hash(const char *file, unsigned char *hash)if (err >=sizeof (xattr_value)) {log_err ("caps[%u] value is too long to fit into xattr[%zu]\n" , err +1 ,sizeof (xattr_value)); -return -1 ; + err =-1 ; + goto out; }strcpy (xattr_value, caps_str); }else {@@ -464,7 +482,7 @@ static int calc_evm_hash(const char *file, unsigned char *hash) err =EVP_DigestUpdate (pctx, xattr_value, err);if (!err) {log_err ("EVP_DigestUpdate() failed\n" ); -return 1 ; + goto out; } }@@ -518,29 +536,33 @@ static int calc_evm_hash(const char *file, unsigned char *hash) err =EVP_DigestUpdate (pctx, &hmac_misc, hmac_size);if (!err) {log_err ("EVP_DigestUpdate() failed\n" ); -return 1 ; + goto out; }if (!evm_immutable && !evm_portable && !(hmac_flags &HMAC_FLAG_NO_UUID )) { err =get_uuid (&st, uuid);if (err) -return -1 ; + goto out; err =EVP_DigestUpdate (pctx, (const unsigned char *)uuid,sizeof (uuid));if (!err) {log_err ("EVP_DigestUpdate() failed\n" ); -return 1 ; + goto out; } } err =EVP_DigestFinal (pctx, hash, &mdlen); -if (!err) { +if (!err)log_err ("EVP_DigestFinal() failed\n" ); -return 1 ; - } -return mdlen; +out: +#if OPENSSL_VERSION_NUMBER >=0x10100000 +EVP_MD_CTX_free (pctx); +#endif +if (err ==1 ) +return mdlen; +return err; }static int sign_evm (const char *file,const char *key)@@ -576,6 +598,7 @@ static int sign_evm(const char *file, const char *key) err =lsetxattr (file, xattr_evm, sig, len,0 );if (err <0 ) {log_err ("setxattr failed: %s\n" , file); + errno =0 ;return err; } }Signature · 1 line
2.31.1
Mimi Zohar
maintainerRe: [PATCH ima-evm-utils v3 06/15] Add missing EVP_MD_CTX_free() call in calc_evm_hash()
Hi Vitaly,
Thank you for this and the other reviews. They'll be addressed in the next version.
Quoted 8 lines · Vitaly Chikunov
Quoted 8 lines
src/evmctl.c +0
-2@@ -350,12 +356,11 @@ static int calc_evm_hash(const char *file, unsigned char *hash)#if OPENSSL_VERSION_NUMBER <0x10100000 EVP_MD_CTX ctx; pctx = &ctx; -#else - pctx =EVP_MD_CTX_new ();#endif
Quoted 8 lines
src/evmctl.c static int calc_evm_hash(const char *file, unsigned char *hash) · line 363
Quoted 3 lines
src/evmctl.c +1
-0if (lstat (file, &st)) {log_err ("Failed to stat: %s\n" , file); + errno =0 ;Why it clears errno (here and below)?
errno(3) says "The value of errno is never set to zero by any system call or library function."
evmctl, itself, is not a system call or a library function. Is this a generic statement or here in particular as to how evmctl should handle
failed system calls? Another example is reading the keyfile. The
existence of which is not required.
thanks,
Mimi
Re: [PATCH ima-evm-utils v3 06/15] Add missing EVP_MD_CTX_free() call in calc_evm_hash()
Quoted 20 lines · Mimi Zohar
Hi Vitaly,
Thank you for this and the other reviews. They'll be addressed in the next version.
Quoted 14 lines · Vitaly Chikunov
src/evmctl.c static int calc_evm_hash(const char *file, unsigned char *hash) · line 363
Quoted 11 lines
src/evmctl.c +1
-2@@ -350,12 +356,11 @@ static int calc_evm_hash(const char *file, unsigned char *hash)#if OPENSSL_VERSION_NUMBER <0x10100000 EVP_MD_CTX ctx; pctx = &ctx; -#else - pctx =EVP_MD_CTX_new ();#endif if (lstat (file, &st)) {log_err ("Failed to stat: %s\n" , file); + errno =0 ;Why it clears errno (here and below)?
Quoted 4 lines
Quoted 2 lines
errno(3) says "The value of errno is never set to zero by any system call or library function."
evmctl, itself, is not a system call or a library function.
Ah, I wasn't attentive this is only evmctl. [But there's similar commit acb19d1 ("Reset 'errno' after failure to open or access a file") changing libimaevm.c which is wrong.]
Perhaps it should be noted in commit message that errno is cleared because it's error message is already printed to avoid double printing at exit of cmd handler.
Quoted 4 lines
Is this a
generic statement or here in particular as to how evmctl should handle
failed system calls? Another example is reading the keyfile. The
existence of which is not required.
log_err("Failed to stat: %s\n", file);This does not even output errno code, but it could be very informative to user. I think it's better to print (at least errno or) strerror for users there (and on other syscall errors log_err instances.
Maybe to add special log function (like log_strerr) just for evmctl which will print (non "\n"-terminated) error message (similar to warn(3)) with strerror output appended (and commented in the code why it) clears errno (so that later handlers do not print it again).
ps. About libimaevm.c--I think errno should not be touched there as this breaks what coders expect from libraries. If this affects exit of evmctl then it should be handled in evmctl, not in the library. (Of course it's better to add strerror(errno) to log_err there too, but not by the proposed above function.)
Vitaly,
Quoted 5 lines
thanks,
Mimi
Mimi Zohar
maintainerRe: [PATCH ima-evm-utils v3 06/15] Add missing EVP_MD_CTX_free() call in calc_evm_hash()
Quoted 50 lines · Vitaly Chikunov
Quoted 20 lines · Mimi Zohar
Hi Vitaly,
Thank you for this and the other reviews. They'll be addressed in the next version.
Quoted 14 lines · Vitaly Chikunov
src/evmctl.c static int calc_evm_hash(const char *file, unsigned char *hash) · line 363
Quoted 11 lines
src/evmctl.c +1
-2@@ -350,12 +356,11 @@ static int calc_evm_hash(const char *file, unsigned char *hash)#if OPENSSL_VERSION_NUMBER <0x10100000 EVP_MD_CTX ctx; pctx = &ctx; -#else - pctx =EVP_MD_CTX_new ();#endif if (lstat (file, &st)) {log_err ("Failed to stat: %s\n" , file); + errno =0 ;Why it clears errno (here and below)?
Quoted 4 lines
Quoted 2 lines
errno(3) says "The value of errno is never set to zero by any system call or library function."
evmctl, itself, is not a system call or a library function.
Ah, I wasn't attentive this is only evmctl. [But there's similar commit acb19d1 ("Reset 'errno' after failure to open or access a file") changing
libimaevm.cwhich is wrong.]Perhaps it should be noted in commit message that errno is cleared because it's error message is already printed to avoid double printing at exit of cmd handler.
Quoted 4 lines
Is this a
generic statement or here in particular as to how evmctl should handle
failed system calls? Another example is reading the keyfile. The
existence of which is not required.log_err("Failed to stat: %s\n", file);This does not even output errno code, but it could be very informative to user. I think it's better to print (at least errno or) strerror for users there (and on other syscall errors
log_errinstances.Maybe to add special log function (like
log_strerr) just for evmctl which will print (non "\n"-terminated) error message (similar to warn(3)) with strerror output appended (and commented in the code why it) clears errno (so that later handlers do not print it again).
Quoted 5 lines
ps. About libimaevm.c--I think errno should not be touched there as this breaks what coders expect from libraries. If this affects exit of evmctl then it should be handled in evmctl, not in the library. (Of course it's better to add strerror(errno) to
log_errthere too, but not by the proposed above function.)
Thank you for the suggestions. log_errno() is already defined. Not sure how I missed that. So use log_errno() in libimaevm.c. For evmctl.c, define a wrapper named log_and_reset_errno(), with your suggested patch description.
Since none of the changes in next-testing have been released, they can still be fixed/squashed as needed.
thanks!
Mimi
Mimi Zohar
maintainerPATCH v3 7/15 Disable use of OpenSSL "engine" support
In reply to Mimi ZoharOpenSSL v3 "engine" support is deprecated and replaced with "providers". Engine support will continue to work for a while, but results in deprecated declaration and other messages. One option is simply to hide them ("-Wno-deprecated-declarations"). The other alternative is to conditionally build ima-evm-utils without OpenSSL engine support and without disabling deprecated declarations.
Based on "--disable-engine" or "--enable-engine=no" configuration option, disable OpenSSL "engine" support.
--- configure.ac | 5 +++++ src/Makefile.am | 8 ++++++++ src/evmctl.c | 17 ++++++++++++++++- src/imaevm.h | 2 ++ src/libimaevm.c | 7 ++++++- tests/functions.sh | 2 +- tests/ima_hash.test | 1 + tests/sign_verify.test | 1 + 8 files changed, 40 insertions(+), 3 deletions(-)
configure.ac +5 -0
@@ -54,6 +54,10 @@ AC_ARG_ENABLE(sigv1, AM_CONDITIONAL([CONFIG_SIGV1], [test "x$enable_sigv1" = "xyes"]) AS_IF([test "$enable_sigv1" != "yes"], [enable_sigv1="no"]) +AC_ARG_ENABLE(engine, + [AS_HELP_STRING([--disable-engine], [build ima-evm-utils without OpenSSL engine support])],,[enable_engine=yes]) + AM_CONDITIONAL([CONFIG_ENGINE], [test "x$enable_engine" = "xyes"]) + #debug support - yes for a while PKG_ARG_ENABLE(debug, "yes", DEBUG, [Enable Debug support]) if test $pkg_cv_enable_debug = yes; then
@@ -89,5 +93,6 @@ echo " tss2-esys: $ac_cv_lib_tss2_esys_Esys_Free" echo " tss2-rc-decode: $ac_cv_lib_tss2_rc_Tss2_RC_Decode" echo " ibmtss: $ac_cv_header_ibmtss_tss_h" echo " sigv1: $enable_sigv1" +echo " engine: $enable_engine" echo " doc: $have_doc" echo
src/Makefile.am +8 -0
@@ -11,6 +11,10 @@ if CONFIG_SIGV1 libimaevm_la_CFLAGS = -DCONFIG_SIGV1 endif +if CONFIG_ENGINE +libimaevm_la_CFLAGS = -DCONFIG_ENGINE +endif + include_HEADERS = imaevm.h nodist_libimaevm_la_SOURCES = hash_info.h
@@ -31,6 +35,10 @@ if CONFIG_SIGV1 evmctl_CFLAGS = -DCONFIG_SIGV1 endif +# Enable "--engine" support +if CONFIG_ENGINE +evmctl_CFLAGS = -DCONFIG_ENGINE +endif # USE_PCRTSS uses the Intel TSS if USE_PCRTSS
src/evmctl.c +16 -1
@@ -65,7 +65,9 @@#include <openssl/hmac.h> #include <openssl/err.h> #include <openssl/rsa.h> +#if CONFIG_ENGINE #include <openssl/engine.h> +#endif #include <openssl/x509v3.h> #include "hash_info.h" #include "pcr.h"
@@ -2716,7 +2718,9 @@ static void usage(void) " --selinux use custom Selinux label for EVM\n" " --caps use custom Capabilities for EVM(unspecified: from FS, empty: do not use)\n" " --verify-sig verify measurement list signatures\n" -" --engine e preload OpenSSL engine e (such as: gost)\n" +#if CONFIG_ENGINE + " --engine e preload OpenSSL engine e (such as: gost) is deprecated\n" +#endif" --ignore-violations ignore ToMToU measurement violations\n" " -v increase verbosity level\n" " -h, --help display this help and exit\n"
@@ -2778,7 +2782,9 @@ static struct option opts[] = { {"selinux", 1, 0, 136}, {"caps", 2, 0, 137}, {"verify-sig", 0, 0, 138}, +#if CONFIG_ENGINE {"engine", 1, 0, 139}, +#endif {"xattr-user", 0, 0, 140}, {"ignore-violations", 0, 0, 141}, {"pcrs", 1, 0, 142},
@@ -2831,9 +2837,11 @@ static char *get_password(void)return password; } +#if CONFIG_ENGINE static ENGINE *setup_engine (const char *engine_id) {ENGINE *eng =ENGINE_by_id (engine_id); +if (!eng) {log_err ("engine %s isn't available\n" , optarg);ERR_print_errors_fp (stderr);
@@ -2847,6 +2855,7 @@ static ENGINE *setup_engine(const char *engine_id)ENGINE_set_default (eng,ENGINE_METHOD_ALL ); return eng; } +#endif int main (int argc,char *argv[]) {
@@ -2972,11 +2981,13 @@ int main(int argc, char *argv[])case 138 : verify_list_sig =1 ;break ; +#if CONFIG_ENGINE case 139 :/* --engine e */ imaevm_params.eng =setup_engine (optarg);if (!imaevm_params.eng) goto error;break ; +#endif case 140 :/* --xattr-user */ xattr_ima ="user.ima" ; xattr_evm ="user.evm" ;
@@ -3035,7 +3046,9 @@ int main(int argc, char *argv[])if (imaevm_params.keyfile !=NULL && imaevm_params.eng ==NULL && !strncmp (imaevm_params.keyfile,"pkcs11:" ,7 )) { +#if CONFIG_ENGINE imaevm_params.eng =setup_engine ("pkcs11" ); +#endif if (!imaevm_params.eng) goto error; }
@@ -3061,6 +3074,7 @@ int main(int argc, char *argv[]) } error: +#if CONFIG_ENGINE if (imaevm_params.eng) {ENGINE_finish (imaevm_params.eng);ENGINE_free (imaevm_params.eng);
@@ -3068,6 +3082,7 @@ error:ENGINE_cleanup (); #endif } +#endif ERR_free_strings ();EVP_cleanup ();BIO_free (NULL );
src/imaevm.h +2 -0
@@ -48,7 +48,9 @@#include <errno.h> #include <sys/types.h> #include <openssl/rsa.h> +#ifdef CONFIG_ENGINE #include <openssl/engine.h> +#endif #ifdef USE_FPRINTF #define do_log(level, fmt, args...) \
src/libimaevm.c +6 -1
@@ -956,9 +956,10 @@ uint32_t imaevm_read_keyid(const char *certfile)static EVP_PKEY *read_priv_pkey (const char *keyfile,const char *keypass) {FILE *fp; -EVP_PKEY *pkey; +EVP_PKEY *pkey =NULL ;if (!strncmp (keyfile,"pkcs11:" ,7 )) { +#ifdef CONFIG_ENGINE if (!imaevm_params.keyid) {log_err ("When using a pkcs11 URI you must provide the keyid with an option\n" );return NULL ;
@@ -975,6 +976,10 @@ static EVP_PKEY *read_priv_pkey(const char *keyfile, const char *keypass)log_err ("Failed to load private key %s\n" , keyfile); goto err_engine; } +#else +log_err ("OpenSSL \"engine\" support is disabled\n" ); + goto err_engine; +#endif }else { fp =fopen (keyfile,"r" );if (!fp) {
tests/functions.sh +1 -1
@@ -312,4 +312,4 @@ _softhsm_teardown() { rm -rf "${SOFTHSM_SETUP_CONFIGDIR}" unset SOFTHSM_SETUP_CONFIGDIR SOFTHSM2_CONF PKCS11_KEYURI \ EVMCTL_ENGINE OPENSSL_ENGINE OPENSSL_KEYFORM -} +}
tests/ima_hash.test +1 -0
@@ -71,6 +71,7 @@ expect_pass check sha384 0x0405 38b060a751ac96384cd9327eb1b1e36a21fdb71114b expect_pass check sha512 0x0406 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e expect_pass check rmd160 0x0403 9c1185a5c5e9fc54612808977ee8f548b2258d31 expect_pass check sm3 0x0411 1ab21d8355cfa17f8e61194831e81a8f22bec8c728fefb747ed035eb5082aa2b + _enable_gost_engine expect_pass check md_gost12_256 0x0412 3f539a213e97c802cc229d474c6aa32a825a360b2a933a949fd925208d9ce1bb expect_pass check streebog256 0x0412 3f539a213e97c802cc229d474c6aa32a825a360b2a933a949fd925208d9ce1bb
tests/sign_verify.test +1 -0
@@ -18,6 +18,7 @@ cd "$(dirname "$0")" || exit 1 PATH=../src:$PATH SIGV1=0 + source ./functions.sh _require cmp evmctl getfattr openssl xxd
Signature · 1 line
2.31.1
Re: [PATCH ima-evm-utils v3 07/15] Disable use of OpenSSL "engine" support
Quoted 27 lines · Mimi Zohar
OpenSSL v3 "engine" support is deprecated and replaced with "providers". Engine support will continue to work for a while, but results in deprecated declaration and other messages. One option is simply to hide them ("-Wno-deprecated-declarations"). The other alternative is to conditionally build ima-evm-utils without OpenSSL engine support and without disabling deprecated declarations.
Based on "--disable-engine" or "--enable-engine=no" configuration option, disable OpenSSL "engine" support.
Signed-off-by Mimi Zohar <[email protected]>--- configure.ac | 5 +++++ src/Makefile.am | 8 ++++++++ src/evmctl.c | 17 ++++++++++++++++- src/imaevm.h | 2 ++ src/libimaevm.c | 7 ++++++- tests/functions.sh | 2 +- tests/ima_hash.test | 1 + tests/sign_verify.test | 1 + 8 files changed, 40 insertions(+), 3 deletions(-)configure.ac +0
-0
configure.ac AC_ARG_ENABLE(sigv1, · line 58
Quoted 5 lines
configure.ac +2
-0@@ -54,6 +54,10 @@ AC_ARG_ENABLE(sigv1, AM_CONDITIONAL([CONFIG_SIGV1], [test "x$enable_sigv1" = "xyes"]) AS_IF([test "$enable_sigv1" != "yes"], [enable_sigv1="no"]) +AC_ARG_ENABLE(engine, + [AS_HELP_STRING([--disable-engine], [build ima-evm-utils without OpenSSL engine support])],,[enable_engine=yes])
I would insert here:
AC_CHECK_LIB([crypto], [ENGINE_init],, [enable_engine=no])
So that if -lcrypto does not have ENGINE_init symbol, engine will be automatically disabled.
configure.ac int main(int argc, char *argv[]) · line 2988
Quoted 9 lines
configure.ac +1
-0@@ -2972,11 +2981,13 @@ int main(int argc, char *argv[]) case 138: verify_list_sig = 1; break; +#if CONFIG_ENGINE case 139: /* --engine e */ imaevm_params.eng = setup_engine(optarg); if (!imaevm_params.eng) goto error;
Still it's a bit strange that this error will not cause exit(1).
Thanks,
Quoted 31 lines
configure.ac +5
-0break; +#endif case 140: /* --xattr-user */ xattr_ima = "user.ima"; xattr_evm = "user.evm";@@ -3035,7 +3046,9 @@ int main(int argc, char *argv[]) if (imaevm_params.keyfile != NULL && imaevm_params.eng == NULL && !strncmp(imaevm_params.keyfile, "pkcs11:", 7)) { +#if CONFIG_ENGINE imaevm_params.eng = setup_engine("pkcs11"); +#endif if (!imaevm_params.eng) goto error; }@@ -3061,6 +3074,7 @@ int main(int argc, char *argv[]) } error: +#if CONFIG_ENGINE if (imaevm_params.eng) { ENGINE_finish(imaevm_params.eng); ENGINE_free(imaevm_params.eng);@@ -3068,6 +3082,7 @@ error: ENGINE_cleanup(); #endif } +#endif ERR_free_strings(); EVP_cleanup(); BIO_free(NULL);
Mimi Zohar
maintainerPATCH v3 8/15 Fix potential use after free in read_tpm_banks()
In reply to Mimi ZoharOn failure to read TPM 2.0 bank PCRs 'errmsg' is not properly set to NULL after being freed. Fix potential use after free.
--- src/evmctl.c | 1 + 1 file changed, 1 insertion(+)
src/evmctl.c +1 -0
@@ -2076,6 +2076,7 @@ static int read_tpm_banks(int num_banks, struct tpm_bank_info *bank)log_debug ("Failed to read %s PCRs: (%s)\n" , bank[i].algo_name, errmsg);free (errmsg); + errmsg =NULL ; bank[i].supported =0 ; } }
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 9/15 Limit the file hash algorithm name length
In reply to Mimi ZoharInstead of assuming the file hash algorithm is a properly NULL terminated string, properly limit the "algo:<hash>" field size.
--- src/evmctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/evmctl.c +1 -1
@@ -1603,7 +1603,7 @@ void ima_ng_show(struct template_entry *entry) total_len -=sizeof (field_len); algo = (char *)fieldp; - len =strlen (algo) +1 ; + len =strnlen (algo, field_len -1 ) +1 ; digest_len = field_len - len; digest = fieldp + len;
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 10/15 Missing template data size lower bounds checking
In reply to Mimi ZoharEach record in the IMA measurement list must contain some template data. Ensure the template data is not zero length.
--- src/evmctl.c | 4 ++++ 1 file changed, 4 insertions(+)
src/evmctl.c +4 -0
@@ -2189,6 +2189,10 @@ static int ima_measurement(const char *file)log_err ("Unable to read template length\n" ); goto out; } +if (entry.template_len ==0 ) { +log_err ("Invalid template data len\n" ); + goto out; + } }else { entry.template_len =SHA_DIGEST_LENGTH +TCG_EVENT_NAME_LEN_MAX +1 ;
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 11/15 Limit configuring OpenSSL engine support
In reply to Mimi ZoharIf either OPENSSL_NO_DYNAMIC_ENGINE or OPENSSL_NO_ENGINE is defined, ima-evm-utils cannot be built with OpenSSL engine support. Disable engine support.
--- src/imaevm.h | 4 ++++ 1 file changed, 4 insertions(+)
src/imaevm.h +4 -0
@@ -52,6 +52,10 @@#include <openssl/engine.h> #endif +#if defined(OPENSSL_NO_ENGINE ) || defined(OPENSSL_NO_DYNAMIC_ENGINE ) +#undef CONFIG_ENGINE +#endif +#ifdef USE_FPRINTF #define do_log(level, fmt, args...) \ ({ if (level <= imaevm_params.verbose) fprintf(stderr, fmt, ##args); })
Signature · 1 line
2.31.1
Re: [PATCH ima-evm-utils v3 11/15] Limit configuring OpenSSL engine support
Quoted 16 lines · Mimi Zohar
If either
OPENSSL_NO_DYNAMIC_ENGINEorOPENSSL_NO_ENGINEis defined, ima-evm-utils cannot be built with OpenSSL engine support. Disable engine support.Suggested-by Vitaly Chikunov <[email protected]>Fixes 9e08e4495f24 ("Disable use of OpenSSL "engine" support")Signed-off-by Mimi Zohar <[email protected]>--- src/imaevm.h | 4 ++++ 1 file changed, 4 insertions(+)src/imaevm.h +0
-0
src/imaevm.h line 57
Quoted 6 lines
src/imaevm.h +3
-0@@ -52,6 +52,10 @@#include <openssl/engine.h> #endif +#if defined(OPENSSL_NO_ENGINE ) || defined(OPENSSL_NO_DYNAMIC_ENGINE ) +#undef CONFIG_ENGINE +#endif
Thanks.
Only better it would be to make it prefixed with something like IMA_EVN_, since CONFIG_ENGINE looks too generic (and we cannot move it outside of imaevm.h). And perhaps merge this patch with "Disable use of OpenSSL "engine" support"?
Vitaly,
Quoted 6 lines
src/imaevm.h +1
-0+#ifdef USE_FPRINTF #define do_log(level, fmt, args...) \ ({ if (level <= imaevm_params.verbose) fprintf(stderr, fmt, ##args); })Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 12/15 Base sm2/sm3 test on openssl version installed
In reply to Mimi ZoharSince the distros are now shipping with OpenSSL 3, no need to build it. Limit the sm2/sm3 test to OpenSSL 3.
--- tests/sign_verify.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/sign_verify.test +2 -2
@@ -414,8 +414,8 @@ sign_verify prime256v1 sha384 0x030205:K:004[345678] sign_verify prime256v1 sha512 0x030206:K:004[345678] # If openssl 3.0 is installed, test the SM2/3 algorithm combination -if [ -x /opt/openssl3/bin/openssl ]; then - PATH=/opt/openssl3/bin:$PATH LD_LIBRARY_PATH=/opt/openssl3/lib \ +ssl_version=$(openssl version | sed -e 's/^OpenSSL //' | sed -e 's/ .*//') +if test "${ssl_version::1}" = "3"; then sign_verify sm2 sm3 0x030211:K:004[345678] fi
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 13/15 Compile a newer version of OpenSSL
In reply to Mimi ZoharWith the distros shipping OpenSSL 3 with engine support, the original purpose for compiling OpenSSL 3 to test sm2/sm3 is no longer necessary and could be removed. Or, it could be re-purposed for building OpenSSL without engine support, which is needed for testing.
For both travis and github actions, update openssl-3.0.0-beta1 with openssl-3.0.5.
--- .github/workflows/ci.yml | 6 +++--- .travis.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
.github/workflows/ci.yml +3 -3
@@ -17,7 +17,7 @@ jobs: ARCH: i386 TSS: tpm2-tss VARIANT: i386 - COMPILE_SSL: openssl-3.0.0-beta1 + COMPILE_SSL: openssl-3.0.5 # cross compilation builds - container: "debian:stable"
@@ -52,7 +52,7 @@ jobs: env: CC: clang TSS: ibmtss - COMPILE_SSL: openssl-3.0.0-beta1 + COMPILE_SSL: openssl-3.0.5 - container: "opensuse/leap" env:
@@ -63,7 +63,7 @@ jobs: env: CC: gcc TSS: ibmtss - COMPILE_SSL: openssl-3.0.0-beta1 + COMPILE_SSL: openssl-3.0.5 - container: "ubuntu:xenial" env:
.travis.yml +3 -3
@@ -9,7 +9,7 @@ matrix: include: # 32 bit build - os: linux - env: DISTRO=debian:stable VARIANT=i386 ARCH=i386 TSS=tpm2-tss COMPILE_SSL=openssl-3.0.0-beta1 + env: DISTRO=debian:stable VARIANT=i386 ARCH=i386 TSS=tpm2-tss COMPILE_SSL=openssl-3.0.5 compiler: gcc # cross compilation builds
@@ -32,7 +32,7 @@ matrix: # glibc (gcc/clang) - os: linux - env: DISTRO=opensuse/tumbleweed TSS=ibmtss CONTAINER=podman CONTAINER_ARGS="--runtime=/usr/bin/crun --network=host" COMPILE_SSL=openssl-3.0.0-beta1 + env: DISTRO=opensuse/tumbleweed TSS=ibmtss CONTAINER=podman CONTAINER_ARGS="--runtime=/usr/bin/crun --network=host" COMPILE_SSL=openssl-3.0.5 compiler: clang - os: linux
@@ -40,7 +40,7 @@ matrix: compiler: gcc - os: linux - env: DISTRO=ubuntu:jammy TSS=ibmtss COMPILE_SSL=openssl-3.0.0-beta1 + env: DISTRO=ubuntu:jammy TSS=ibmtss COMPILE_SSL=openssl-3.0.5 compiler: gcc - os: linux
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 14/15 Build OpenSSL without engine support
In reply to Mimi ZoharFix COMPILE_SSL to build for the proper architecture, link with the appropriate library, and set up library path for evmctl.
Compile OpenSSL with "no-engine" and "no-dynamic-engine" support.
--- .github/workflows/ci.yml | 4 ++-- .travis.yml | 2 +- build.sh | 8 ++++++++ src/evmctl.c | 4 +++- tests/install-openssl3.sh | 9 ++++++++- 5 files changed, 22 insertions(+), 5 deletions(-)
.github/workflows/ci.yml +2 -2
@@ -114,7 +114,7 @@ jobs: INSTALL="${INSTALL%%/*}" if [ "$VARIANT" ]; then ARCH="$ARCH" ./ci/$INSTALL.$VARIANT.sh; fi ARCH="$ARCH" CC="$CC" TSS="$TSS" ./ci/$INSTALL.sh - if [ "$COMPILE_SSL" ]; then COMPILE_SSL="$COMPILE_SSL" ./tests/install-openssl3.sh; fi + if [ "$COMPILE_SSL" ]; then COMPILE_SSL="$COMPILE_SSL" VARIANT="$VARIANT" ./tests/install-openssl3.sh; fi - name: Build swtpm run: |
@@ -129,4 +129,4 @@ jobs: run: $CC --version - name: Compile - run: CC="$CC" VARIANT="$VARIANT" ./build.sh + run: CC="$CC" VARIANT="$VARIANT" COMPILE_SSL="$COMPILE_SSL" ./build.sh
.travis.yml +1 -1
@@ -95,4 +95,4 @@ script: - INSTALL="${DISTRO#${REPO}}" - INSTALL="${INSTALL%%:*}" - INSTALL="${INSTALL%%/*}" - - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ "$COMPILE_SSL" ]; then COMPILE_SSL="$COMPILE_SSL" ./tests/install-openssl3.sh; fi && if [ ! \"$VARIANT\" ]; then which tpm_server || which swtpm || if which tssstartup; then ./tests/install-swtpm.sh; fi; fi && CC=\"$CC\" VARIANT=\"$VARIANT\" ./build.sh" + - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ \"$COMPILE_SSL\" ]; then COMPILE_SSL=\"$COMPILE_SSL\" VARIANT=\"$VARIANT\" ./tests/install-openssl3.sh; fi && if [ ! \"$VARIANT\" ]; then which tpm_server || which swtpm || if which tssstartup; then ./tests/install-swtpm.sh; fi; fi && CC=\"$CC\" VARIANT=\"$VARIANT\" COMPILE_SSL=\"$COMPILE_SSL\" ./build.sh"
build.sh +8 -0
@@ -32,6 +32,14 @@ log_exit() cd `dirname $0` +if [ "$COMPILE_SSL" ]; then + echo "COMPILE_SSL: $COMPILE_SSL" + export CFLAGS="-I/opt/openssl3/include $CFLAGS" + export LD_LIBRARY_PATH="/opt/openssl3/lib64:/opt/openssl3/lib:$HOME/src/ima-evm-utils/src/.libs:$LD_LIBRARY_PATH" + export LDFLAGS="-L/opt/openssl3/lib64 -L/opt/openssl3/lib $LDFLAGS" + export PATH="/opt/openssl3/bin:$HOME/src/ima-evm-utils/src/.libs:$PATH" +fi + case "$VARIANT" in i386) echo "32-bit compilation"
src/evmctl.c +3 -1
@@ -2989,8 +2989,10 @@ int main(int argc, char *argv[])#if CONFIG_ENGINE case 139 :/* --engine e */ imaevm_params.eng =setup_engine (optarg); -if (!imaevm_params.eng) +if (!imaevm_params.eng) { +log_info ("setup_engine failed\n" ); goto error; + }break ;#endif case 140 :/* --xattr-user */
tests/install-openssl3.sh +8 -1
@@ -13,7 +13,14 @@ wget --no-check-certificate https://github.com/openssl/openssl/archive/refs/tags tar --no-same-owner -xzf ${version}.tar.gz cd openssl-${version} -./Configure --prefix=/opt/openssl3 --openssldir=/opt/openssl3/ssl +if [ "$VARIANT" = "i386" ]; then + echo "32-bit compilation" + FLAGS="-m32 linux-generic32" +fi + +./Configure $FLAGS no-engine no-dynamic-engine --prefix=/opt/openssl3 --openssldir=/opt/openssl3 +# Uncomment for debugging +# perl configdata.pm --dump | grep engine make -j$(nproc) # only install apps and library sudo make install_sw
Signature · 1 line
2.31.1
Mimi Zohar
maintainerPATCH v3 15/15 Fix d2i_x509_fp failure
In reply to Mimi ZoharBefore calling d2i_x509_fp(), make sure the keyfile is a regular file.
--- src/libimaevm.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
src/libimaevm.c +11 -0
@@ -251,6 +251,7 @@ EVP_PKEY *read_pub_pkey(const char *keyfile, int x509) {FILE *fp;EVP_PKEY *pkey =NULL ; +struct stat st;if (!keyfile)return NULL ;
@@ -264,6 +265,16 @@ EVP_PKEY *read_pub_pkey(const char *keyfile, int x509) }if (x509) { +if (fstat (fileno (fp), &st) ==-1 ) + goto out; + +if ((st.st_mode &S_IFMT ) !=S_IFREG ) { +if (imaevm_params.verbose >LOG_INFO ) +log_err ("Keyfile is not regular file: %s\n" , + keyfile); + goto out; + } +X509 *crt =d2i_X509_fp (fp,NULL );if (!crt) {
Signature · 1 line
2.31.1