Corrected the length of the salt for private key encryption
This would corrupt the private key file whenever the DES cipher would get selected.
Merge branch 'master' into 346-int
Test proving #346
Merge branch 'master' into 346-int
Fix a braino in new test