dh/ima-evm-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change set_xattr to xattr.

Browse Source 
set_xattr changed to xattr.

Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
This commit is contained in:
Dmitry Kasatkin
2012-02-01 11:10:15 +02:00
parent fed7fb6933
commit c440d2d95f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/evmctl.c
View File

@@ -143,7 +143,7 @@ struct command {
static int verbose = LOG_INFO - 1; static int verbose = LOG_INFO - 1;
static int g_argc; static int g_argc;
static char **g_argv; static char **g_argv;
static int set_xattr = 1; static int xattr = 1;
static int digest; static int digest;
static int digsig; static int digsig;
static char *hash_algo = "sha1"; static char *hash_algo = "sha1";
@@ -365,7 +365,7 @@ static int sign_hash(const unsigned char *hash, int size, const char *keyfile, u
*blen = __cpu_to_be16(len << 3); *blen = __cpu_to_be16(len << 3);
len += sizeof(*hdr) + 2; len += sizeof(*hdr) + 2;
log_info("evm/ima signature: %d bytes\n", len); log_info("evm/ima signature: %d bytes\n", len);
if (!set_xattr || verbose >= LOG_INFO) if (!xattr || verbose >= LOG_INFO)
dump(sig, len); dump(sig, len);
return len; return len;
@@ -463,7 +463,7 @@ static int sign_evm(const char *file, const char *key)
if (err < 0) if (err < 0)
return err; return err;
if (set_xattr) { if (xattr) {
err = setxattr(file, "security.evm", sig, err + 1, 0); err = setxattr(file, "security.evm", sig, err + 1, 0);
if (err < 0) { if (err < 0) {
log_errno("setxattr failed: %s", file); log_errno("setxattr failed: %s", file);
@@ -638,10 +638,10 @@ static int hash_ima(const char *file)
if (verbose >= LOG_INFO) if (verbose >= LOG_INFO)
log_info("hash: "); log_info("hash: ");
if (!set_xattr || verbose >= LOG_INFO) if (!xattr || verbose >= LOG_INFO)
dump(hash, err + 1); dump(hash, err + 1);
if (set_xattr) { if (xattr) {
err = setxattr(file, "security.ima", hash, err + 1, 0); err = setxattr(file, "security.ima", hash, err + 1, 0);
if (err < 0) { if (err < 0) {
log_errno("setxattr failed: %s", file); log_errno("setxattr failed: %s", file);
@@ -679,7 +679,7 @@ static int sign_ima(const char *file, const char *key)
if (err < 0) if (err < 0)
return err; return err;
if (set_xattr) { if (xattr) {
err = setxattr(file, "security.ima", sig, err + 1, 0); err = setxattr(file, "security.ima", sig, err + 1, 0);
if (err < 0) { if (err < 0) {
log_errno("setxattr failed: %s", file); log_errno("setxattr failed: %s", file);
@@ -1035,7 +1035,7 @@ static int hmac_evm(const char *file, const char *key)
memcpy(sig + 1, hash, sizeof(hash)); memcpy(sig + 1, hash, sizeof(hash));
err = sizeof(hash); err = sizeof(hash);
if (set_xattr) { if (xattr) {
err = setxattr(file, "security.evm", sig, err + 1, 0); err = setxattr(file, "security.evm", sig, err + 1, 0);
if (err < 0) { if (err < 0) {
log_errno("setxattr failed: %s", file); log_errno("setxattr failed: %s", file);
@@ -1199,7 +1199,7 @@ int main(int argc, char *argv[])
break; break;
case 'n': case 'n':
/* do not set Extended Attributes... just print signature */ /* do not set Extended Attributes... just print signature */
set_xattr = 0; xattr = 0;
break; break;
case 'a': case 'a':
hash_algo = optarg; hash_algo = optarg;