Skip to content

Commit

Permalink
Fixed A/B check and GitIgnore.
Browse files Browse the repository at this point in the history
  • Loading branch information
@EddieDemon
EddieDemon committed Apr 17, 2013
1 parent 56ca2c2 commit aeb1e1d
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Expand Up @@ -64,7 +64,7 @@ local.properties
*.vspscc
.builds
**/*.dotCover
**/Documentation/
*/Documentation/

## TODO: If you have NuGet Package Restore enabled, uncomment this
#**/packages/
Expand Down
4 changes: 2 additions & 2 deletions CPlan.SRP.Client/Carrier.cs
View file
Expand Up @@ -82,7 +82,7 @@ public Carrier(string userName, string password)
{
UserName = userName;
Password = password;
while (((A % N) == 0) || A == null)
while (A == BigInteger.Zero || ((A % N) == BigInteger.Zero))
{
a = Functional.Geta();
A = Functional.CalcA(a, g, N);
Expand All @@ -96,7 +96,7 @@ public Carrier(string userName, string password)
/// <param name="B">The public server value.</param>
public void CalculateEverthing(byte[] salt, BigInteger B)
{
if ((B % N) == 0) { throw new ArgumentException("B modulo N (B % N) equals 0, this is in invalid value.", "B"); }
if ((B % N) == BigInteger.Zero) { throw new ArgumentException("B modulo N (B % N) equals 0, this is in invalid value.", "B"); }
S = F.CalcS(a, B, F.Calck(g, N), F.Calcx(salt, UserName, Password), F.Calcu(A, B, N), g, N); // Calculate S.
K = F.CalcK(S); // Calculate K.
M = F.M(Password, salt, A, B, K, g, N); // Calculate M.
Expand Down
4 changes: 2 additions & 2 deletions CPlan.SRP.Host/Carrier.cs
View file
Expand Up @@ -94,9 +94,9 @@ public class Carrier
/// <param name="A">The public client value.</param>
public void CalculateEverthing(BigInteger A)
{
if ((A % N) == 0) { throw new ArgumentException("A modulo N (A % N) equals 0, this is in invalid value.", "A"); }
if ((A % N) == BigInteger.Zero) { throw new ArgumentException("A modulo N (A % N) equals 0, this is in invalid value.", "A"); }

while (((B % N) == 0) || B == null)
while (B == BigInteger.Zero || ((B % N) == BigInteger.Zero))
{
b = Functional.Getb();
B = Functional.CalcB(F.Calck(g, N), v, b, g, N);
Expand Down
45 changes: 21 additions & 24 deletions Documentation/Help/LastBuild.log
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shfbBuild product="Sandcastle Help File Builder" version="1.9.6.0" projectFile="C:\Users\MusicDemon\Documents\GitHub\CPlan.SRP\Documentation\Documentation.shfbproj" started="17-4-2013 8:47:31">
<shfbBuild product="Sandcastle Help File Builder" version="1.9.6.0" projectFile="C:\Users\MusicDemon\Documents\GitHub\CPlan.SRP\Documentation\Documentation.shfbproj" started="17-4-2013 13:59:49">
<buildStep step="Initializing">
Finding tools...
Found Sandcastle tools in &#39;C:\Program Files\Sandcastle\&#39;
Expand All @@ -8,9 +8,6 @@ Script# Reflection File Fixer Version 1.9.6.0
Copyright &#169; 2006-2012, Eric Woodruff, All Rights Reserved
Script# is Copyright &#169; 2007-2009 Nikhil Kothari, All Rights Reserved
</buildStep>
<buildStep step="ClearWorkFolder">
Clearing working folder...
</buildStep>
<buildStep step="ValidatingDocumentationSources">
Validating and copying documentation source information
Source: C:\Users\MusicDemon\Documents\GitHub\CPlan.SRP\CPlan.SRP.Client\CPlan.SRP.Client.csproj
Expand All @@ -28,11 +25,11 @@ SHFB: Warning BE0062: No XML comments files found. The help file will not conta
</buildStep>
<buildStep step="GenerateSharedContent">
Generating shared content files (en-US, English (United States))...
Last step completed in 00:00:00.4160
Last step completed in 00:00:00.0640
</buildStep>
<buildStep step="GenerateApiFilter">
Generating API filter for MRefBuilder...
Last step completed in 00:00:00.0030
Last step completed in 00:00:00.0010
</buildStep>
<buildStep step="GenerateReflectionInfo">
Generating reflection information...
Expand All @@ -49,11 +46,11 @@ Adding Script# AfterGenerateRefInfo tasks
XslTransform (v2.7.2.0)
Copyright &#184; 2006-2012, Microsoft Corporation, All Rights Reserved
Info: Applying XSL transformation &#39;C:\Program Files\Sandcastle\ProductionTransforms\FixScriptSharp.xsl&#39;.
Last step completed in 00:00:03.9132
Last step completed in 00:00:03.3102
</buildStep>
<buildStep step="GenerateNamespaceSummaries">
Generating namespace summary information...
Last step completed in 00:00:00.0780
Last step completed in 00:00:00.0420
</buildStep>
<buildStep step="ApplyVisibilityProperties">
Applying visibility properties to reflection information file
Expand All @@ -62,7 +59,7 @@ Applying visibility properties to reflection information file
0 local and base class EII elements removed
0 inherited member elements removed
0 event backer fields noted for removal
Last step completed in 00:00:00.2510
Last step completed in 00:00:00.2110
</buildStep>
<buildStep step="TransformReflectionInfo">
Transforming reflection output...
Expand All @@ -74,11 +71,11 @@ Transforming reflection output...
XslTransform (v2.7.2.0)
Copyright &#184; 2006-2012, Microsoft Corporation, All Rights Reserved
Info: Applying XSL transformation &#39;C:\Program Files\Sandcastle\ProductionTransforms\ReflectionToManifest.xsl&#39;.
Last step completed in 00:00:03.2252
Last step completed in 00:00:02.6482
</buildStep>
<buildStep step="ModifyHelpTopicFilenames">
Modifying help topic filenames in reflection information file
Last step completed in 00:00:00.3480
Last step completed in 00:00:00.0980
</buildStep>
<buildStep step="CopyStandardContent">
Copying standard help content...
Expand Down Expand Up @@ -276,12 +273,12 @@ C:\Program Files\Sandcastle\\Presentation\VS2010\branding -&gt; C:\Users\MusicDe
C:\Program Files\Sandcastle\Presentation\VS2010\branding\ps-instrumentedLink.xslt -> C:\Users\MusicDemon\Documents\GitHub\CPlan.SRP\Documentation\Help\Working\branding\ps-instrumentedLink.xslt
C:\Program Files\Sandcastle\Presentation\VS2010\branding\ps-languageSpecificText.xslt -> C:\Users\MusicDemon\Documents\GitHub\CPlan.SRP\Documentation\Help\Working\branding\ps-languageSpecificText.xslt
C:\Program Files\Sandcastle\Presentation\VS2010\branding\ps-codesnippet.xslt -> C:\Users\MusicDemon\Documents\GitHub\CPlan.SRP\Documentation\Help\Working\branding\ps-codesnippet.xslt
Last step completed in 00:00:15.8629
Last step completed in 00:00:07.1194
</buildStep>
<buildStep step="CopyAdditionalContent">
Copying additional content files...
No additional content to copy
Last step completed in 00:00:00.0050
Last step completed in 00:00:00.0010
</buildStep>
<buildStep step="MergeTablesOfContents">
Merging conceptual and additional tables of contents...
Expand All @@ -294,19 +291,19 @@ Generating intermediate table of contents file...
Copyright &#184; 2006-2012, Microsoft Corporation, All Rights Reserved
Info: Applying XSL transformation &#39;C:\Program Files\Sandcastle\\ProductionTransforms\CreateVSToc.xsl&#39;.
Generating conceptual content intermediate TOC file...
Last step completed in 00:00:01.0891
Last step completed in 00:00:01.1691
</buildStep>
<buildStep step="CreateBuildAssemblerConfigs">
Creating Sandcastle configuration files...
sandcastle.config
Last step completed in 00:00:00.1630
Last step completed in 00:00:00.1500
</buildStep>
<buildStep step="MergeCustomConfigs">
Merging custom build component configurations
C:\Users\MusicDemon\Documents\GitHub\CPlan.SRP\Documentation\Help\Working\sandcastle.config
Added configuration for &#39;API Token Resolution&#39; before &#39;Show Missing Documentation Component&#39; (instance 1)
Replacing default configuration for &#39;Code Block Component&#39; with the custom configuration
Last step completed in 00:00:00.3490
Last step completed in 00:00:00.2060
</buildStep>
<buildStep step="BuildReferenceTopics">
Building reference help topics...
Expand All @@ -316,13 +313,13 @@ Building reference help topics...
Info: Loading configuration...
Info: Processing topics...
Info: Processed 91 topics
Last step completed in 00:01:59.8929
Last step completed in 00:01:47.3091
</buildStep>
<buildStep step="CombiningIntermediateTocFiles">
Combining conceptual and API intermediate TOC files...

Clearing any prior web output
Last step completed in 00:00:02.2371
Last step completed in 00:00:00.4910
</buildStep>
<buildStep step="ExtractingHtmlInfo">
Extracting HTML info for HTML Help 1 and/or website...
Expand All @@ -338,31 +335,31 @@ Processed 90 HTML files
Sorting keywords and generating See Also indices
Saving website keyword index to C:\Users\MusicDemon\Documents\GitHub\CPlan.SRP\Documentation\Help\Working\WebKI.xml
Saving website table of contents to C:\Users\MusicDemon\Documents\GitHub\CPlan.SRP\Documentation\Help\Working\WebTOC.xml
Last step completed in 00:00:04.5373
Last step completed in 00:00:05.6683
</buildStep>
<buildStep step="GenerateHelpFormatTableOfContents">
Generating website table of contents file...
Last step completed in 00:00:00.0040
Last step completed in 00:00:00.0010
</buildStep>
<buildStep step="GenerateFullTextIndex">
Generating full-text index for the website...

Last step completed in 00:00:04.3372
Last step completed in 00:00:02.2771
</buildStep>
<buildStep step="CopyingWebsiteFiles">
Copying website files to output folder...

Copied 100 files
Copied 186 files for the website content
Last step completed in 00:00:28.0956
Last step completed in 00:00:14.5228
</buildStep>
<buildStep step="CleanIntermediates">
Removing intermediate files...
Last step completed in 00:00:06.6784
Last step completed in 00:00:03.1612
</buildStep>
<buildStep step="Completed">

Build completed successfully at 04-17-2013 08:50 . Total time: 00:03:11,6460
Build completed successfully at 04-17-2013 02:02 . Total time: 00:02:28,6065

</buildStep>
</shfbBuild>
36 changes: 18 additions & 18 deletions Documentation/Help/WebTOC.xml
View file
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<HelpTOC>

<HelpTOCNode Id="bf23dfc9-1b76-4af6-8910-96c63f5015e1" Title="CPlan.SRP.Client Namespace" Url="html/N_CPlan_SRP_Client.htm">
<HelpTOCNode Id="1f993d71-8a33-419d-8ad1-4f759c076d2a" Title="Carrier Class" Url="html/T_CPlan_SRP_Client_Carrier.htm">
<HelpTOCNode Id="787faf07-412b-4326-887f-31f5283d36c6" Title="CPlan.SRP.Client Namespace" Url="html/N_CPlan_SRP_Client.htm">
<HelpTOCNode Id="ed9773ce-e7e4-4b78-8a51-d30a670b2c53" Title="Carrier Class" Url="html/T_CPlan_SRP_Client_Carrier.htm">
<HelpTOCNode Title="Carrier Members" Url="html/AllMembers_T_CPlan_SRP_Client_Carrier.htm" />
<HelpTOCNode Title="Carrier Constructor " Url="html/M_CPlan_SRP_Client_Carrier__ctor.htm" />
<HelpTOCNode Id="52e30024-b324-4319-942b-ebb81bdda11d" Title="Carrier Fields" Url="html/Fields_T_CPlan_SRP_Client_Carrier.htm">
<HelpTOCNode Id="6398bdda-d92b-4bad-8e05-41ccf15a326e" Title="Carrier Fields" Url="html/Fields_T_CPlan_SRP_Client_Carrier.htm">
<HelpTOCNode Title="a Field" Url="html/F_CPlan_SRP_Client_Carrier_a.htm" />
</HelpTOCNode>
<HelpTOCNode Id="f3aa58d4-f6ef-44af-8ab8-496814986f63" Title="Carrier Methods" Url="html/Methods_T_CPlan_SRP_Client_Carrier.htm">
<HelpTOCNode Id="fb0fe290-5dcc-4c51-a9ba-7ad941482fa1" Title="Carrier Methods" Url="html/Methods_T_CPlan_SRP_Client_Carrier.htm">
<HelpTOCNode Title="CalculateEverthing Method " Url="html/M_CPlan_SRP_Client_Carrier_CalculateEverthing.htm" />
</HelpTOCNode>
<HelpTOCNode Id="85e86ece-3638-4683-8151-0c9d3c79155a" Title="Carrier Properties" Url="html/Properties_T_CPlan_SRP_Client_Carrier.htm">
<HelpTOCNode Id="228d0a09-abc4-4e04-bbb9-3a8638510b89" Title="Carrier Properties" Url="html/Properties_T_CPlan_SRP_Client_Carrier.htm">
<HelpTOCNode Title="A Property " Url="html/P_CPlan_SRP_Client_Carrier_A.htm" />
<HelpTOCNode Title="g Property " Url="html/P_CPlan_SRP_Client_Carrier_g.htm" />
<HelpTOCNode Title="K Property " Url="html/P_CPlan_SRP_Client_Carrier_K.htm" />
Expand All @@ -23,10 +23,10 @@
<HelpTOCNode Title="UserName Property " Url="html/P_CPlan_SRP_Client_Carrier_UserName.htm" />
</HelpTOCNode>
</HelpTOCNode>
<HelpTOCNode Id="5f648778-1ebe-45f8-8eaa-872a8f940651" Title="Constants Class" Url="html/T_CPlan_SRP_Client_Constants.htm">
<HelpTOCNode Id="39e90ed4-a11a-4e3c-b25b-8ff7ac4a2c0f" Title="Constants Class" Url="html/T_CPlan_SRP_Client_Constants.htm">
<HelpTOCNode Title="Constants Members" Url="html/AllMembers_T_CPlan_SRP_Client_Constants.htm" />
<HelpTOCNode Title="Constants Constructor " Url="html/M_CPlan_SRP_Client_Constants__cctor.htm" />
<HelpTOCNode Id="97d5dcb9-0361-45d4-947b-c13148451e50" Title="Constants Fields" Url="html/Fields_T_CPlan_SRP_Client_Constants.htm">
<HelpTOCNode Id="48027a9f-cdf4-4e33-8d36-4fd180fbcc29" Title="Constants Fields" Url="html/Fields_T_CPlan_SRP_Client_Constants.htm">
<HelpTOCNode Title="g1024Bit Field" Url="html/F_CPlan_SRP_Client_Constants_g1024Bit.htm" />
<HelpTOCNode Title="g1536Bit Field" Url="html/F_CPlan_SRP_Client_Constants_g1536Bit.htm" />
<HelpTOCNode Title="g2048Bit Field" Url="html/F_CPlan_SRP_Client_Constants_g2048Bit.htm" />
Expand All @@ -49,17 +49,17 @@
<HelpTOCNode Title="prime6144Bit Field" Url="html/F_CPlan_SRP_Client_Constants_prime6144Bit.htm" />
<HelpTOCNode Title="prime8192Bit Field" Url="html/F_CPlan_SRP_Client_Constants_prime8192Bit.htm" />
</HelpTOCNode>
<HelpTOCNode Id="e9d174fd-369d-44d6-8a6d-3f14365c7791" Title="Constants Methods" Url="html/Methods_T_CPlan_SRP_Client_Constants.htm">
<HelpTOCNode Id="6f27cc3f-25de-4b33-98e5-a0a1ea4af3ef" Title="Constants Methods" Url="html/Methods_T_CPlan_SRP_Client_Constants.htm">
<HelpTOCNode Title="GetNandg Method " Url="html/M_CPlan_SRP_Client_Constants_GetNandg.htm" />
</HelpTOCNode>
</HelpTOCNode>
<HelpTOCNode Id="6e3f8f6b-f0c8-45b2-8a06-c630bae0667c" Title="Functional Class" Url="html/T_CPlan_SRP_Client_Functional.htm">
<HelpTOCNode Id="ee06cf47-4abd-446a-b617-02930dc33d67" Title="Functional Class" Url="html/T_CPlan_SRP_Client_Functional.htm">
<HelpTOCNode Title="Functional Members" Url="html/AllMembers_T_CPlan_SRP_Client_Functional.htm" />
<HelpTOCNode Title="Functional Constructor " Url="html/M_CPlan_SRP_Client_Functional__cctor.htm" />
<HelpTOCNode Id="e77f3493-12ca-4c7e-8150-3dc21824aee9" Title="Functional Fields" Url="html/Fields_T_CPlan_SRP_Client_Functional.htm">
<HelpTOCNode Id="5367dd91-0c91-4719-9057-fd1644df977a" Title="Functional Fields" Url="html/Fields_T_CPlan_SRP_Client_Functional.htm">
<HelpTOCNode Title="algorithm Field" Url="html/F_CPlan_SRP_Client_Functional_algorithm.htm" />
</HelpTOCNode>
<HelpTOCNode Id="f6b89a30-4dda-4b33-91e6-87fcf495b6d3" Title="Functional Methods" Url="html/Methods_T_CPlan_SRP_Client_Functional.htm">
<HelpTOCNode Id="fba86b8f-732b-4496-ab39-cd76d00e545e" Title="Functional Methods" Url="html/Methods_T_CPlan_SRP_Client_Functional.htm">
<HelpTOCNode Title="CalcA Method " Url="html/M_CPlan_SRP_Client_Functional_CalcA.htm" />
<HelpTOCNode Title="M:CPlan.SRP.Client.Functional.Calck(System.Numerics.BigInteger,System.Numerics.BigInteger)" Url="" />
<HelpTOCNode Title="Calck Method " Url="html/M_CPlan_SRP_Client_Functional_CalcK.htm" />
Expand All @@ -77,17 +77,17 @@
</HelpTOCNode>
<HelpTOCNode Title="KeySizes Enumeration" Url="html/T_CPlan_SRP_Client_KeySizes.htm" />
</HelpTOCNode>
<HelpTOCNode Id="77694b12-9171-41dd-be0b-d2abeac7d331" Title="CPlan.SRP.Host Namespace" Url="html/N_CPlan_SRP_Host.htm">
<HelpTOCNode Id="da8daadb-c5db-464d-8c6f-6c39283faf50" Title="Carrier Class" Url="html/T_CPlan_SRP_Host_Carrier.htm">
<HelpTOCNode Id="79a67a8b-4207-40cf-ad2e-d49d641ce590" Title="CPlan.SRP.Host Namespace" Url="html/N_CPlan_SRP_Host.htm">
<HelpTOCNode Id="0a10f6c8-ef2b-4835-8830-89bd28253e50" Title="Carrier Class" Url="html/T_CPlan_SRP_Host_Carrier.htm">
<HelpTOCNode Title="Carrier Members" Url="html/AllMembers_T_CPlan_SRP_Host_Carrier.htm" />
<HelpTOCNode Title="Carrier Constructor " Url="html/M_CPlan_SRP_Host_Carrier__ctor.htm" />
<HelpTOCNode Id="861f7ffd-441c-45c9-bc78-ada7cf879386" Title="Carrier Fields" Url="html/Fields_T_CPlan_SRP_Host_Carrier.htm">
<HelpTOCNode Id="7344e296-d1df-4d6b-bbd4-fe75e575ed41" Title="Carrier Fields" Url="html/Fields_T_CPlan_SRP_Host_Carrier.htm">
<HelpTOCNode Title="b Field" Url="html/F_CPlan_SRP_Host_Carrier_b.htm" />
</HelpTOCNode>
<HelpTOCNode Id="b73a6f35-58b6-4232-9e64-32fc764c321a" Title="Carrier Methods" Url="html/Methods_T_CPlan_SRP_Host_Carrier.htm">
<HelpTOCNode Id="23dc2d62-c69c-45ab-aa8d-5de20f280715" Title="Carrier Methods" Url="html/Methods_T_CPlan_SRP_Host_Carrier.htm">
<HelpTOCNode Title="CalculateEverthing Method " Url="html/M_CPlan_SRP_Host_Carrier_CalculateEverthing.htm" />
</HelpTOCNode>
<HelpTOCNode Id="bd768d6c-a707-4e68-9091-3f4e5c17ca23" Title="Carrier Properties" Url="html/Properties_T_CPlan_SRP_Host_Carrier.htm">
<HelpTOCNode Id="9354ec5b-d8b7-4ab8-a78f-6e92a9078658" Title="Carrier Properties" Url="html/Properties_T_CPlan_SRP_Host_Carrier.htm">
<HelpTOCNode Title="B Property " Url="html/P_CPlan_SRP_Host_Carrier_B.htm" />
<HelpTOCNode Title="g Property " Url="html/P_CPlan_SRP_Host_Carrier_g.htm" />
<HelpTOCNode Title="K Property " Url="html/P_CPlan_SRP_Host_Carrier_K.htm" />
Expand All @@ -101,9 +101,9 @@
<HelpTOCNode Title="v Property " Url="html/P_CPlan_SRP_Host_Carrier_v.htm" />
</HelpTOCNode>
</HelpTOCNode>
<HelpTOCNode Id="5fe244a9-12a7-4a14-a90f-020f9b450c63" Title="Functional Class" Url="html/T_CPlan_SRP_Host_Functional.htm">
<HelpTOCNode Id="8d3bab7b-6777-497b-8849-a18d309c520b" Title="Functional Class" Url="html/T_CPlan_SRP_Host_Functional.htm">
<HelpTOCNode Title="Functional Members" Url="html/AllMembers_T_CPlan_SRP_Host_Functional.htm" />
<HelpTOCNode Id="b267a36c-60fb-4ddb-b4c8-d5a9fa60d9ae" Title="Functional Methods" Url="html/Methods_T_CPlan_SRP_Host_Functional.htm">
<HelpTOCNode Id="86da0092-1df0-4ab7-836b-cfb95cc6bda4" Title="Functional Methods" Url="html/Methods_T_CPlan_SRP_Host_Functional.htm">
<HelpTOCNode Title="CalcB Method " Url="html/M_CPlan_SRP_Host_Functional_CalcB.htm" />
<HelpTOCNode Title="CalcS Method " Url="html/M_CPlan_SRP_Host_Functional_CalcS.htm" />
<HelpTOCNode Title="Getb Method " Url="html/M_CPlan_SRP_Host_Functional_Getb.htm" />
Expand Down

0 comments on commit aeb1e1d

Please sign in to comment.