* Moved class

* Refactor: narrative
ben-biddington · Aug 24, 2010 · ed52fb8 · ed52fb8
1 parent 7bcc615
commit ed52fb8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Brick/Xml/Signing/IXmlSigner.cs b/src/Brick/Xml/Signing/IXmlSigner.cs
@@ -1,6 +1,6 @@
 using System.Xml;
 
-namespace Brick {
+namespace Brick.Xml.Signing {
     public interface IXmlSigner {
         XmlDocument Sign(XmlDocument message);
     }

diff --git a/src/Brick/XmlSigner.cs b/src/Brick/XmlSigner.cs
@@ -2,6 +2,7 @@
 using System.Xml;
 using Brick.DateAndTime;
 using Brick.Hashing;
+using Brick.Xml.Signing;
 
 namespace Brick {
     public class XmlSigner : IXmlSigner {
@@ -13,16 +14,12 @@ public XmlSigner(String password) {
 
         public XmlDocument Sign(XmlDocument message) {
         	return Sign(message, NewNonce(), DefaultExpiresAt);
-        }
-
-    	private String NewNonce() {
-    		return Convert.ToBase64String(Guid.NewGuid().ToByteArray());
-    	}
+        }    
 
     	public XmlDocument Sign(
             XmlDocument message,
             String nonce,
-            DateTime expirationTime
+            DateTime expiresAt
         ) {
             if (message.DocumentElement == null)
                 throw new ArgumentException("No root node in xdoc.");
@@ -32,7 +29,7 @@ DateTime expirationTime
             SignMessage(
 				copy.DocumentElement, 
 				Convert.FromBase64String(nonce), 
-				expirationTime,
+				expiresAt,
                 new SharedSecret().From(_password)
 			);
 
@@ -74,6 +71,10 @@ byte[] secret
             message.AppendChild(child);
         }
 
+		private String NewNonce() {
+			return Convert.ToBase64String(Guid.NewGuid().ToByteArray());
+		}
+
 		private static DateTime DefaultExpiresAt {
 			get { return DateTime.Now.AddMinutes(15); }
 		}