diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-06-17 16:52:30 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-06-17 16:52:30 -0700 |
| commit | f3ca97f8c8471d929aa2e137f05b3ef85672e39f (patch) | |
| tree | fb6a914402d49f6a096aab534aebb4103828030d /src | |
| parent | d2e6a1a1a677cb22471fdc25752c72998ae81899 (diff) | |
| download | DotNetOpenAuth-f3ca97f8c8471d929aa2e137f05b3ef85672e39f.zip DotNetOpenAuth-f3ca97f8c8471d929aa2e137f05b3ef85672e39f.tar.gz DotNetOpenAuth-f3ca97f8c8471d929aa2e137f05b3ef85672e39f.tar.bz2 | |
Fixed merge errors.
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOpenAuth/DotNetOpenAuth.csproj | 11 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/OpenId/Provider/PrivatePersonalIdentifierProviderBase.cs | 5 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj index 7a35732..7050ea1 100644 --- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj +++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj @@ -477,11 +477,6 @@ <Compile Include="OpenId\RelyingParty\ServiceEndpoint.cs" /> <Compile Include="OpenId\OpenIdXrdsHelper.cs" /> <Compile Include="OpenId\RelyingParty\StandardRelyingPartyApplicationStore.cs" /> - <Compile Include="OpenId\Behaviors\BehaviorStrings.Designer.cs"> - <AutoGen>True</AutoGen> - <DesignTime>True</DesignTime> - <DependentUpon>BehaviorStrings.resx</DependentUpon> - </Compile> <Compile Include="OpenId\Behaviors\USGovernmentLevel1.cs" /> <Compile Include="OpenId\RelyingParty\WellKnownProviders.cs" /> <Compile Include="OpenId\SecuritySettings.cs" /> @@ -578,10 +573,6 @@ <EmbeddedResource Include="InfoCard\infocard_81x57.png" /> <EmbeddedResource Include="InfoCard\infocard_92x64.png" /> <EmbeddedResource Include="InfoCard\SupportingScript.js" /> - <EmbeddedResource Include="OpenId\Behaviors\BehaviorStrings.resx"> - <Generator>ResXFileCodeGenerator</Generator> - <LastGenOutput>BehaviorStrings.Designer.cs</LastGenOutput> - </EmbeddedResource> </ItemGroup> <ItemGroup> <EmbeddedResource Include="OpenId\RelyingParty\OpenIdRelyingPartyControlBase.js" /> @@ -595,4 +586,4 @@ </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="..\..\tools\DotNetOpenAuth.Versioning.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/DotNetOpenAuth/OpenId/Provider/PrivatePersonalIdentifierProviderBase.cs b/src/DotNetOpenAuth/OpenId/Provider/PrivatePersonalIdentifierProviderBase.cs index fa2236d..64d2908 100644 --- a/src/DotNetOpenAuth/OpenId/Provider/PrivatePersonalIdentifierProviderBase.cs +++ b/src/DotNetOpenAuth/OpenId/Provider/PrivatePersonalIdentifierProviderBase.cs @@ -124,11 +124,6 @@ namespace DotNetOpenAuth.OpenId.Provider { ErrorUtilities.VerifyArgumentNotNull(relyingPartyRealm, "relyingPartyRealm"); ErrorUtilities.VerifyArgumentNamed(this.IsUserLocalIdentifier(localIdentifier), "localIdentifier", OpenIdStrings.ArgumentIsPpidIdentifier); - if (localIdentifier.ToString().StartsWith(this.BaseIdentifier.AbsoluteUri, StringComparison.Ordinal)) { - Logger.OpenId.Warn("Trying to generate a PPID from a PPID. Returning original PPID."); - return new Uri(localIdentifier); - } - byte[] salt = this.GetHashSaltForLocalIdentifier(localIdentifier); string valueToHash = localIdentifier + "#"; switch (this.PairwiseUnique) { |