X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fhome%2Fhomework-fscrypt.c;h=afe3447d62a906016aeca35f2594114bbc46faed;hb=5e476b851251dd5addd39f06ebdf05bb3efb0be7;hp=f8f9f462bbca967766f640fcb5e8b35c377c9008;hpb=a71e17f3e0f872b4264520ac6c4f9312b5312050;p=thirdparty%2Fsystemd.git diff --git a/src/home/homework-fscrypt.c b/src/home/homework-fscrypt.c index f8f9f462bbc..afe3447d62a 100644 --- a/src/home/homework-fscrypt.c +++ b/src/home/homework-fscrypt.c @@ -407,6 +407,7 @@ static int fscrypt_slot_set( _cleanup_free_ void *encrypted = NULL; const EVP_CIPHER *cc; size_t encrypted_size; + ssize_t ss; r = crypto_random_bytes(salt, sizeof(salt)); if (r < 0) @@ -457,12 +458,12 @@ static int fscrypt_slot_set( assert((size_t) encrypted_size_out1 + (size_t) encrypted_size_out2 < encrypted_size); encrypted_size = (size_t) encrypted_size_out1 + (size_t) encrypted_size_out2; - r = base64mem(salt, sizeof(salt), &salt_base64); - if (r < 0) + ss = base64mem(salt, sizeof(salt), &salt_base64); + if (ss < 0) return log_oom(); - r = base64mem(encrypted, encrypted_size, &encrypted_base64); - if (r < 0) + ss = base64mem(encrypted, encrypted_size, &encrypted_base64); + if (ss < 0) return log_oom(); joined = strjoin(salt_base64, ":", encrypted_base64);