Make return statements consistent (cosmetic)
Merge branch 'working' of https://github.com/trevp/openssl into working