Merge "crypto: cbc - Remove VLA usage"