Adding Fiat-Shamir challenge generator
Merge origin/master