diff --git a/src/main/java/com/uid2/core/Main.java b/src/main/java/com/uid2/core/Main.java index e13ce5ac..012a4aae 100644 --- a/src/main/java/com/uid2/core/Main.java +++ b/src/main/java/com/uid2/core/Main.java @@ -1,6 +1,5 @@ package com.uid2.core; -import com.google.auth.oauth2.GoogleCredentials; import com.uid2.core.model.ConfigStore; import com.uid2.core.model.Constants; import com.uid2.core.model.SecretStore; @@ -131,19 +130,6 @@ public static void main(String[] args) { .with("trusted", new TrustedCoreAttestationService()) .with("aws-nitro", new NitroCoreAttestationService(new InMemoryAWSCertificateStore(), corePublicUrl)); - // try read GoogleCredentials - GoogleCredentials googleCredentials = CloudUtils.getGoogleCredentialsFromConfig(config); - if (googleCredentials != null) { - Set enclaveParams = null; - String params = config.getString(Const.Config.GcpEnclaveParamsProp); - if (params != null) { - enclaveParams = Set.of(params.split(",")); - } - - // enable gcp-vmid attestation if requested - attestationService - .with("gcp-vmid", new GcpVmidCoreAttestationService(googleCredentials, enclaveParams)); - } var maaServerBaseUrl = ConfigStore.Global.getOrDefault(com.uid2.core.Const.Config.MaaServerBaseUrlProp, "https://sharedeus.eus.attest.azure.net"); attestationService.with("azure-cc", new AzureCCCoreAttestationService(maaServerBaseUrl, ConfigStore.Global.get(Const.Config.CorePublicUrlProp))); diff --git a/src/main/resources/com.uid2.core/test/enclaves/enclaves.json b/src/main/resources/com.uid2.core/test/enclaves/enclaves.json index c7037e02..94a9b2df 100644 --- a/src/main/resources/com.uid2.core/test/enclaves/enclaves.json +++ b/src/main/resources/com.uid2.core/test/enclaves/enclaves.json @@ -5,12 +5,6 @@ "identifier": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "created": 1620693995 }, - { - "name": "debug-gcp-vmid", - "protocol": "gcp-vmid", - "identifier": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "created": 1620693995 - }, { "name": "debug-gcp-oidc", "protocol": "gcp-oidc", diff --git a/src/main/resources/com.uid2.core/test/operators/operators.json b/src/main/resources/com.uid2.core/test/operators/operators.json index 795783cc..7de9ac26 100644 --- a/src/main/resources/com.uid2.core/test/operators/operators.json +++ b/src/main/resources/com.uid2.core/test/operators/operators.json @@ -26,16 +26,6 @@ "key_salt": "W0i/DcKwCqBGD3jN6dNTsFl+tp6akTc3LpEVRuK5OB0=", "key_id": "test-partner-key" }, - { - "key": "test-gcp-key", - "name": "partner-gcp@uid2.com", - "contact": "partner-gcp@uid2.com", - "created": 1617149276, - "protocol": "gcp-vmid", - "key_hash": "+8Vp3bOKibg7PpWomCtolqZu3uRqR7G5DLcAwvt9n2ZqkWAdmPGoXuQMcEBAmE/nAslF7eA+VwXLp7zN40IZkA==", - "key_salt": "uJYzyAZujZ6QOatbwEB9/+/sgXe3jvPvYaULNANxgkQ=", - "key_id": "test-gcp-key" - }, { "key": "test-gcp-key-2", "name": "partner-gcp-2@uid2.com",