Fix to #739.
Ops: I missed one cast.
'Improve' Raw-sha1 initialization too.
Merge pull request #787 from claudioandre/bleeding-jumbo

Patch to allow a -test=0 to succeed.