Merge pull request guzzle#25 from matthewpeach/improve-rsa-private-ke…

…y-signing

Fixed signing of passphrase protected RSA keys; tidied config naming.

README.rst

@@ -66,3 +66,18 @@ the client using the client's ``defaults`` constructor option.
 .. note::
 
     You can omit the token and token_secret options to use two-legged OAuth.
+
+Using the RSA-SH1 signature method
+==================================
+
+.. code-block:: php
+
+    use GuzzleHttp\Subscriber\Oauth\Oauth1;
+
+    $oauth = new Oauth1([
+        'consumer_key'    => 'my_key',
+        'consumer_secret' => 'my_secret',
+        'private_key_file' => 'my_path_to_private_key_file',
+        'private_key_passphrase' => 'my_passphrase',
+        'signature_method' => Oauth1::SIGNATURE_METHOD_RSA,
+    ]);

src/Oauth1.php

@@ -48,6 +48,8 @@ class Oauth1 implements SubscriberInterface
      * - callback: OAuth callback
      * - consumer_key: Consumer key string. Defaults to "anonymous".
      * - consumer_secret: Consumer secret. Defaults to "anonymous".
+     * - private_key_file: The location of your private key file (RSA-SHA1 signature method only)
+     * - private_key_passphrase: The passphrase for your private key file (RSA-SHA1 signature method only)
      * - token: Client token
      * - token_secret: Client secret token
      * - verifier: OAuth verifier.
@@ -247,8 +249,8 @@ private function signUsingRsaSha1($baseString)
         }
 
         $privateKey = openssl_pkey_get_private(
-            file_get_contents($this->config['consumer_secret']),
-            $this->config['consumer_secret']
+            file_get_contents($this->config['private_key_file']),
+            $this->config['private_key_passphrase']
         );
 
         $signature = '';