diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-28 08:18:35 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-28 08:18:35 -0800 |
| commit | d855f2c295e0bbb7a3b73f8dfc933a539c2a2efe (patch) | |
| tree | 6d309115c206711a6e6a7bba33ac45a7eaddf9f7 /src/DotNetOpenId/RelyingParty | |
| parent | 66f7179ed6fa8bc8bcd7e831ebb8ac4548067d85 (diff) | |
| parent | 360a625667a5e3fcb169710dd35536fc32df8759 (diff) | |
| download | DotNetOpenAuth-origin/v2.6.zip DotNetOpenAuth-origin/v2.6.tar.gz DotNetOpenAuth-origin/v2.6.tar.bz2 | |
Merge branch 'v2.5' into v2.6origin/v2.6
Conflicts:
src/version.txt
Diffstat (limited to 'src/DotNetOpenId/RelyingParty')
| -rw-r--r-- | src/DotNetOpenId/RelyingParty/Token.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/DotNetOpenId/RelyingParty/Token.cs b/src/DotNetOpenId/RelyingParty/Token.cs index c546cb1..68a4e76 100644 --- a/src/DotNetOpenId/RelyingParty/Token.cs +++ b/src/DotNetOpenId/RelyingParty/Token.cs @@ -79,7 +79,13 @@ namespace DotNetOpenId.RelyingParty { /// by discovery (slow but secure).
/// </remarks>
public static Token Deserialize(string token, INonceStore store) {
- byte[] tok = Convert.FromBase64String(token);
+ byte[] tok;
+ try {
+ tok = Convert.FromBase64String(token);
+ } catch (FormatException ex) {
+ throw new OpenIdException(string.Format(CultureInfo.CurrentCulture,
+ Strings.ExpectedBase64OpenIdQueryParameter, token), null, ex);
+ }
if (tok.Length < 1) throw new OpenIdException(Strings.InvalidSignature);
bool signaturePresent = tok[0] == 1;
bool signatureVerified = false;
|