Merge some common functionality in the apps, delete the encryption option in the pkcs7 utility (they never did anything) and add a couple more options to pkcs7.