Comment 12 for bug 1265665

Patches all checkout for me. I didn't attempt a timing attack but the changes seem reasonable. +2