summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2008-09-29 22:53:04 -0700
committerAndrew <andrewarnott@gmail.com>2008-10-02 07:33:53 -0700
commit55c86fc27084af191bbb80fb91da34c24b945c3e (patch)
tree763c3d65b35c306f4fde3d2a88c093d0aa40e999
parent824734c85a613e900f552c554aada6cc4588531a (diff)
downloadDotNetOpenAuth-55c86fc27084af191bbb80fb91da34c24b945c3e.zip
DotNetOpenAuth-55c86fc27084af191bbb80fb91da34c24b945c3e.tar.gz
DotNetOpenAuth-55c86fc27084af191bbb80fb91da34c24b945c3e.tar.bz2
Removed double URI escaping from signature binding elements.
This gets the first legs of OAuth working with Google.
-rw-r--r--src/DotNetOAuth.Test/ChannelElements/HmacSha1SigningBindingElementTests.cs2
-rw-r--r--src/DotNetOAuth.Test/ChannelElements/PlainTextSigningBindingElementTest.cs4
-rw-r--r--src/DotNetOAuth/ChannelElements/HmacSha1SigningBindingElement.cs2
-rw-r--r--src/DotNetOAuth/ChannelElements/PlainTextSigningBindingElement.cs2
-rw-r--r--src/DotNetOAuth/ChannelElements/RsaSha1SigningBindingElement.cs2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/DotNetOAuth.Test/ChannelElements/HmacSha1SigningBindingElementTests.cs b/src/DotNetOAuth.Test/ChannelElements/HmacSha1SigningBindingElementTests.cs
index b35855e..f02098d 100644
--- a/src/DotNetOAuth.Test/ChannelElements/HmacSha1SigningBindingElementTests.cs
+++ b/src/DotNetOAuth.Test/ChannelElements/HmacSha1SigningBindingElementTests.cs
@@ -16,7 +16,7 @@ namespace DotNetOAuth.Test.ChannelElements {
RequestTokenMessage message = SigningBindingElementBaseTests.CreateTestRequestTokenMessage();
HmacSha1SigningBindingElement_Accessor hmac = new HmacSha1SigningBindingElement_Accessor();
- Assert.AreEqual("kR0LhH8UqylaLfR%2FesXVVlP4sQI%3D", hmac.GetSignature(message));
+ Assert.AreEqual("kR0LhH8UqylaLfR/esXVVlP4sQI=", hmac.GetSignature(message));
}
}
}
diff --git a/src/DotNetOAuth.Test/ChannelElements/PlainTextSigningBindingElementTest.cs b/src/DotNetOAuth.Test/ChannelElements/PlainTextSigningBindingElementTest.cs
index 2c26df8..00ede7d 100644
--- a/src/DotNetOAuth.Test/ChannelElements/PlainTextSigningBindingElementTest.cs
+++ b/src/DotNetOAuth.Test/ChannelElements/PlainTextSigningBindingElementTest.cs
@@ -22,7 +22,7 @@ namespace DotNetOAuth.Test.ChannelElements
message.TokenSecret = "ts";
Assert.IsTrue(target.PrepareMessageForSending(message));
Assert.AreEqual("PLAINTEXT", message.SignatureMethod);
- Assert.AreEqual("cs%26ts", message.Signature);
+ Assert.AreEqual("cs&ts", message.Signature);
}
[TestMethod]
@@ -33,7 +33,7 @@ namespace DotNetOAuth.Test.ChannelElements
message.ConsumerSecret = "cs";
message.TokenSecret = "ts";
message.SignatureMethod = "PLAINTEXT";
- message.Signature = "cs%26ts";
+ message.Signature = "cs&ts";
Assert.IsTrue(target.PrepareMessageForReceiving(message));
}
diff --git a/src/DotNetOAuth/ChannelElements/HmacSha1SigningBindingElement.cs b/src/DotNetOAuth/ChannelElements/HmacSha1SigningBindingElement.cs
index 67246af..6a81d1b 100644
--- a/src/DotNetOAuth/ChannelElements/HmacSha1SigningBindingElement.cs
+++ b/src/DotNetOAuth/ChannelElements/HmacSha1SigningBindingElement.cs
@@ -34,7 +34,7 @@ namespace DotNetOAuth.ChannelElements {
string baseString = ConstructSignatureBaseString(message);
Logger.DebugFormat("Signing message with signature base string: {0}", baseString);
byte[] digest = hasher.ComputeHash(Encoding.ASCII.GetBytes(baseString));
- return Uri.EscapeDataString(Convert.ToBase64String(digest));
+ return Convert.ToBase64String(digest);
}
}
}
diff --git a/src/DotNetOAuth/ChannelElements/PlainTextSigningBindingElement.cs b/src/DotNetOAuth/ChannelElements/PlainTextSigningBindingElement.cs
index 73bb6c2..cebdef9 100644
--- a/src/DotNetOAuth/ChannelElements/PlainTextSigningBindingElement.cs
+++ b/src/DotNetOAuth/ChannelElements/PlainTextSigningBindingElement.cs
@@ -32,7 +32,7 @@ namespace DotNetOAuth.ChannelElements {
/// This method signs the message according to OAuth 1.0 section 9.4.1.
/// </remarks>
protected override string GetSignature(ITamperResistantOAuthMessage message) {
- return Uri.EscapeDataString(GetConsumerAndTokenSecretString(message));
+ return GetConsumerAndTokenSecretString(message);
}
/// <summary>
diff --git a/src/DotNetOAuth/ChannelElements/RsaSha1SigningBindingElement.cs b/src/DotNetOAuth/ChannelElements/RsaSha1SigningBindingElement.cs
index ac9c78c..20ba93c 100644
--- a/src/DotNetOAuth/ChannelElements/RsaSha1SigningBindingElement.cs
+++ b/src/DotNetOAuth/ChannelElements/RsaSha1SigningBindingElement.cs
@@ -33,7 +33,7 @@ namespace DotNetOAuth.ChannelElements {
AsymmetricSignatureFormatter hasher = new RSAPKCS1SignatureFormatter(provider);
hasher.SetHashAlgorithm("SHA1");
byte[] digest = hasher.CreateSignature(Encoding.ASCII.GetBytes(ConstructSignatureBaseString(message)));
- return Uri.EscapeDataString(Convert.ToBase64String(digest));
+ return Convert.ToBase64String(digest);
}
}
}