Micosoft KB 959040 was the original release of the AMT 2.2 / 2.6 remote configuration (PKI Configuration) hotfix that was released in early January. The file versions shown in KB 959040 are 4.0.6221.1130. In KB 960804, the same files that are updated in KB 959040 are at version 4.0.6221.1146. Because two different versions of these files cannot coexist, I would logically conclude that the newer file version (4.0.6221.1146) would include the same code updates as the earlier version (4.0.6221.1130).
Just FYI, about an hour ago, KB 960804 was installed on one of my ConfigMgr site servers, and I will be testing out PKI-provisioning of an AMT 2.6 device as soon as I get out of today's meetings. I will definitely be posting back my results.
Bottom-line: As long as you install KB 960804, you should be good to go.
Thanks for the followup Trevor. I would also hope that is the case that it was included and had they mentioned it I would not have asked. I may follow up with my MSFT TAM just to be safe.
That said, you may want to double check the status of your site after installing the 960804 patch. I'm running on 2008 x64 and had the following issue on 2 separate sites. Check your mpmsi.log file to verify after the site reset that the MP reinstalls correctly. On my first site this never happened, it tried every hour to reinstall, and I had to remove and readd the BITS role, reboot, for it to successfully reinstall. My second install the MP reinstall worked fine but I finally found out my MP was broken after client status updates were failing. Long story short I found the BITS security error by looking at the logs under c:\inetpub\logs\logfiles\w3svc1\
I hope your install worked well. By the way, you have some great posts out here. Thanks for helping out the community. I love your PS script. I have a bunch of AMT 2.5/2.6 devices that also appear to be missing their HASH values. . . not good.
FYI, the 959040 patch does appear to be included in the 960804 patch. Found it listed here: