Revert "Fix heap-smashing bug in keymaster key encryption."

This reverts commit cbb26fa796506f721d7e6a5e40b6c57ba66facfe.
1 file changed