Added some crypto functions
Merge branch 'master' of git@github.com:EEXCESS/privacy-proxy.git