Using the bundled cert

cfphpflex · Nov 12, 2014 · 7c9cbca · 7c9cbca
1 parent 3926a02
commit 7c9cbca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/src/Aws/ConfigService/ConfigServiceClient.php b/src/Aws/ConfigService/ConfigServiceClient.php
@@ -61,8 +61,7 @@ public static function factory($config = array())
             ->setConfig($config)
             ->setConfigDefaults(array(
                 Options::VERSION             => self::LATEST_API_VERSION,
-                Options::SERVICE_DESCRIPTION => __DIR__ . '/Resources/configservice-%s.php',
-                Options::SSL_CERT            => 'system'
+                Options::SERVICE_DESCRIPTION => __DIR__ . '/Resources/configservice-%s.php'
             ))
             ->setExceptionParser(new JsonQueryExceptionParser())
             ->build();

diff --git a/src/Aws/Kms/KmsClient.php b/src/Aws/Kms/KmsClient.php
@@ -74,7 +74,6 @@ public static function factory($config = array())
         return ClientBuilder::factory(__NAMESPACE__)
             ->setConfig($config)
             ->setConfigDefaults(array(
-                Options::SSL_CERT            => 'system',
                 Options::VERSION             => self::LATEST_API_VERSION,
                 Options::SERVICE_DESCRIPTION => __DIR__ . '/Resources/kms-%s.php'
             ))

diff --git a/src/Aws/S3/S3Client.php b/src/Aws/S3/S3Client.php
@@ -169,20 +169,12 @@ public static function factory($config = array())
 
         $config[Options::SIGNATURE] = $signature = static::createSignature($config);
 
-        $configDefaults = array(
-            Options::VERSION => self::LATEST_API_VERSION,
-            Options::SERVICE_DESCRIPTION => __DIR__ . '/Resources/s3-%s.php'
-        );
-
-        // Use the system cert for now. This change will possibly be applied by
-        // default across all clients and regions.
-        if (isset($config['region']) && $config['region'] == 'eu-central-1') {
-            $configDefaults[Options::SSL_CERT] = 'system';
-        }
-
         $client = ClientBuilder::factory(__NAMESPACE__)
             ->setConfig($config)
-            ->setConfigDefaults($configDefaults)
+            ->setConfigDefaults(array(
+                Options::VERSION => self::LATEST_API_VERSION,
+                Options::SERVICE_DESCRIPTION => __DIR__ . '/Resources/s3-%s.php'
+            ))
             ->setExceptionParser($exceptionParser)
             ->setIteratorsConfig(array(
                 'more_key' => 'IsTruncated',