Version 0.3

Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>

COPYING

@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

ChangeLog

@@ -1,3 +1,25 @@
+2012-05-18  Dmitry Kasatkin  <dmitry.kasatkin@intel.com>
+
+	version 0.3
+	* llistxattr returns 0 if there are no xattrs and it is valid
+	* Added entry type to directory hash calculation
+	* inline block variable renamed
+	* Remove forced tag creation
+	* Use libexec for programs and scripts
+	* Some files updated
+	* Do not search for algorithm as it is known
+	* Refactored to remove redundant hash initialization code
+	* Added hash calculation for special files
+
+2012-04-05  Dmitry Kasatkin  <dmitry.kasatkin@intel.com>
+
+	version 0.2
+	* added RPM & TAR building makefile rules
+	* renamed evm-utils to ima-evm-utils
+	* added command options description
+	* updated error handling
+	* refactored redundant code
+
 2012-04-02  Dmitry Kasatkin  <dmitry.kasatkin@intel.com>
 
 	version 0.1.0

INSTALL

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended

Makefile.am

@@ -4,3 +4,20 @@ SUBDIRS = src tests
 
 ACLOCAL_AMFLAGS = -I m4
 
+SRCS = $(HOME)/rpmbuild/SOURCES
+SPEC = $(PACKAGE_NAME).spec
+
+pkgname = $(PACKAGE_NAME)-$(PACKAGE_VERSION)
+tarname = $(pkgname).tar.gz
+
+$(tarname):
+	git tag v$(PACKAGE_VERSION)
+	git archive --format=tar --prefix=$(pkgname)/ v$(PACKAGE_VERSION) $(FILES) | gzip >$@
+
+tar: $(tarname)
+
+rpm: $(tarname)
+	cp $(tarname) $(SRCS)/
+	rpmbuild -ba --nodeps $(SPEC)
+
+.PHONY: $(tarname)

configure.ac

@@ -1,7 +1,7 @@
 # autoconf script
 
 AC_PREREQ([2.65])
-AC_INIT(evm-utils, 0.1, dmitry.kasatkin@intel.com)
+AC_INIT(ima-evm-utils, 0.3, dmitry.kasatkin@intel.com)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -47,7 +47,7 @@ fi
 AC_CONFIG_FILES([Makefile
 		src/Makefile
 		tests/Makefile
-		evm-utils.spec
+		ima-evm-utils.spec
 		])
 AC_OUTPUT
 

ima-evm-utils.spec.in

@@ -1,7 +1,7 @@
 Name:		@PACKAGE_NAME@
 Version:	@PACKAGE_VERSION@
 Release:	1%{?dist}
-Summary:	evm-utils - IMA/EVM support utilities
+Summary:	@PACKAGE_NAME@ - IMA/EVM control utility
 Group:		System/Libraries
 License:	LGPLv2
 #URL:		
@@ -12,11 +12,10 @@ BuildRequires:    autoconf
 BuildRequires:    automake
 BuildRequires:    openssl-devel
 BuildRequires:    libattr-devel
-BuildRequires:    readline-devel
 BuildRequires:    keyutils-libs-devel
 
 %description
-This library provides EVM support utilities.
+This package provide IMA/EVM control utility
 
 %prep
 %setup -q
@@ -48,6 +47,6 @@ exit 0
 %{_libdir}/*
 
 %changelog
-* Wed Jul 20 2011 Dmitry Kasatkin <dmitry.kasatkin@intel.com>
-- Initial package for MeeGo
+* Thu Apr 05 2012 Dmitry Kasatkin <dmitry.kasatkin@intel.com>
+- Initial RPM spec file
 

src/evmctl.c

@@ -2,7 +2,7 @@
  * evm-utils - IMA/EVM support utilities
  *
  * Copyright (C) 2011 Nokia Corporation
- * Copyright (C) 2011 Intel Corporation
+ * Copyright (C) 2011, 2012 Intel Corporation
  *
  * Authors:
  * Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
@@ -74,7 +74,7 @@
 #define log_dump(p, len)		do_log_dump(LOG_INFO, p, len)
 #define log_info(fmt, args...)		do_log(LOG_INFO, fmt, ##args)
 #define log_err(fmt, args...)		do_log(LOG_ERR, fmt, ##args)
-#define log_errno(fmt, args...)		do_log(LOG_ERR, fmt ": %s (%d)\n", ##args, strerror(errno), errno)
+#define log_errno(fmt, args...)		do_log(LOG_ERR, fmt ": errno: %s (%d)\n", ##args, strerror(errno), errno)
 
 #define	DATA_SIZE	4096
 #define SHA1_HASH_LEN   20
@@ -200,7 +200,7 @@ static int bin2file(const char *file, const char *ext, const unsigned char *data
 
 	fp = fopen(name, "w");
 	if (!fp) {
-		log_errno("Unable to open %s for writing", name);
+		log_err("Unable to open %s for writing\n", name);
 		return -1;
 	}
 	err = fwrite(data, len, 1, fp);
@@ -208,16 +208,16 @@ static int bin2file(const char *file, const char *ext, const unsigned char *data
 	return err;
 }
 
-static char *file2bin(const char *file, int *size)
+static unsigned char *file2bin(const char *file, int *size)
 {
 	FILE *fp;
 	int len;
-	char *data;
+	unsigned char *data;
 
 	len = get_filesize(file);
 	fp = fopen(file, "r");
 	if (!fp) {
-		log_errno("Unable to open %s", file);
+		log_err("Unable to open %s\n", file);
 		return NULL;
 	}
 	data = malloc(len);
@@ -270,14 +270,14 @@ static int read_key(const char *inkey, unsigned char *pub)
 
 	fp = fopen(inkey, "r");
 	if (!fp) {
-		log_errno("read key failed from file %s", inkey);
+		log_err("read key failed from file %s\n", inkey);
 		return -1;
 	}
 
 	key1 = PEM_read_RSA_PUBKEY(fp, &key, NULL, NULL);
 	fclose(fp);
 	if (!key1) {
-		log_errno("PEM_read_RSA_PUBKEY() failed");
+		log_err("PEM_read_RSA_PUBKEY() failed\n");
 		return -1;
 	}
 
@@ -324,14 +324,14 @@ static int sign_hash(const unsigned char *hash, int size, const char *keyfile, u
 
 	fp = fopen(keyfile, "r");
 	if (!fp) {
-		log_errno("Unable to open keyfile %s", keyfile);
+		log_err("Unable to open keyfile %s\n", keyfile);
 		return -1;
 	}
 	key1 = PEM_read_RSAPrivateKey(fp, &key, NULL, keypass);
 	fclose(fp);
 	if (!key1) {
-		log_errno("RSAPrivateKey() failed");
-		return -1;
+		log_err("PEM_read_RSAPrivateKey() failed\n");
+		return 1;
 	}
 
 	/* now create a new hash */
@@ -355,8 +355,8 @@ static int sign_hash(const unsigned char *hash, int size, const char *keyfile, u
 	err = RSA_private_encrypt(sizeof(sighash), sighash, sig + sizeof(*hdr) + 2, key, RSA_PKCS1_PADDING);
 	RSA_free(key);
 	if (err < 0) {
-		log_errno("RSA_private_encrypt() failed: %d", err);
-		return -1;
+		log_err("RSA_private_encrypt() failed: %d\n", err);
+		return 1;
 	}
 
 	len = err;
@@ -372,30 +372,43 @@ static int sign_hash(const unsigned char *hash, int size, const char *keyfile, u
 	return len;
 }
 
+static int find_xattr(const char *list, int list_size, const char *xattr)
+{
+	int len;
+
+	for (; list_size > 0; len++, list_size -= len, list += len) {
+		len = strlen(list);
+		if (!strcmp(list, xattr))
+			return 1;
+	}
+	return 0;
+}
+
 static int calc_evm_hash(const char *file, unsigned char *hash)
 {
 	struct stat st;
 	int fd, err;
 	uint32_t generation;
 	EVP_MD_CTX ctx;
-	const EVP_MD *md;
 	unsigned int mdlen;
 	char **xattrname;
 	char xattr_value[1024];
+	char list[1024];
+	ssize_t list_size;
 
 	fd = open(file, 0);
 	if (fd < 0) {
-		log_errno("Unable to open %s", file);
+		log_err("Unable to open %s\n", file);
 		return -1;
 	}
 
 	if (fstat(fd, &st)) {
-		log_errno("fstat() failed");
+		log_err("fstat() failed\n");
 		return -1;
 	}
 
 	if (ioctl(fd, EXT34_IOC_GETVERSION, &generation)) {
-		log_errno("ioctl() failed");
+		log_err("ioctl() failed\n");
 		return -1;
 	}
 
@@ -403,22 +416,26 @@ static int calc_evm_hash(const char *file, unsigned char *hash)
 
 	log_info("generation: %u\n", generation);
 
-	md = EVP_get_digestbyname("sha1");
-	if (!md) {
-		log_errno("EVP_get_digestbyname() failed");
+	list_size = llistxattr(file, list, sizeof(list));
+	if (list_size < 0) {
+		log_err("llistxattr() failed\n");
 		return -1;
 	}
 
-	err = EVP_DigestInit(&ctx, md);
+	err = EVP_DigestInit(&ctx, EVP_sha1());
 	if (!err) {
-		log_errno("EVP_DigestInit() failed");
-		return -1;
+		log_err("EVP_DigestInit() failed\n");
+		return 1;
 	}
 
 	for (xattrname = evm_config_xattrnames; *xattrname != NULL; xattrname++) {
 		err = getxattr(file, *xattrname, xattr_value, sizeof(xattr_value));
 		if (err < 0) {
-			log_info("no attr: %s\n", *xattrname);
+			log_info("no xattr: %s\n", *xattrname);
+			continue;
+		}
+		if (!find_xattr(list, list_size, *xattrname)) {
+			log_info("skipping xattr: %s\n", *xattrname);
 			continue;
 		}
 		/*log_debug("name: %s, value: %s, size: %d\n", *xattrname, xattr_value, err);*/
@@ -426,8 +443,8 @@ static int calc_evm_hash(const char *file, unsigned char *hash)
 		log_debug_dump(xattr_value, err);
 		err = EVP_DigestUpdate(&ctx, xattr_value, err);
 		if (!err) {
-			log_errno("EVP_DigestUpdate() failed");
-			return -1;
+			log_err("EVP_DigestUpdate() failed\n");
+			return 1;
 		}
 	}
 
@@ -440,34 +457,36 @@ static int calc_evm_hash(const char *file, unsigned char *hash)
 
 	err = EVP_DigestUpdate(&ctx, (const unsigned char *)&hmac_misc, sizeof(hmac_misc));
 	if (!err) {
-		log_errno("EVP_DigestUpdate() failed");
-		return -1;
+		log_err("EVP_DigestUpdate() failed\n");
+		return 1;
 	}
 	err = EVP_DigestFinal(&ctx, hash, &mdlen);
 	if (!err) {
-		log_errno("EVP_DigestFinal() failed");
-		return -1;
+		log_err("EVP_DigestFinal() failed\n");
+		return 1;
 	}
 
-	return 0;
+	return mdlen;
 }
 
 static int sign_evm(const char *file, const char *key)
 {
 	unsigned char hash[20];
 	unsigned char sig[1024] = "\x03";
-	int err;
+	int len, err;
 
-	calc_evm_hash(file, hash);
+	len = calc_evm_hash(file, hash);
+	if (len <= 1)
+		return len;
 
-	err = sign_hash(hash, sizeof(hash), key, sig + 1);
-	if (err < 0)
-		return err;
+	len = sign_hash(hash, len, key, sig + 1);
+	if (len <= 1)
+		return len;
 
 	if (xattr) {
-		err = setxattr(file, "security.evm", sig, err + 1, 0);
+		err = setxattr(file, "security.evm", sig, len + 1, 0);
 		if (err < 0) {
-			log_errno("setxattr failed: %s", file);
+			log_err("setxattr failed: %s\n", file);
 			return err;
 		}
 	}
@@ -475,37 +494,22 @@ static int sign_evm(const char *file, const char *key)
 	return 0;
 }
 
-static int calc_file_hash(const char *file, uint8_t *hash)
+static int add_file_hash(const char *file, EVP_MD_CTX *ctx)
 {
-	EVP_MD_CTX ctx;
-	const EVP_MD *md;
 	uint8_t *data;
 	int err, size, bs = DATA_SIZE;
 	size_t len;
-	unsigned int mdlen;
 	FILE *fp;
 
 	data = malloc(bs);
 	if (!data) {
-		log_errno("malloc failed");
+		log_err("malloc failed\n");
 		return -1;
 	}
 
 	fp = fopen(file, "r");
 	if (!fp) {
-		log_errno("Unable to open %s", file);
-		return -1;
-	}
-
-	md = EVP_get_digestbyname(hash_algo);
-	if (!md) {
-		log_errno("EVP_get_digestbyname() failed");
-		return -1;
-	}
-
-	err = EVP_DigestInit(&ctx, md);
-	if (!err) {
-		log_errno("EVP_DigestInit() failed");
+		log_err("Unable to open %s\n", file);
 		return -1;
 	}
 
@@ -514,29 +518,22 @@ static int calc_file_hash(const char *file, uint8_t *hash)
 		err = fread(data, len, 1, fp);
 		if (!err) {
 			if (ferror(fp)) {
-				log_errno("fread() error\n");
+				log_err("fread() error\n\n");
 				return -1;
 			}
 			break;
 		}
-		err = EVP_DigestUpdate(&ctx, data, len);
+		err = EVP_DigestUpdate(ctx, data, len);
 		if (!err) {
-			log_errno("EVP_DigestUpdate() failed");
-			return -1;
+			log_err("EVP_DigestUpdate() failed\n");
+			return 1;
 		}
 	}
 
-	err = EVP_DigestFinal(&ctx, hash, &mdlen);
-	if (!err) {
-		log_errno("EVP_DigestFinal() failed");
-		return -1;
-	}
-
 	fclose(fp);
-
 	free(data);
 
-	return mdlen;
+	return 0;
 }
 
 struct dirent_list {
@@ -544,12 +541,9 @@ struct dirent_list {
 	struct dirent de;
 };
 
-static int calc_dir_hash(const char *file, uint8_t *hash)
+static int add_dir_hash(const char *file, EVP_MD_CTX *ctx)
 {
-	EVP_MD_CTX ctx;
-	const EVP_MD *md;
 	int err;
-	unsigned int mdlen;
 	struct dirent *de;
 	DIR *dir;
 	struct dirent_list *head = NULL, *pos, *prev, *cur;
@@ -557,19 +551,7 @@ static int calc_dir_hash(const char *file, uint8_t *hash)
 
 	dir = opendir(file);
 	if (!dir) {
-		log_errno("Unable to open %s", file);
-		return -1;
-	}
-
-	md = EVP_get_digestbyname(hash_algo);
-	if (!md) {
-		log_errno("EVP_get_digestbyname() failed");
-		return -1;
-	}
-
-	err = EVP_DigestInit(&ctx, md);
-	if (!err) {
-		log_errno("EVP_DigestInit() failed");
+		log_err("Unable to open %s\n", file);
 		return -1;
 	}
 
@@ -592,26 +574,105 @@ static int calc_dir_hash(const char *file, uint8_t *hash)
 		pos = cur->next;
 		ino = cur->de.d_ino;
 		log_debug("entry: ino: %llu, %s\n", (unsigned long long)ino, cur->de.d_name);
-		err = EVP_DigestUpdate(&ctx, cur->de.d_name, strlen(cur->de.d_name));
+		err = EVP_DigestUpdate(ctx, cur->de.d_name, strlen(cur->de.d_name));
 		if (!err) {
-			log_errno("EVP_DigestUpdate() failed");
-			return -1;
+			log_err("EVP_DigestUpdate() failed\n");
+			return 1;
 		}
-		err = EVP_DigestUpdate(&ctx, &ino, sizeof(ino));
+		err = EVP_DigestUpdate(ctx, &ino, sizeof(ino));
 		if (!err) {
-			log_errno("EVP_DigestUpdate() failed");
-			return -1;
+			log_err("EVP_DigestUpdate() failed\n");
+			return 1;
+		}
+		err = EVP_DigestUpdate(ctx, &cur->de.d_type, sizeof(cur->de.d_type));
+		if (!err) {
+			log_err("EVP_DigestUpdate() failed\n");
+			return 1;
 		}
 		free(cur);
 	}
 
-	err = EVP_DigestFinal(&ctx, hash, &mdlen);
+	closedir(dir);
+
+	return 0;
+}
+
+static int add_link_hash(const char *path, EVP_MD_CTX *ctx)
+{
+	int err;
+	char buf[1024];
+
+	err = readlink(path, buf, sizeof(buf));
+	if (err <= 0)
+		return -1;
+
+	log_info("link: %s -> %.*s\n", path, err, buf);
+	return !EVP_DigestUpdate(ctx, buf, err);
+}
+
+static int add_dev_hash(struct stat *st, EVP_MD_CTX *ctx)
+{
+	uint32_t dev = st->st_rdev;
+	unsigned major = (dev & 0xfff00) >> 8;
+	unsigned minor = (dev & 0xff) | ((dev >> 12) & 0xfff00);
+	log_info("device: %u:%u\n", major, minor);
+	return !EVP_DigestUpdate(ctx, &dev, sizeof(dev));
+}
+
+static int calc_hash(const char *file, uint8_t *hash)
+{
+	struct stat st;
+	EVP_MD_CTX ctx;
+	const EVP_MD *md;
+	unsigned int mdlen;
+	int err;
+
+	/*  Need to know the file length */
+	err = lstat(file, &st);
+	if (err < 0) {
+		log_err("stat() failed\n");
+		return err;
+	}
+
+	md = EVP_get_digestbyname(hash_algo);
+	if (!md) {
+		log_err("EVP_get_digestbyname() failed\n");
+		return 1;
+	}
+
+	err = EVP_DigestInit(&ctx, md);
 	if (!err) {
-		log_errno("EVP_DigestFinal() failed");
+		log_err("EVP_DigestInit() failed\n");
+		return 1;
+	}
+
+	switch (st.st_mode & S_IFMT) {
+	case S_IFREG:
+		err = add_file_hash(file, &ctx);
+		break;
+	case S_IFDIR:
+		err = add_dir_hash(file, &ctx);
+		break;
+	case S_IFLNK:
+		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);
+		break;
+	default:
+		log_errno("Unsupported file type");
 		return -1;
 	}
 
-	closedir(dir);
+	if (err)
+		return err;
+
+	err = EVP_DigestFinal(&ctx, hash, &mdlen);
+	if (!err) {
+		log_err("EVP_DigestFinal() failed\n");
+		return 1;
+	}
 
 	return mdlen;
 }
@@ -619,33 +680,22 @@ static int calc_dir_hash(const char *file, uint8_t *hash)
 static int hash_ima(const char *file)
 {
 	unsigned char hash[65] = "\x01"; /* MAX hash size + 1 */
-	int err;
-	struct stat st;
+	int len, err;
 
-	/*  Need to know the file length */
-	err = stat(file, &st);
-	if (err < 0) {
-		log_errno("stat() failed");
-		return err;
-	}
-
-	if (S_ISDIR(st.st_mode))
-		err = calc_dir_hash(file, hash + 1);
-	else
-		err = calc_file_hash(file, hash + 1);
-	if (err < 0)
-		return err;
+	len = calc_hash(file, hash + 1);
+	if (len <= 1)
+		return len;
 
 	if (verbose >= LOG_INFO)
 		log_info("hash: ");
 
 	if (!xattr || verbose >= LOG_INFO)
-		dump(hash, err + 1);
+		dump(hash, len + 1);
 
 	if (xattr) {
-		err = setxattr(file, "security.ima", hash, err + 1, 0);
+		err = setxattr(file, "security.ima", hash, len + 1, 0);
 		if (err < 0) {
-			log_errno("setxattr failed: %s", file);
+			log_err("setxattr failed: %s\n", file);
 			return err;
 		}
 	}
@@ -660,7 +710,7 @@ static int cmd_hash_ima(struct command *cmd)
 	if (!file) {
 		log_err("Parameters missing\n");
 		print_usage(cmd);
-		return 1;
+		return -1;
 	}
 
 	return hash_ima(file);
@@ -670,23 +720,23 @@ static int sign_ima(const char *file, const char *key)
 {
 	unsigned char hash[64];
 	unsigned char sig[1024] = "\x03";
-	int err;
+	int len, err;
 
-	err = calc_file_hash(file, hash);
-	if (err < 0)
-		return err;
+	len = calc_hash(file, hash);
+	if (len <= 1)
+		return len;
 
-	err = sign_hash(hash, err, key, sig + 1);
-	if (err < 0)
-		return err;
+	len = sign_hash(hash, len, key, sig + 1);
+	if (len <= 1)
+		return len;
 
 	if (sigfile)
-		bin2file(file, "sig", sig, err + 1);
+		bin2file(file, "sig", sig, len + 1);
 
 	if (xattr) {
-		err = setxattr(file, "security.ima", sig, err + 1, 0);
+		err = setxattr(file, "security.ima", sig, len + 1, 0);
 		if (err < 0) {
-			log_errno("setxattr failed: %s", file);
+			log_err("setxattr failed: %s\n", file);
 			return err;
 		}
 	}
@@ -701,7 +751,7 @@ static int cmd_sign_ima(struct command *cmd)
 	if (!file) {
 		log_err("Parameters missing\n");
 		print_usage(cmd);
-		return 1;
+		return -1;
 	}
 
 	key = g_argv[optind++];
@@ -720,7 +770,13 @@ static int cmd_sign_evm(struct command *cmd)
 	if (!file) {
 		log_err("Parameters missing\n");
 		print_usage(cmd);
-		return 1;
+		return -1;
+	}
+
+	if (!digsig && !digest) {
+		log_err("Parameters missing\n");
+		print_usage(cmd);
+		return -1;
 	}
 
 	key = g_argv[optind++];
@@ -757,14 +813,14 @@ static int verify_hash(const unsigned char *hash, int size, unsigned char *sig,
 
 	fp = fopen(keyfile, "r");
 	if (!fp) {
-		log_errno("Unable to open keyfile %s", keyfile);
+		log_err("Unable to open keyfile %s\n", keyfile);
 		return -1;
 	}
 	key1 = PEM_read_RSA_PUBKEY(fp, &key, NULL, NULL);
 	fclose(fp);
 	if (!key1) {
-		log_errno("PEM_read_RSA_PUBKEY() failed");
-		return -1;
+		log_err("PEM_read_RSA_PUBKEY() failed\n");
+		return 1;
 	}
 
 	SHA1_Init(&ctx);
@@ -777,14 +833,14 @@ static int verify_hash(const unsigned char *hash, int size, unsigned char *sig,
 	err = RSA_public_decrypt(siglen - sizeof(*hdr) - 2, sig + sizeof(*hdr) + 2, out, key, RSA_PKCS1_PADDING);
 	RSA_free(key);
 	if (err < 0) {
-		log_errno("RSA_public_decrypt() failed: %d", err);
-		return -1;
+		log_err("RSA_public_decrypt() failed: %d\n", err);
+		return 1;
 	}
 
 	len = err;
 
 	if (len != sizeof(sighash) || memcmp(out, sighash, len) != 0) {
-		log_errno("Verification failed: %d", err);
+		log_err("Verification failed: %d\n", err);
 		return -1;
 	} else {
 		/*log_info("Verification is OK\n");*/
@@ -798,22 +854,24 @@ static int verify_evm(const char *file, const char *key)
 {
 	unsigned char hash[20];
 	unsigned char sig[1024];
-	int err;
+	int len;
 
-	calc_evm_hash(file, hash);
+	len = calc_evm_hash(file, hash);
+	if (len <= 1)
+		return len;
 
-	err = getxattr(file, "security.evm", sig, sizeof(sig));
-	if (err < 0) {
-		log_errno("getxattr failed");
-		return err;
+	len = getxattr(file, "security.evm", sig, sizeof(sig));
+	if (len < 0) {
+		log_err("getxattr failed\n");
+		return len;
 	}
 
 	if (sig[0] != 0x03) {
-		log_errno("security.evm has not signature");
-		return err;
+		log_err("security.evm has not signature\n");
+		return -1;
 	}
 
-	return verify_hash(hash, sizeof(hash), sig + 1, err - 1, key);
+	return verify_hash(hash, sizeof(hash), sig + 1, len - 1, key);
 }
 
 static int cmd_verify_evm(struct command *cmd)
@@ -823,7 +881,7 @@ static int cmd_verify_evm(struct command *cmd)
 	if (!file) {
 		log_err("Parameters missing\n");
 		print_usage(cmd);
-		return 1;
+		return -1;
 	}
 
 	key = g_argv[optind++];
@@ -863,62 +921,21 @@ static int cmd_convert(struct command *cmd)
 	return 0;
 }
 
-static int cmd_import_bin(struct command *cmd)
-{
-	int len;
-	char *inkey, *ring = NULL;
-	char *key, name[20];
-	key_serial_t id;
-	uint8_t keyid[8];
-
-	inkey = g_argv[optind++];
-	if (!inkey)
-		inkey = "/etc/keys/pubkey_evm.bin";
-	else
-		ring = g_argv[optind++];
-
-	if (!ring)
-		id = KEY_SPEC_USER_KEYRING;
-	else
-		id = atoi(ring);
-
-	key = file2bin(inkey, &len);
-	if (!key)
-		return -1;
-
-	calc_keyid(keyid, name, (unsigned char *)key, len);
-
-	log_info("Importing public key %s from file %s into keyring %d\n", name, inkey, id);
-
-	id = add_key("user", name, key, len, id);
-	if (id < 0) {
-		log_errno("add_key failed");
-		return -1;
-	}
-
-	log_info("keyid: %d\n", id);
-	printf("%d\n", id);
-
-	free(key);
-
-	return 0;
-}
-
 static int cmd_import(struct command *cmd)
 {
 	char *inkey, *ring = NULL;
-	unsigned char key[1024];
+	unsigned char _key[1024], *key = _key;
 	int id, len;
 	char name[20];
 	uint8_t keyid[8];
 
-	if (binkey)
-		return cmd_import_bin(cmd);
-
 	inkey = g_argv[optind++];
-	if (!inkey)
-		inkey = "/etc/keys/pubkey_evm.pem";
-	else
+	if (!inkey) {
+		if (binkey)
+			inkey = "/etc/keys/pubkey_evm.bin";
+		else
+			inkey = "/etc/keys/pubkey_evm.pem";
+	} else
 		ring = g_argv[optind++];
 
 	if (!ring)
@@ -926,9 +943,15 @@ static int cmd_import(struct command *cmd)
 	else
 		id = atoi(ring);
 
-	len = read_key(inkey, key);
-	if (len < 0)
-		return -1;
+	if (binkey) {
+		key = file2bin(inkey, &len);
+		if (!key)
+			return -1;
+	} else {
+		len = read_key(inkey, key);
+		if (len < 0)
+			return -1;
+	}
 
 	calc_keyid(keyid, name, key, len);
 
@@ -936,13 +959,16 @@ static int cmd_import(struct command *cmd)
 
 	id = add_key("user", name, key, len, id);
 	if (id < 0) {
-		log_errno("add_key failed");
+		log_err("add_key failed\n");
 		return -1;
 	}
 
 	log_info("keyid: %d\n", id);
 	printf("%d\n", id);
 
+	if (binkey)
+		free(key);
+
 	return 0;
 }
 
@@ -957,18 +983,20 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *h
 	unsigned int mdlen;
 	char **xattrname;
 	unsigned char xattr_value[1024];
-	char *key;
+	unsigned char *key;
 	int keylen;
 	unsigned char evmkey[MAX_KEY_SIZE];
+	char list[1024];
+	ssize_t list_size;
 
 	key = file2bin(keyfile, &keylen);
 	if (!key) {
-		log_errno("Unable to read a key: %s\n", keyfile);
+		log_err("Unable to read a key: %s\n\n", keyfile);
 		return -1;
 	}
 
 	if (keylen > sizeof(evmkey)) {
-		log_errno("key is too long\n");
+		log_err("key is too long\n");
 		return -1;
 	}
 
@@ -978,17 +1006,17 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *h
 
 	fd = open(file, 0);
 	if (fd < 0) {
-		log_errno("Unable to open %s", file);
+		log_err("Unable to open %s\n", file);
 		return -1;
 	}
 
 	if (fstat(fd, &st)) {
-		log_errno("fstat() failed");
+		log_err("fstat() failed\n");
 		return -1;
 	}
 
 	if (ioctl(fd, EXT34_IOC_GETVERSION, &generation)) {
-		log_errno("ioctl() failed");
+		log_err("ioctl() failed\n");
 		return -1;
 	}
 
@@ -996,18 +1024,36 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *h
 
 	log_info("generation: %u\n", generation);
 
-	HMAC_Init(&ctx, evmkey, sizeof(evmkey), EVP_sha1());
+	list_size = llistxattr(file, list, sizeof(list));
+	if (list_size <= 0) {
+		log_err("llistxattr() failed\n");
+		return -1;
+	}
+
+	err = HMAC_Init(&ctx, evmkey, sizeof(evmkey), EVP_sha1());
+	if (!err) {
+		log_err("HMAC_Init() failed\n");
+		return 1;
+	}
 
 	for (xattrname = evm_config_xattrnames; *xattrname != NULL; xattrname++) {
 		err = getxattr(file, *xattrname, xattr_value, sizeof(xattr_value));
 		if (err < 0) {
-			log_info("no attr: %s\n", *xattrname);
+			log_info("no xattr: %s\n", *xattrname);
+			continue;
+		}
+		if (!find_xattr(list, list_size, *xattrname)) {
+			log_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);
-		HMAC_Update(&ctx, xattr_value, err);
+		err = HMAC_Update(&ctx, xattr_value, err);
+		if (!err) {
+			log_err("HMAC_Update() failed\n");
+			return 1;
+		}
 	}
 
 	memset(&hmac_misc, 0, sizeof(hmac_misc));
@@ -1017,32 +1063,41 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *h
 	hmac_misc.gid = st.st_gid;
 	hmac_misc.mode = st.st_mode;
 
-	HMAC_Update(&ctx, (const unsigned char *)&hmac_misc, sizeof(hmac_misc));
-	HMAC_Final(&ctx, hash, &mdlen);
+	err = HMAC_Update(&ctx, (const unsigned char *)&hmac_misc, sizeof(hmac_misc));
+	if (!err) {
+		log_err("HMAC_Update() failed\n");
+		return 1;
+	}
+	err = HMAC_Final(&ctx, hash, &mdlen);
+	if (!err) {
+		log_err("HMAC_Final() failed\n");
+		return 1;
+	}
 	HMAC_CTX_cleanup(&ctx);
 
 	free(key);
 
-	return 0;
+	return mdlen;
 }
 
 static int hmac_evm(const char *file, const char *key)
 {
 	unsigned char hash[20];
 	unsigned char sig[1024] = "\x02";
-	int err;
+	int len, err;
 
-	calc_evm_hmac(file, key, hash);
+	len = calc_evm_hmac(file, key, hash);
+	if (len <= 1)
+		return len;
 
 	log_info("hmac: ");
-	log_dump(hash, sizeof(hash));
-	memcpy(sig + 1, hash, sizeof(hash));
-	err = sizeof(hash);
+	log_dump(hash, len);
+	memcpy(sig + 1, hash, len);
 
 	if (xattr) {
-		err = setxattr(file, "security.evm", sig, err + 1, 0);
+		err = setxattr(file, "security.evm", sig, len + 1, 0);
 		if (err < 0) {
-			log_errno("setxattr failed: %s", file);
+			log_err("setxattr failed: %s\n", file);
 			return err;
 		}
 	}
@@ -1058,7 +1113,13 @@ static int cmd_hmac_evm(struct command *cmd)
 	if (!file) {
 		log_err("Parameters missing\n");
 		print_usage(cmd);
-		return 1;
+		return -1;
+	}
+
+	if (!digsig && !digest) {
+		log_err("Parameters missing\n");
+		print_usage(cmd);
+		return -1;
 	}
 
 	key = g_argv[optind++];
@@ -1090,8 +1151,7 @@ static void print_full_usage(struct command *cmd)
 	if (cmd->name)
 		printf("usage: %s %s\n", cmd->name, cmd->arg ? cmd->arg : "");
 	if (cmd->msg)
-		printf("description:\n%s", cmd->msg);
-
+		printf("%s", cmd->msg);
 }
 
 static int print_command_usage(struct command *cmds, char *command)
@@ -1105,18 +1165,20 @@ static int print_command_usage(struct command *cmds, char *command)
 		}
 	}
 	printf("invalid command: %s\n", command);
-	return 1;
+	return -1;
 }
 
 static void print_all_usage(struct command *cmds)
 {
 	struct command *cmd;
 
+	printf("commands:\n");
+
 	for (cmd = cmds; cmd->name; cmd++) {
 		if (cmd->arg)
-			printf("%s %s\n", cmd->name, cmd->arg);
+			printf(" %s %s\n", cmd->name, cmd->arg);
 		else if (cmd->msg)
-			printf("%s", cmd->msg);
+			printf(" %s", cmd->msg);
 	}
 }
 
@@ -1143,26 +1205,40 @@ static int cmd_help(struct command *cmd)
 
 static void usage(void)
 {
-	printf("Usage: evmctl <command> [parameters..]\n");
+	printf("Usage: evmctl [-v] <command> [OPTIONS]\n");
 
 	print_all_usage(cmds);
+
+	printf(
+		"\n"
+		"  -a, --hashalgo     sha1 (default), sha224, sha256, sha384, sha512\n"
+		"  -s, --imasig       also make IMA signature\n"
+		"  -d, --imahash      also make IMA hash\n"
+		"  -f, --sigfile      store IMA signature in .sig file instead of xattr\n"
+		"  -b, --bin          signing key is in binary format\n"
+		"  -p, --pass         password for encrypted signing key\n"
+		"  -n                 print result to stdout instead of setting xattr\n"
+		"  -v                 increase verbosity level\n"
+		"  -h, --help         display this help and exit\n"
+		"\n");
 }
 
 struct command cmds[] = {
 	{"help", cmd_help, 0, "<command>"},
-	{"import", cmd_import, 0, "[--bin] inkey keyring", "Import public key (PEM/bin) into the keyring.\n"},
+	{"import", cmd_import, 0, "[--bin] pubkey keyring", "Import public key (PEM/bin) into the keyring.\n"},
 	{"convert", cmd_convert, 0, "inkey outkey", "Convert PEM public key into IMA/EVM kernel friendly format.\n"},
-	{"sign", cmd_sign_evm, 0, "[--imahash | --imasig ] file [key]", "Sign file metadata.\n"},
+	{"sign", cmd_sign_evm, 0, "[--imahash | --imasig ] [--pass password] file [key]", "Sign file metadata.\n"},
 	{"verify", cmd_verify_evm, 0, "file", "Verify EVM signature (for debugging).\n"},
-	{"ima_sign", cmd_sign_ima, 0, "[--sigfile] file [key]", "Sign file content.\n"},
-	{"ima_hash", cmd_hash_ima, 0, "file", "Hash file content.\n"},
-	{"hmac", cmd_hmac_evm, 0, "[--imahash | --imasig ] file [key]", "Sign file metadata with HMAC (for debugging).\n"},
+	{"ima_sign", cmd_sign_ima, 0, "[--sigfile] [--pass password] file [key]", "Make file content signature.\n"},
+	{"ima_hash", cmd_hash_ima, 0, "file", "Make file content hash.\n"},
+#ifdef DEBUG
+	{"hmac", cmd_hmac_evm, 0, "[--imahash | --imasig ] file [key]", "Sign file metadata with HMAC using symmetric key (for testing purpose).\n"},
+#endif
 	{0, 0, 0, NULL}
 };
 
 static struct option opts[] = {
 	{"help", 0, 0, 'h'},
-	{"inkey", 1, 0, 'k'},
 	{"imasig", 0, 0, 's'},
 	{"imahash", 0, 0, 'd'},
 	{"hashalgo", 1, 0, 'a'},
@@ -1181,7 +1257,7 @@ int main(int argc, char *argv[])
 	g_argc = argc;
 
 	while (1) {
-		c = getopt_long(argc, argv, "hk:vnsda:bp:f", opts, &lind);
+		c = getopt_long(argc, argv, "hvnsda:bp:f", opts, &lind);
 		if (c == -1)
 			break;
 
@@ -1190,9 +1266,6 @@ int main(int argc, char *argv[])
 			usage();
 			exit(0);
 			break;
-		case 'k':
-			printf("inkey: %s\n", optarg);
-			break;
 		case 'v':
 			verbose++;
 			break;
@@ -1234,8 +1307,17 @@ int main(int argc, char *argv[])
 	else
 		err = call_command(cmds, argv[optind++]);
 
-	if (err)
-		log_err("error: %s\n", ERR_error_string(ERR_get_error(), NULL));
+	if (err) {
+		unsigned long error;
+		if (errno)
+			log_err("errno: %s (%d)\n", strerror(errno), errno);
+		for (;;) {
+			error = ERR_get_error();
+			if (!error)
+				break;
+			log_err("%s\n", ERR_error_string(error, NULL));
+		}
+	}
 
 	ERR_free_strings();
 	EVP_cleanup();

tests/Makefile.am

@@ -1,7 +1,7 @@
-pkglib_PROGRAMS = openclose
+pkglibexec_PROGRAMS = openclose
 
 openclose_SOURCES = openclose.c
 
-dist_pkglib_SCRIPTS = evm_enable.sh evm_genkey.sh evm_sign_all.sh evm_sign_modules.sh ima_fix_dir.sh \
-			evm_hmac_all.sh evm_hmac_modules.sh
+dist_pkglibexec_SCRIPTS = evm_enable.sh evm_genkey.sh evm_sign_all.sh evm_sign_modules.sh \
+			ima_fix_dir.sh evm_hmac_all.sh evm_hmac_modules.sh