remove configurable ciphers + curve, we don't want it
Merge branch 'master' into portable