Rename CxPlatPlat to CxPlat (microsoft#1275)

boscorona · Feb 24, 2021 · f0be283 · f0be283
1 parent 9556496
commit f0be283
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/src/inc/msquichelper.h b/src/inc/msquichelper.h
@@ -453,7 +453,7 @@ GetServerConfigurationFromArgs(
 
 #ifdef QUIC_TEST_APIS
     } else if (GetValue(argc, argv, "selfsign")) {
-        Config = CxPlatPlatGetSelfSignedCert(CXPLAT_SELF_SIGN_CERT_USER, FALSE);
+        Config = CxPlatGetSelfSignedCert(CXPLAT_SELF_SIGN_CERT_USER, FALSE);
         if (!Config) {
             return nullptr;
         }
@@ -489,7 +489,7 @@ GetServerConfigurationFromArgs(
 
 #ifdef QUIC_TEST_APIS
     if (!Configuration && Config != &Helper.CredConfig) {
-        CxPlatPlatFreeSelfSignedCert(Config);
+        CxPlatFreeSelfSignedCert(Config);
     }
 #endif
 
@@ -506,7 +506,7 @@ FreeServerConfiguration(
 #ifdef QUIC_TEST_APIS
     auto SelfSignedConfig = (const QUIC_CREDENTIAL_CONFIG*)MsQuic->GetContext(Configuration);
     if (SelfSignedConfig) {
-        CxPlatPlatFreeSelfSignedCert(SelfSignedConfig);
+        CxPlatFreeSelfSignedCert(SelfSignedConfig);
     }
 #endif
     MsQuic->ConfigurationClose(Configuration);

diff --git a/src/inc/quic_platform.h b/src/inc/quic_platform.h
@@ -335,14 +335,14 @@ typedef enum CXPLAT_SELF_SIGN_CERT_TYPE {
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 const QUIC_CREDENTIAL_CONFIG*
-CxPlatPlatGetSelfSignedCert(
+CxPlatGetSelfSignedCert(
     _In_ CXPLAT_SELF_SIGN_CERT_TYPE Type,
     _In_ BOOLEAN ClientCertificate
     );
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 void
-CxPlatPlatFreeSelfSignedCert(
+CxPlatFreeSelfSignedCert(
     _In_ const QUIC_CREDENTIAL_CONFIG* CredConfig
     );
 

diff --git a/src/perf/bin/appmain.cpp b/src/perf/bin/appmain.cpp
@@ -390,7 +390,7 @@ main(
     }
 
     SelfSignedCredConfig =
-        CxPlatPlatGetSelfSignedCert(
+        CxPlatGetSelfSignedCert(
             TestingKernelMode ?
                 CXPLAT_SELF_SIGN_CERT_MACHINE :
                 CXPLAT_SELF_SIGN_CERT_USER,
@@ -415,7 +415,7 @@ main(
 
 Exit:
     if (SelfSignedCredConfig) {
-        CxPlatPlatFreeSelfSignedCert(SelfSignedCredConfig);
+        CxPlatFreeSelfSignedCert(SelfSignedCredConfig);
     }
 
     CxPlatUninitialize();

diff --git a/src/platform/selfsign_capi.c b/src/platform/selfsign_capi.c
@@ -973,7 +973,7 @@ FindOrCreateCertificate(
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 const QUIC_CREDENTIAL_CONFIG*
-CxPlatPlatGetSelfSignedCert(
+CxPlatGetSelfSignedCert(
     _In_ CXPLAT_SELF_SIGN_CERT_TYPE Type,
     _In_ BOOLEAN IsClient
     )
@@ -1001,7 +1001,7 @@ CxPlatPlatGetSelfSignedCert(
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 void
-CxPlatPlatFreeSelfSignedCert(
+CxPlatFreeSelfSignedCert(
     _In_ const QUIC_CREDENTIAL_CONFIG* Params
     )
 {

diff --git a/src/platform/selfsign_openssl.c b/src/platform/selfsign_openssl.c
@@ -296,7 +296,7 @@ typedef struct CXPLAT_CREDENTIAL_CONFIG_INTERNAL {
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 const QUIC_CREDENTIAL_CONFIG*
-CxPlatPlatGetSelfSignedCert(
+CxPlatGetSelfSignedCert(
     _In_ CXPLAT_SELF_SIGN_CERT_TYPE Type,
     _In_ BOOLEAN ClientCertificate
     )
@@ -428,7 +428,7 @@ CxPlatPlatGetSelfSignedCert(
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 void
-CxPlatPlatFreeSelfSignedCert(
+CxPlatFreeSelfSignedCert(
     _In_ const QUIC_CREDENTIAL_CONFIG* CredConfig
     )
 {

diff --git a/src/platform/selfsign_stub.c b/src/platform/selfsign_stub.c
@@ -18,7 +18,7 @@
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 const QUIC_CREDENTIAL_CONFIG*
-CxPlatPlatGetSelfSignedCert(
+CxPlatGetSelfSignedCert(
     _In_ CXPLAT_SELF_SIGN_CERT_TYPE Type,
     _In_ BOOLEAN ClientCertificate
     )
@@ -36,7 +36,7 @@ CxPlatPlatGetSelfSignedCert(
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 void
-CxPlatPlatFreeSelfSignedCert(
+CxPlatFreeSelfSignedCert(
     _In_ const QUIC_CREDENTIAL_CONFIG* Params
     )
 {

diff --git a/src/platform/unittest/TlsTest.cpp b/src/platform/unittest/TlsTest.cpp
@@ -58,21 +58,21 @@ struct TlsTest : public ::testing::TestWithParam<bool>
 
     static void SetUpTestSuite()
     {
-        SelfSignedCertParams = (QUIC_CREDENTIAL_CONFIG*)CxPlatPlatGetSelfSignedCert(CXPLAT_SELF_SIGN_CERT_USER, FALSE);
+        SelfSignedCertParams = (QUIC_CREDENTIAL_CONFIG*)CxPlatGetSelfSignedCert(CXPLAT_SELF_SIGN_CERT_USER, FALSE);
         ASSERT_NE(nullptr, SelfSignedCertParams);
 #ifndef QUIC_DISABLE_CLIENT_CERT_TESTS
-        ClientCertParams = (QUIC_CREDENTIAL_CONFIG*)CxPlatPlatGetSelfSignedCert(CXPLAT_SELF_SIGN_CERT_USER, TRUE);
+        ClientCertParams = (QUIC_CREDENTIAL_CONFIG*)CxPlatGetSelfSignedCert(CXPLAT_SELF_SIGN_CERT_USER, TRUE);
         ASSERT_NE(nullptr, ClientCertParams);
         ClientCertParams->Flags |= QUIC_CREDENTIAL_FLAG_NO_CERTIFICATE_VALIDATION;
 #endif
     }
 
     static void TearDownTestSuite()
     {
-        CxPlatPlatFreeSelfSignedCert(SelfSignedCertParams);
+        CxPlatFreeSelfSignedCert(SelfSignedCertParams);
         SelfSignedCertParams = nullptr;
 #ifndef QUIC_DISABLE_CLIENT_CERT_TESTS
-        CxPlatPlatFreeSelfSignedCert(ClientCertParams);
+        CxPlatFreeSelfSignedCert(ClientCertParams);
         ClientCertParams = nullptr;
 #endif
     }

diff --git a/src/test/bin/quic_gtest.cpp b/src/test/bin/quic_gtest.cpp
@@ -26,7 +26,7 @@ class QuicTestEnvironment : public ::testing::Environment {
         CxPlatSystemLoad();
         ASSERT_TRUE(QUIC_SUCCEEDED(CxPlatInitialize()));
         ASSERT_TRUE((SelfSignedCertParams =
-            CxPlatPlatGetSelfSignedCert(
+            CxPlatGetSelfSignedCert(
                 TestingKernelMode ?
                     CXPLAT_SELF_SIGN_CERT_MACHINE :
                     CXPLAT_SELF_SIGN_CERT_USER,
@@ -62,7 +62,7 @@ class QuicTestEnvironment : public ::testing::Environment {
             QuicTestUninitialize();
             delete MsQuic;
         }
-        CxPlatPlatFreeSelfSignedCert(SelfSignedCertParams);
+        CxPlatFreeSelfSignedCert(SelfSignedCertParams);
         CxPlatUninitialize();
         CxPlatSystemUnload();
     }

diff --git a/src/tools/spin/spinquic.cpp b/src/tools/spin/spinquic.cpp
@@ -619,7 +619,7 @@ CXPLAT_THREAD_CALLBACK(ServerSpin, Context)
 
     ASSERT_ON_NOT(ServerConfiguration);
 
-    auto CredConfig = CxPlatPlatGetSelfSignedCert(CXPLAT_SELF_SIGN_CERT_USER, FALSE);
+    auto CredConfig = CxPlatGetSelfSignedCert(CXPLAT_SELF_SIGN_CERT_USER, FALSE);
     ASSERT_ON_NOT(CredConfig);
 
     ASSERT_ON_FAILURE(
@@ -669,7 +669,7 @@ CXPLAT_THREAD_CALLBACK(ServerSpin, Context)
     }
 
     MsQuic->ConfigurationClose(ServerConfiguration);
-    CxPlatPlatFreeSelfSignedCert(CredConfig);
+    CxPlatFreeSelfSignedCert(CredConfig);
 
     CXPLAT_THREAD_RETURN(0);
 }