fix DSA merging conflicts
add DH support
use Strong prime in DH
Merge branch 'fxdupont-dh'