merged encryption settings fix from RC_0_16
move hasher implementation out of header file