Clean up some BN stuff
Added unit test for evp_bytestokey
Merge remote-tracking branch 'upstream/master'