Add refreshed Store source certs (#3149)

microsoft · Apr 13, 2023 · 978bc13 · 978bc13
1 parent d8ff3ae
commit 978bc13
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 0 deletions.
diff --git a/src/AppInstallerRepositoryCore/SourceList.cpp b/src/AppInstallerRepositoryCore/SourceList.cpp
@@ -318,8 +318,17 @@ namespace AppInstaller::Repository
                 chainElement = chainElement.Next();
                 chainElement->LoadCertificate(IDX_CERTIFICATE_STORE_LEAF_1).SetPinning(PinningVerificationType::Subject | PinningVerificationType::Issuer);
 
+                PinningChain chain2;
+                auto chainElement2 = chain2.Root();
+                chainElement2->LoadCertificate(IDX_CERTIFICATE_STORE_ROOT_2).SetPinning(PinningVerificationType::PublicKey);
+                chainElement2 = chainElement2.Next();
+                chainElement2->LoadCertificate(IDX_CERTIFICATE_STORE_INTERMEDIATE_2).SetPinning(PinningVerificationType::Subject | PinningVerificationType::Issuer);
+                chainElement2 = chainElement2.Next();
+                chainElement2->LoadCertificate(IDX_CERTIFICATE_STORE_LEAF_2).SetPinning(PinningVerificationType::Subject | PinningVerificationType::Issuer);
+
                 details.CertificatePinningConfiguration = PinningConfiguration("Microsoft Store Source");
                 details.CertificatePinningConfiguration.AddChain(std::move(chain));
+                details.CertificatePinningConfiguration.AddChain(std::move(chain2));
             }
 
             return details;

diff --git a/src/CertificateResources/CertificateResources.h b/src/CertificateResources/CertificateResources.h
@@ -7,3 +7,6 @@
 #define IDX_CERTIFICATE_STORE_ROOT_1            401
 #define IDX_CERTIFICATE_STORE_INTERMEDIATE_1    402
 #define IDX_CERTIFICATE_STORE_LEAF_1            403
+#define IDX_CERTIFICATE_STORE_ROOT_2            404
+#define IDX_CERTIFICATE_STORE_INTERMEDIATE_2    405
+#define IDX_CERTIFICATE_STORE_LEAF_2            406
diff --git a/src/CertificateResources/CertificateResources.rc b/src/CertificateResources/CertificateResources.rc
@@ -67,3 +67,7 @@ END
 IDX_CERTIFICATE_STORE_ROOT_1            CERTIFICATE_RESOURCE_TYPE     "StoreRoot1.cer"
 IDX_CERTIFICATE_STORE_INTERMEDIATE_1    CERTIFICATE_RESOURCE_TYPE     "StoreIntermediate1.cer"
 IDX_CERTIFICATE_STORE_LEAF_1            CERTIFICATE_RESOURCE_TYPE     "StoreLeaf1.cer"
+
+IDX_CERTIFICATE_STORE_ROOT_2            CERTIFICATE_RESOURCE_TYPE     "StoreRoot2.cer"
+IDX_CERTIFICATE_STORE_INTERMEDIATE_2    CERTIFICATE_RESOURCE_TYPE     "StoreIntermediate2.cer"
+IDX_CERTIFICATE_STORE_LEAF_2            CERTIFICATE_RESOURCE_TYPE     "StoreLeaf2.cer"
diff --git a/src/CertificateResources/CertificateResources.vcxitems b/src/CertificateResources/CertificateResources.vcxitems
@@ -17,6 +17,9 @@
     <None Include="$(MSBuildThisFileDirectory)StoreRoot1.cer" />
     <None Include="$(MSBuildThisFileDirectory)StoreIntermediate1.cer" />
     <None Include="$(MSBuildThisFileDirectory)StoreLeaf1.cer" />
+    <None Include="$(MSBuildThisFileDirectory)StoreRoot2.cer" />
+    <None Include="$(MSBuildThisFileDirectory)StoreIntermediate2.cer" />
+    <None Include="$(MSBuildThisFileDirectory)StoreLeaf2.cer" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)CertificateResources.h" />

diff --git a/src/CertificateResources/CertificateResources.vcxitems.filters b/src/CertificateResources/CertificateResources.vcxitems.filters
@@ -15,6 +15,15 @@
     <None Include="$(MSBuildThisFileDirectory)StoreLeaf1.cer">
       <Filter>Certificates</Filter>
     </None>
+    <None Include="$(MSBuildThisFileDirectory)StoreRoot2.cer">
+      <Filter>Certificates</Filter>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)StoreIntermediate2.cer">
+      <Filter>Certificates</Filter>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)StoreLeaf2.cer">
+      <Filter>Certificates</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)resource.h" />

diff --git a/src/CertificateResources/StoreIntermediate2.cer b/src/CertificateResources/StoreIntermediate2.cer
diff --git a/src/CertificateResources/StoreLeaf2.cer b/src/CertificateResources/StoreLeaf2.cer
diff --git a/src/CertificateResources/StoreRoot2.cer b/src/CertificateResources/StoreRoot2.cer