Merge pull request #8073 from daverodgman/empty-enum-fix

Fix compile fail for empty enum in cipher_wrap