Continue self-review of PyCrypto changes to keystore.py
Merge branch 'demo2' of https://github.com/theupdateframework/tuf into demo2