I'm guessing that vulnerabilities tied to ongoing manufacturer control (CPUs, cars, Polish locomotives, etc.) will continue until a widespread attack turns public opinion.
And I fear that even then, lobbyists and/or intelligence agencies will neuter any response.
Shoot, now I'm just making myself depressed.