Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 409d9b9e authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fs: crypto: remove key derivation code duplication"

parents 4f49aa35 5288206c
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ static int validate_user_key(struct fscrypt_info *crypt_info,
		res = -ENOKEY;
		goto out;
	}
	res = derive_key_aes(ctx->nonce, master_key, crypt_info->ci_raw_key);
	/* If we don't need to derive, we still want to do everything
	 * up until now to validate the key. It's cleaner to fail now
	 * than to fail in block I/O.