Yes. Unfortunately, this is an area that has become a zero sum game. Encryption needs to happen by default in every communication. It goes beyond that, entire systems and cryptographic constructs need to be overhauled in the wake of the NIST / NSA revelations. Starting with TLS, particularly TLS that relies on commercial certificate vendors to function. It's a total clusterfuck.