diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2023-03-30 08:53:12 +0200 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2023-03-30 08:53:12 +0200 |
commit | 8ba264f418f734aade3a77086bb1d51d0e2723ce (patch) | |
tree | ca6749e28544c393305b8606c0230ac50126041a /fs/ksmbd/auth.c | |
parent | fbb3b3500f76ec8b741bd2d0e761ca3e856ad924 (diff) | |
parent | 82bbec189ab34873688484cd14189a5392946fbb (diff) | |
download | linux-8ba264f418f734aade3a77086bb1d51d0e2723ce.tar.gz |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
Backmerge to get rc4.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'fs/ksmbd/auth.c')
-rw-r--r-- | fs/ksmbd/auth.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ksmbd/auth.c b/fs/ksmbd/auth.c index 6e61b5bc7d86..cead696b656a 100644 --- a/fs/ksmbd/auth.c +++ b/fs/ksmbd/auth.c @@ -727,8 +727,9 @@ static int generate_key(struct ksmbd_conn *conn, struct ksmbd_session *sess, goto smb3signkey_ret; } - if (conn->cipher_type == SMB2_ENCRYPTION_AES256_CCM || - conn->cipher_type == SMB2_ENCRYPTION_AES256_GCM) + if (key_size == SMB3_ENC_DEC_KEY_SIZE && + (conn->cipher_type == SMB2_ENCRYPTION_AES256_CCM || + conn->cipher_type == SMB2_ENCRYPTION_AES256_GCM)) rc = crypto_shash_update(CRYPTO_HMACSHA256(ctx), L256, 4); else rc = crypto_shash_update(CRYPTO_HMACSHA256(ctx), L128, 4); |