Merge pull request #183 from claudioandre/bleeding-jumbo

Use sha.h and sha2.h as recommended at http://www.openwall.com/lists/joh...
Merge pull request #184 from claudioandre/bleeding-jumbo

Replace spaces with tabs (only).
Reintroduced some missed code during bleeding merge.