From 10a6318b1fdbf2b1910f68d0433a04470a1cffd7 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sun, 3 Jan 2016 11:03:47 +0100 Subject: [PATCH] Fix cipher_null key setting in kernel crypto backend. --- lib/crypto_backend/crypto_cipher_kernel.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/crypto_backend/crypto_cipher_kernel.c b/lib/crypto_backend/crypto_cipher_kernel.c index 46e1f97b..2b3417cd 100644 --- a/lib/crypto_backend/crypto_cipher_kernel.c +++ b/lib/crypto_backend/crypto_cipher_kernel.c @@ -123,8 +123,10 @@ int crypt_cipher_init(struct crypt_cipher **ctx, const char *name, return -ENOENT; } - if (length && strcmp(name, "cipher_null") && - setsockopt(h->tfmfd, SOL_ALG, ALG_SET_KEY, buffer, length) < 0) { + if (!strcmp(name, "cipher_null")) + length = 0; + + if (setsockopt(h->tfmfd, SOL_ALG, ALG_SET_KEY, buffer, length) < 0) { crypt_cipher_destroy(h); return -EINVAL; }