Promote code common to both ECDSA* cores to separate repository in core/ tree.

Pavel's two ECDSA base point multiplier cores share a fair amount of
code.  Maintenance issues aside, the duplication confused the Xilinx
synthesis tools if one tried to build a single bitstream containing
both cores, so we've separated the common code out into this library.

The selection of files in this library was done by comparing the rtl
trees of the two original core repositories using "diff -rqws" and
selecting the files which diff reported as being identical.

Also dealt with some cosmetic issues (indentation, Windows-isms, etc).

14 files changed, 734 insertions, 734 deletions

diff --git a/rtl/lowlevel/adder32_wrapper.v b/rtl/lowlevel/adder32_wrapper.v
index ebfd8ce..57778df 100644
--- a/rtl/lowlevel/adder32_wrapper.v
+++ b/rtl/lowlevel/adder32_wrapper.v
@@ -2,7 +2,7 @@
 //
 // adder32_wrapper.v
 // -----------------------------------------------------------------------------
-// Wrapper for 32-bit adder.

+// Wrapper for 32-bit adder.
 //
 // Authors: Pavel Shatov
 //
@@ -34,40 +34,40 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-//------------------------------------------------------------------------------

-

-module adder32_wrapper

-	(

-		input					clk,		// clock

-		input		[31: 0]	a,			// operand input

-		input		[31: 0]	b,			// operand input

-		output	[31: 0]	s,			// sum output

-		input					c_in,		// carry input

-		output				c_out		// carry output

-	);

-	

-		//

-		// Include Primitive Selector

-		//

-`include "ecdsa_lowlevel_settings.v"

-

-

-		//

-		// Instantiate Vendor/Generic Primitive

-		//

-	`ADDER32_PRIMITIVE adder32_inst

-	(

-		.clk(clk),

-		.a(a),

-		.b(b),

-		.s(s),

-		.c_in(c_in),

-		.c_out(c_out)

-	);

-	

-

-endmodule

-

+//------------------------------------------------------------------------------
+
+module adder32_wrapper
+  (
+   input 	  clk, // clock
+   input [31: 0]  a, // operand input
+   input [31: 0]  b, // operand input
+   output [31: 0] s, // sum output
+   input 	  c_in, // carry input
+   output 	  c_out		// carry output
+   );
+
+   //
+   // Include Primitive Selector
+   //
+`include "ecdsa_lowlevel_settings.v"
+
+
+   //
+   // Instantiate Vendor/Generic Primitive
+   //
+   `ADDER32_PRIMITIVE adder32_inst
+     (
+      .clk(clk),
+      .a(a),
+      .b(b),
+      .s(s),
+      .c_in(c_in),
+      .c_out(c_out)
+      );
+
+
+endmodule
+
 //------------------------------------------------------------------------------
 // End-of-File
-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------
diff --git a/rtl/lowlevel/adder47_wrapper.v b/rtl/lowlevel/adder47_wrapper.v
index 1a0a18e..be5b1ee 100644
--- a/rtl/lowlevel/adder47_wrapper.v
+++ b/rtl/lowlevel/adder47_wrapper.v
@@ -2,7 +2,7 @@
 //
 // adder47_wrapper.v
 // -----------------------------------------------------------------------------
-// Wrapper for 47-bit adder.

+// Wrapper for 47-bit adder.
 //
 // Authors: Pavel Shatov
 //
@@ -34,36 +34,36 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-//------------------------------------------------------------------------------

-

-module adder47_wrapper

-	(

-		input					clk,		// clock

-		input		[46: 0]	a,			// operand input

-		input		[46: 0]	b,			// operand input

-		output	[46: 0]	s			// sum output

-	);

-	

-		//

-		// Include Primitive Selector

-		//

-`include "ecdsa_lowlevel_settings.v"

-

-

-		//

-		// Instantiate Vendor/Generic Primitive

-		//

-	`ADDER47_PRIMITIVE adder47_inst

-	(

-		.clk(clk),

-		.a(a),

-		.b(b),

-		.s(s)

-	);

-	

-	

-endmodule

-

+//------------------------------------------------------------------------------
+
+module adder47_wrapper
+  (
+   input 	  clk, // clock
+   input [46: 0]  a, // operand input
+   input [46: 0]  b, // operand input
+   output [46: 0] s			// sum output
+   );
+
+   //
+   // Include Primitive Selector
+   //
+`include "ecdsa_lowlevel_settings.v"
+
+
+   //
+   // Instantiate Vendor/Generic Primitive
+   //
+   `ADDER47_PRIMITIVE adder47_inst
+     (
+      .clk(clk),
+      .a(a),
+      .b(b),
+      .s(s)
+      );
+
+
+endmodule
+
 //------------------------------------------------------------------------------
 // End-of-File
-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------
diff --git a/rtl/lowlevel/artix7/adder32_artix7.v b/rtl/lowlevel/artix7/adder32_artix7.v
index 5f9ba79..dad2340 100644
--- a/rtl/lowlevel/artix7/adder32_artix7.v
+++ b/rtl/lowlevel/artix7/adder32_artix7.v
@@ -2,7 +2,7 @@
 //
 // adder32_artix7.v
 // -----------------------------------------------------------------------------
-// Hardware (Artix-7 DSP48E1) 32-bit adder.

+// Hardware (Artix-7 DSP48E1) 32-bit adder.
 //
 // Authors: Pavel Shatov
 //
@@ -34,63 +34,63 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-//------------------------------------------------------------------------------

-

-module adder32_artix7

-	(

-		input					clk,		// clock

-		input		[31: 0]	a,			// operand input

-		input		[31: 0]	b,			// operand input

-		output	[31: 0]	s,			// sum output

-		input					c_in,		// carry input

-		output				c_out		// carry output

-	);

-	

-		//

-		// Lower and higher parts of operand

-		//

-	wire	[17: 0]	bl = b[17: 0];

-	wire	[13: 0]	bh = b[31:18];

-

-		

-		//

-		// DSP48E1 Slice

-		//

-		

-		/* Operation Mode */

-	wire	[ 3: 0]	dsp48e1_alumode	= 4'b0000;

-	wire	[ 6: 0]	dsp48e1_opmode		= 7'b0110011;

-		

-		/* Internal Product */

-	wire	[47: 0]	p_int;

-

-	dsp48e1_wrapper dsp_adder

-	(

-		.clk			(clk),

-		

-		.ce			(1'b1),

-		

-		.carry		(c_in),

-		

-		.alumode		(dsp48e1_alumode),

-		.opmode		(dsp48e1_opmode),

-		

-		.a				({{16{1'b0}}, bh}),

-		.b				(bl),

-		.c				({{16{1'b0}}, a}),

-		

-		.p				(p_int)

-	);

-

-		//

-		// Output Mapping

-		//

-	assign s 		= p_int[31: 0];

-	assign c_out	= p_int[32];

-

-

-endmodule

-

+//------------------------------------------------------------------------------
+
+module adder32_artix7
+  (
+   input 	  clk, // clock
+   input [31: 0]  a, // operand input
+   input [31: 0]  b, // operand input
+   output [31: 0] s, // sum output
+   input 	  c_in, // carry input
+   output 	  c_out		// carry output
+   );
+
+   //
+   // Lower and higher parts of operand
+   //
+   wire [17: 0]   bl = b[17: 0];
+   wire [13: 0]   bh = b[31:18];
+
+
+   //
+   // DSP48E1 Slice
+   //
+
+   /* Operation Mode */
+   wire [ 3: 0]   dsp48e1_alumode	= 4'b0000;
+   wire [ 6: 0]   dsp48e1_opmode		= 7'b0110011;
+
+   /* Internal Product */
+   wire [47: 0]   p_int;
+
+   dsp48e1_wrapper dsp_adder
+     (
+      .clk			(clk),
+
+      .ce			(1'b1),
+
+      .carry		(c_in),
+
+      .alumode		(dsp48e1_alumode),
+      .opmode		(dsp48e1_opmode),
+
+      .a				({{16{1'b0}}, bh}),
+      .b				(bl),
+      .c				({{16{1'b0}}, a}),
+
+      .p				(p_int)
+      );
+
+   //
+   // Output Mapping
+   //
+   assign s 		= p_int[31: 0];
+   assign c_out	= p_int[32];
+
+
+endmodule
+
 //------------------------------------------------------------------------------
 // End-of-File
-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------
diff --git a/rtl/lowlevel/artix7/adder47_artix7.v b/rtl/lowlevel/artix7/adder47_artix7.v
index 00566e4..caafc85 100644
--- a/rtl/lowlevel/artix7/adder47_artix7.v
+++ b/rtl/lowlevel/artix7/adder47_artix7.v
@@ -2,7 +2,7 @@
 //
 // adder47_artix7.v
 // -----------------------------------------------------------------------------
-// Hardware (Artix-7 DSP48E1) 47-bit adder.

+// Hardware (Artix-7 DSP48E1) 47-bit adder.
 //
 // Authors: Pavel Shatov
 //
@@ -34,58 +34,58 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-//------------------------------------------------------------------------------

-

-module adder47_artix7

-	(

-		input					clk,		// clock

-		input		[46: 0]	a,			// operand input

-		input		[46: 0]	b,			// operand input

-		output	[46: 0]	s			// sum output

-	);

-	

-		//

-		// Lower and higher parts of operand

-		//

-	wire	[17: 0]	bl = b[17: 0];

-	wire	[28: 0]	bh = b[46:18];

-

-		//

-		// DSP48E1 Slice

-		//

-		

-		/* Operation Mode */

-	wire	[ 3: 0]	dsp48e1_alumode	= 4'b0000;

-	wire	[ 6: 0]	dsp48e1_opmode		= 7'b0110011;

-		

-		/* Internal Product */

-	wire	[47: 0]	p_int;

-

-	dsp48e1_wrapper dsp_adder

-	(

-		.clk			(clk),

-		

-		.ce			(1'b1),

-		

-		.carry		(1'b0),

-		

-		.alumode		(dsp48e1_alumode),

-		.opmode		(dsp48e1_opmode),

-		

-		.a				({1'b0, bh}),

-		.b				(bl),

-		.c				({1'b0, a}),

-		

-		.p				(p_int)

-	);

-

-		//

-		// Output Mapping

-		//

-	assign s 		= p_int[46: 0];

-

-endmodule

-

+//------------------------------------------------------------------------------
+
+module adder47_artix7
+  (
+   input 	  clk,	// clock
+   input [46: 0]  a,	// operand input
+   input [46: 0]  b,	// operand input
+   output [46: 0] s	// sum output
+   );
+
+   //
+   // Lower and higher parts of operand
+   //
+   wire [17: 0]   bl = b[17: 0];
+   wire [28: 0]   bh = b[46:18];
+
+   //
+   // DSP48E1 Slice
+   //
+
+   /* Operation Mode */
+   wire [ 3: 0]   dsp48e1_alumode	= 4'b0000;
+   wire [ 6: 0]   dsp48e1_opmode	= 7'b0110011;
+
+   /* Internal Product */
+   wire [47: 0]   p_int;
+
+   dsp48e1_wrapper dsp_adder
+     (
+      .clk			(clk),
+
+      .ce			(1'b1),
+
+      .carry		(1'b0),
+
+      .alumode		(dsp48e1_alumode),
+      .opmode		(dsp48e1_opmode),
+
+      .a				({1'b0, bh}),
+      .b				(bl),
+      .c				({1'b0, a}),
+
+      .p				(p_int)
+      );
+
+   //
+   // Output Mapping
+   //
+   assign s 		= p_int[46: 0];
+
+endmodule
+
 //------------------------------------------------------------------------------
 // End-of-File
-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------
diff --git a/rtl/lowlevel/artix7/dsp48e1_wrapper.v b/rtl/lowlevel/artix7/dsp48e1_wrapper.v
index 11a21bc..4c272f0 100644
--- a/rtl/lowlevel/artix7/dsp48e1_wrapper.v
+++ b/rtl/lowlevel/artix7/dsp48e1_wrapper.v
@@ -2,7 +2,7 @@
 //
 // dsp48e1_wrapper.v
 // -----------------------------------------------------------------------------
-// Hardware (Artix-7 DSP48E1) tile wrapper.

+// Hardware (Artix-7 DSP48E1) tile wrapper.
 //
 // Authors: Pavel Shatov
 //
@@ -34,126 +34,126 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-//------------------------------------------------------------------------------

-

-module dsp48e1_wrapper

-	(

-		input					clk,

-		

-		input					ce,

-		

-		input		[ 6: 0]	opmode,

-		input		[ 3: 0]	alumode,

-		

-		input					carry,

-		

-		input		[29: 0]	a,

-		input		[17: 0]	b,

-		input		[47: 0]	c,

-		

-		output	[47: 0]	p

-	);

-	

-	

-		//

-		// Tile instantiation

-		//

-	DSP48E1 #
-	(
-		.AREG						(0),
-		.BREG						(0),
-		.CREG						(0),
-		.DREG						(0),
-		.MREG						(0),
-		.PREG						(1),
-		.ADREG					(0),

-		
-		.ACASCREG				(0),
-		.BCASCREG				(0),
-		.ALUMODEREG				(0),
-		.INMODEREG				(0),
-		.OPMODEREG				(0),
-		.CARRYINREG				(0),
-		.CARRYINSELREG			(0),
-
-		.A_INPUT					("DIRECT"),
-		.B_INPUT					("DIRECT"),

-		
-		.USE_DPORT				("FALSE"),
-		.USE_MULT				("DYNAMIC"),
-		.USE_SIMD				("ONE48"),
-
-		.USE_PATTERN_DETECT	("NO_PATDET"),
-		.SEL_PATTERN			("PATTERN"),
-		.SEL_MASK				("MASK"),
-		.PATTERN					(48'h000000000000),
-		.MASK						(48'h3fffffffffff),
-		.AUTORESET_PATDET		("NO_RESET")
-	)
-	DSP48E1_inst
-	(
-		.CLK					(clk),
-
-		.RSTA					(1'b0),
-		.RSTB					(1'b0),
-		.RSTC					(1'b0),
-		.RSTD					(1'b0),
-		.RSTM					(1'b0),
-		.RSTP					(1'b0),
-
-		.RSTCTRL				(1'b0),
-		.RSTINMODE			(1'b0),
-		.RSTALUMODE			(1'b0),
-		.RSTALLCARRYIN		(1'b0),
-
-		.CEA1					(1'b0),
-		.CEA2					(1'b0),
-		.CEB1					(1'b0),
-		.CEB2					(1'b0),
-		.CEC					(1'b0),
-		.CED					(1'b0),
-		.CEM					(1'b0),
-		.CEP					(ce),
-		.CEAD					(1'b0),
-		.CEALUMODE			(1'b0),
-		.CEINMODE			(1'b0),
-
-		.CECTRL				(1'b0),
-		.CECARRYIN			(1'b0),
-
-		.A						(a),
-		.B						(b),
-		.C						(c),
-		.D						({25{1'b1}}),
-		.P						(p),
-
-		.CARRYIN				(carry),
-		.CARRYOUT			(),
-		.CARRYINSEL			(3'b000),
-
-		.CARRYCASCIN		(1'b0),
-		.CARRYCASCOUT		(),
-
-		.PATTERNDETECT		(),
-		.PATTERNBDETECT	(),
-
-		.OPMODE				(opmode),
-		.ALUMODE				(alumode),
-		.INMODE				(5'b00000),
-
-		.MULTSIGNIN			(1'b0),
-		.MULTSIGNOUT		(),
-
-		.UNDERFLOW			(),
-		.OVERFLOW			(),
-
-		.ACIN					(30'd0),
-		.BCIN					(18'd0),
-		.PCIN					(48'd0),
-
-		.ACOUT				(),
-		.BCOUT				(),
-		.PCOUT				()
-  );
-

-endmodule

+//------------------------------------------------------------------------------
+
+module dsp48e1_wrapper
+  (
+   input 	  clk,
+
+   input 	  ce,
+
+   input [ 6: 0]  opmode,
+   input [ 3: 0]  alumode,
+
+   input 	  carry,
+
+   input [29: 0]  a,
+   input [17: 0]  b,
+   input [47: 0]  c,
+
+   output [47: 0] p
+   );
+
+
+   //
+   // Tile instantiation
+   //
+   DSP48E1 #
+     (
+      .AREG						(0),
+      .BREG						(0),
+      .CREG						(0),
+      .DREG						(0),
+      .MREG						(0),
+      .PREG						(1),
+      .ADREG					(0),
+
+      .ACASCREG				(0),
+      .BCASCREG				(0),
+      .ALUMODEREG				(0),
+      .INMODEREG				(0),
+      .OPMODEREG				(0),
+      .CARRYINREG				(0),
+      .CARRYINSELREG			(0),
+
+      .A_INPUT					("DIRECT"),
+      .B_INPUT					("DIRECT"),
+
+      .USE_DPORT				("FALSE"),
+      .USE_MULT				("DYNAMIC"),
+      .USE_SIMD				("ONE48"),
+
+      .USE_PATTERN_DETECT	("NO_PATDET"),
+      .SEL_PATTERN			("PATTERN"),
+      .SEL_MASK				("MASK"),
+      .PATTERN					(48'h000000000000),
+      .MASK						(48'h3fffffffffff),
+      .AUTORESET_PATDET		("NO_RESET")
+      )
+   DSP48E1_inst
+     (
+      .CLK					(clk),
+
+      .RSTA					(1'b0),
+      .RSTB					(1'b0),
+      .RSTC					(1'b0),
+      .RSTD					(1'b0),
+      .RSTM					(1'b0),
+      .RSTP					(1'b0),
+
+      .RSTCTRL				(1'b0),
+      .RSTINMODE			(1'b0),
+      .RSTALUMODE			(1'b0),
+      .RSTALLCARRYIN		(1'b0),
+
+      .CEA1					(1'b0),
+      .CEA2					(1'b0),
+      .CEB1					(1'b0),
+      .CEB2					(1'b0),
+      .CEC					(1'b0),
+      .CED					(1'b0),
+      .CEM					(1'b0),
+      .CEP					(ce),
+      .CEAD					(1'b0),
+      .CEALUMODE			(1'b0),
+      .CEINMODE			(1'b0),
+
+      .CECTRL				(1'b0),
+      .CECARRYIN			(1'b0),
+
+      .A						(a),
+      .B						(b),
+      .C						(c),
+      .D						({25{1'b1}}),
+      .P						(p),
+
+      .CARRYIN				(carry),
+      .CARRYOUT			(),
+      .CARRYINSEL			(3'b000),
+
+      .CARRYCASCIN		(1'b0),
+      .CARRYCASCOUT		(),
+
+      .PATTERNDETECT		(),
+      .PATTERNBDETECT	(),
+
+      .OPMODE				(opmode),
+      .ALUMODE				(alumode),
+      .INMODE				(5'b00000),
+
+      .MULTSIGNIN			(1'b0),
+      .MULTSIGNOUT		(),
+
+      .UNDERFLOW			(),
+      .OVERFLOW			(),
+
+      .ACIN					(30'd0),
+      .BCIN					(18'd0),
+      .PCIN					(48'd0),
+
+      .ACOUT				(),
+      .BCOUT				(),
+      .PCOUT				()
+      );
+
+endmodule
diff --git a/rtl/lowlevel/artix7/mac16_artix7.v b/rtl/lowlevel/artix7/mac16_artix7.v
index 63b74ab..421e7ba 100644
--- a/rtl/lowlevel/artix7/mac16_artix7.v
+++ b/rtl/lowlevel/artix7/mac16_artix7.v
@@ -2,7 +2,7 @@
 //
 // mac16_artix7.v
 // -----------------------------------------------------------------------------
-// Hardware (Artix-7 DSP48E1) 16-bit multiplier and 47-bit accumulator.

+// Hardware (Artix-7 DSP48E1) 16-bit multiplier and 47-bit accumulator.
 //
 // Authors: Pavel Shatov
 //
@@ -34,57 +34,57 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-//------------------------------------------------------------------------------

-

-module mac16_artix7

-	(

-		input					clk,		// clock

-		input					clr,		// clear accumulator (active-high)

-		input					ce,		// enable clock (active-high)

-		input		[15: 0]	a,			// operand input

-		input		[15: 0]	b,			// operand input

-		output	[46: 0]	s			// sum output

-	);

-	

-			

-		//

-		// DSP48E1 Slice

-		//

-		

-		/* Operation Mode */

-	wire	[ 3: 0]	dsp48e1_alumode	= 4'b0000;

-	wire	[ 6: 0]	dsp48e1_opmode		= {2'b01, clr, 4'b0101};

-		

-		/* Internal Product */

-	wire	[47: 0]	p_int;

-

-	dsp48e1_wrapper dsp_adder

-	(

-		.clk			(clk),

-		

-		.ce			(ce),

-		

-		.carry		(1'b0),

-		

-		.alumode		(dsp48e1_alumode),

-		.opmode		(dsp48e1_opmode),

-		

-		.a				({{14{1'b0}}, a}),

-		.b				({{ 2{1'b0}}, b}),

-		.c				({48{1'b0}}),

-		

-		.p				(p_int)

-	);

-

-		//

-		// Output Mapping

-		//

-	assign s = p_int[46:0];

-	

-

-endmodule

-

-

+//------------------------------------------------------------------------------
+
+module mac16_artix7
+  (
+   input 	  clk, // clock
+   input 	  clr, // clear accumulator (active-high)
+   input 	  ce, // enable clock (active-high)
+   input [15: 0]  a, // operand input
+   input [15: 0]  b, // operand input
+   output [46: 0] s			// sum output
+   );
+
+
+   //
+   // DSP48E1 Slice
+   //
+
+   /* Operation Mode */
+   wire [ 3: 0]   dsp48e1_alumode	= 4'b0000;
+   wire [ 6: 0]   dsp48e1_opmode		= {2'b01, clr, 4'b0101};
+
+   /* Internal Product */
+   wire [47: 0]   p_int;
+
+   dsp48e1_wrapper dsp_adder
+     (
+      .clk			(clk),
+
+      .ce			(ce),
+
+      .carry		(1'b0),
+
+      .alumode		(dsp48e1_alumode),
+      .opmode		(dsp48e1_opmode),
+
+      .a				({{14{1'b0}}, a}),
+      .b				({{ 2{1'b0}}, b}),
+      .c				({48{1'b0}}),
+
+      .p				(p_int)
+      );
+
+   //
+   // Output Mapping
+   //
+   assign s = p_int[46:0];
+
+
+endmodule
+
+
 //------------------------------------------------------------------------------
 // End-of-File
-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------
diff --git a/rtl/lowlevel/artix7/subtractor32_artix7.v b/rtl/lowlevel/artix7/subtractor32_artix7.v
index b46ac5c..7377781 100644
--- a/rtl/lowlevel/artix7/subtractor32_artix7.v
+++ b/rtl/lowlevel/artix7/subtractor32_artix7.v
@@ -1,94 +1,94 @@
-//------------------------------------------------------------------------------

-//

-// subtractor32_artix7.v

-// -----------------------------------------------------------------------------

-// Hardware (Artix-7 DSP48E1) 32-bit subtractor.

-//

-// Authors: Pavel Shatov

-//

-// Copyright (c) 2016, NORDUnet A/S

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are met:

-//

-// - Redistributions of source code must retain the above copyright notice,

-//   this list of conditions and the following disclaimer.

-//

-// - Redistributions in binary form must reproduce the above copyright notice,

-//   this list of conditions and the following disclaimer in the documentation

-//   and/or other materials provided with the distribution.

-//

-// - Neither the name of the NORDUnet nor the names of its contributors may be

-//   used to endorse or promote products derived from this software without

-//   specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-// POSSIBILITY OF SUCH DAMAGE.

-//

-//------------------------------------------------------------------------------

-

-module subtractor32_artix7

-	(

-		input					clk,

-		input		[31: 0]	a,

-		input		[31: 0]	b,

-		output	[31: 0]	d,

-		input					b_in,

-		output				b_out	

-	);

-

-		//

-		// Lower and higher parts of operand

-		//

-	wire	[17: 0]	bl = b[17: 0];

-	wire	[13: 0]	bh = b[31:18];

-	

-		//

-		// DSP48E1 Slice

-		//

-		

-		/* Operation Mode */

-	wire	[ 3: 0]	dsp48e1_alumode	= 4'b0011;

-	wire	[ 6: 0]	dsp48e1_opmode		= 7'b0110011;

-

-		/* Internal Product */	

-	wire	[47: 0]	p_int;

-	

-	dsp48e1_wrapper dsp_subtractor

-	(

-		.clk			(clk),

-	

-		.ce			(1'b1),

-		

-		.carry		(b_in),

-		

-		.alumode		(dsp48e1_alumode),

-		.opmode		(dsp48e1_opmode),

-		

-		.a				({{16{1'b0}}, bh}),

-		.b				(bl),

-		.c				({{16{1'b0}}, a}),

-		

-		.p				(p_int)

-	);

-

-		//

-		// Output Mapping

-		//

-	assign d 		= p_int[31: 0];

-	assign b_out	= p_int[32];

-

-endmodule

-

-//------------------------------------------------------------------------------

-// End-of-File

-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------
+//
+// subtractor32_artix7.v
+// -----------------------------------------------------------------------------
+// Hardware (Artix-7 DSP48E1) 32-bit subtractor.
+//
+// Authors: Pavel Shatov
+//
+// Copyright (c) 2016, NORDUnet A/S
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither the name of the NORDUnet nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+//------------------------------------------------------------------------------
+
+module subtractor32_artix7
+  (
+   input 	  clk,
+   input [31: 0]  a,
+   input [31: 0]  b,
+   output [31: 0] d,
+   input 	  b_in,
+   output 	  b_out
+   );
+
+   //
+   // Lower and higher parts of operand
+   //
+   wire [17: 0]   bl = b[17: 0];
+   wire [13: 0]   bh = b[31:18];
+
+   //
+   // DSP48E1 Slice
+   //
+
+   /* Operation Mode */
+   wire [ 3: 0]   dsp48e1_alumode	= 4'b0011;
+   wire [ 6: 0]   dsp48e1_opmode		= 7'b0110011;
+
+   /* Internal Product */
+   wire [47: 0]   p_int;
+
+   dsp48e1_wrapper dsp_subtractor
+     (
+      .clk			(clk),
+
+      .ce			(1'b1),
+
+      .carry		(b_in),
+
+      .alumode		(dsp48e1_alumode),
+      .opmode		(dsp48e1_opmode),
+
+      .a				({{16{1'b0}}, bh}),
+      .b				(bl),
+      .c				({{16{1'b0}}, a}),
+
+      .p				(p_int)
+      );
+
+   //
+   // Output Mapping
+   //
+   assign d 		= p_int[31: 0];
+   assign b_out	= p_int[32];
+
+endmodule
+
+//------------------------------------------------------------------------------
+// End-of-File
+//------------------------------------------------------------------------------
diff --git a/rtl/lowlevel/ecdsa_lowlevel_settings.v b/rtl/lowlevel/ecdsa_lowlevel_settings.v
index 8f95e2f..c04a14f 100644
--- a/rtl/lowlevel/ecdsa_lowlevel_settings.v
+++ b/rtl/lowlevel/ecdsa_lowlevel_settings.v
@@ -1,17 +1,17 @@
-`define USE_VENDOR_PRIMITIVES

-

-`ifdef USE_VENDOR_PRIMITIVES

-

-`define MAC16_PRIMITIVE				mac16_artix7

-`define ADDER32_PRIMITIVE			adder32_artix7

-`define ADDER47_PRIMITIVE			adder47_artix7

-`define SUBTRACTOR32_PRIMITIVE	subtractor32_artix7

-

-`else

-

-`define MAC16_PRIMITIVE				mac16_generic

-`define ADDER32_PRIMITIVE			adder32_generic

-`define ADDER47_PRIMITIVE			adder47_generic

-`define SUBTRACTOR32_PRIMITIVE	subtractor32_generic

-

-`endif

+`define USE_VENDOR_PRIMITIVES
+
+`ifdef USE_VENDOR_PRIMITIVES
+
+`define MAC16_PRIMITIVE				mac16_artix7
+`define ADDER32_PRIMITIVE			adder32_artix7
+`define ADDER47_PRIMITIVE			adder47_artix7
+`define SUBTRACTOR32_PRIMITIVE	subtractor32_artix7
+
+`else
+
+`define MAC16_PRIMITIVE				mac16_generic
+`define ADDER32_PRIMITIVE			adder32_generic
+`define ADDER47_PRIMITIVE			adder47_generic
+`define SUBTRACTOR32_PRIMITIVE	subtractor32_generic
+
+`endif
diff --git a/rtl/lowlevel/generic/adder32_generic.v b/rtl/lowlevel/generic/adder32_generic.v
index b9c94aa..eadfb6f 100644
--- a/rtl/lowlevel/generic/adder32_generic.v
+++ b/rtl/lowlevel/generic/adder32_generic.v
@@ -2,7 +2,7 @@
 //
 // adder32_generic.v
 // -----------------------------------------------------------------------------
-// Generic 32-bit adder.

+// Generic 32-bit adder.
 //
 // Authors: Pavel Shatov
 //
@@ -34,34 +34,34 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-//------------------------------------------------------------------------------

-

-module adder32_generic

-	(

-		input					clk,		// clock

-		input		[31: 0]	a,			// operand input

-		input		[31: 0]	b,			// operand input

-		output	[31: 0]	s,			// sum output

-		input					c_in,		// carry input

-		output				c_out		// carry output

-	);

-	
-		//
-		// Sum
-		//
-	reg	[32: 0]	s_int;

-	

-	always @(posedge clk)

-		s_int <= {1'b0, a} + {1'b0, b} + {{32{1'b0}}, c_in};

-		

-		//

-		// Output

-		//

-	assign s = s_int[31:0];

-	assign c_out = s_int[32];

-		

-endmodule

-

+//------------------------------------------------------------------------------
+
+module adder32_generic
+  (
+   input 	  clk, // clock
+   input [31: 0]  a, // operand input
+   input [31: 0]  b, // operand input
+   output [31: 0] s, // sum output
+   input 	  c_in, // carry input
+   output 	  c_out		// carry output
+   );
+
+   //
+   // Sum
+   //
+   reg [32: 0] 	  s_int;
+
+   always @(posedge clk)
+     s_int <= {1'b0, a} + {1'b0, b} + {{32{1'b0}}, c_in};
+
+   //
+   // Output
+   //
+   assign s = s_int[31:0];
+   assign c_out = s_int[32];
+
+endmodule
+
 //------------------------------------------------------------------------------
 // End-of-File
-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------
diff --git a/rtl/lowlevel/generic/adder47_generic.v b/rtl/lowlevel/generic/adder47_generic.v
index f472061..406c175 100644
--- a/rtl/lowlevel/generic/adder47_generic.v
+++ b/rtl/lowlevel/generic/adder47_generic.v
@@ -2,7 +2,7 @@
 //
 // adder47_generic.v
 // -----------------------------------------------------------------------------
-// Generic 47-bit adder.

+// Generic 47-bit adder.
 //
 // Authors: Pavel Shatov
 //
@@ -34,31 +34,31 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-//------------------------------------------------------------------------------

-

-module adder47_generic

-	(

-		input					clk,		// clock

-		input		[46: 0]	a,			// operand input

-		input		[46: 0]	b,			// operand input

-		output	[46: 0]	s			// sum output

-	);

-	

-		//
-		// Sum
-		//
-	reg	[46: 0]	s_int;

-	

-	always @(posedge clk)

-		s_int <= a + b;

-		

-		//

-		// Output

-		//

-	assign s = s_int;

-

-endmodule

-

+//------------------------------------------------------------------------------
+
+module adder47_generic
+  (
+   input 	  clk, // clock
+   input [46: 0]  a, // operand input
+   input [46: 0]  b, // operand input
+   output [46: 0] s			// sum output
+   );
+
+   //
+   // Sum
+   //
+   reg [46: 0] 	  s_int;
+
+   always @(posedge clk)
+     s_int <= a + b;
+
+   //
+   // Output
+   //
+   assign s = s_int;
+
+endmodule
+
 //------------------------------------------------------------------------------
 // End-of-File
-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------
diff --git a/rtl/lowlevel/generic/mac16_generic.v b/rtl/lowlevel/generic/mac16_generic.v
index dc95645..6d120a3 100644
--- a/rtl/lowlevel/generic/mac16_generic.v
+++ b/rtl/lowlevel/generic/mac16_generic.v
@@ -2,7 +2,7 @@
 //
 // mac16_generic.v
 // -----------------------------------------------------------------------------
-// Generic 16-bit multiplier and 47-bit accumulator.

+// Generic 16-bit multiplier and 47-bit accumulator.
 //
 // Authors: Pavel Shatov
 //
@@ -34,41 +34,41 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-//------------------------------------------------------------------------------

-

-module mac16_generic

-	(

-		input					clk,		// clock

-		input					clr,		// clear accumulator (active-high)

-		input					ce,		// enable clock (active-high)

-		input		[15: 0]	a,			// operand input

-		input		[15: 0]	b,			// operand input

-		output	[46: 0]	s			// sum output

-	);

-	

-		//

-		// Multiplier

-		//

-	wire	[31: 0]	p = {{16{1'b0}}, a} * {{16{1'b0}}, b};

-	wire	[46: 0]	p_ext = {{15{1'b0}}, p};

-		

-		//

-		// Accumulator

-		//

-	reg	[46: 0]	s_int;

-	

-	always @(posedge clk)

-		//

-		if (ce) s_int <= clr ? p_ext : p_ext + s_int;

-		

-		//

-		// Output

-		//

-	assign s = s_int;

-

-endmodule

-

-

+//------------------------------------------------------------------------------
+
+module mac16_generic
+  (
+   input 	  clk, // clock
+   input 	  clr, // clear accumulator (active-high)
+   input 	  ce, // enable clock (active-high)
+   input [15: 0]  a, // operand input
+   input [15: 0]  b, // operand input
+   output [46: 0] s			// sum output
+   );
+
+   //
+   // Multiplier
+   //
+   wire [31: 0]   p = {{16{1'b0}}, a} * {{16{1'b0}}, b};
+   wire [46: 0]   p_ext = {{15{1'b0}}, p};
+
+   //
+   // Accumulator
+   //
+   reg [46: 0] 	  s_int;
+
+   always @(posedge clk)
+     //
+     if (ce) s_int <= clr ? p_ext : p_ext + s_int;
+
+   //
+   // Output
+   //
+   assign s = s_int;
+
+endmodule
+
+
 //------------------------------------------------------------------------------
 // End-of-File
-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------
diff --git a/rtl/lowlevel/generic/subtractor32_generic.v b/rtl/lowlevel/generic/subtractor32_generic.v
index 46aefe8..5137ace 100644
--- a/rtl/lowlevel/generic/subtractor32_generic.v
+++ b/rtl/lowlevel/generic/subtractor32_generic.v
@@ -1,67 +1,67 @@
-//------------------------------------------------------------------------------

-//

-// subtractor32_generic.v

-// -----------------------------------------------------------------------------

-// Generic 32-bit subtractor.

-//

-// Authors: Pavel Shatov

-//

-// Copyright (c) 2016, NORDUnet A/S

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are met:

-//

-// - Redistributions of source code must retain the above copyright notice,

-//   this list of conditions and the following disclaimer.

-//

-// - Redistributions in binary form must reproduce the above copyright notice,

-//   this list of conditions and the following disclaimer in the documentation

-//   and/or other materials provided with the distribution.

-//

-// - Neither the name of the NORDUnet nor the names of its contributors may be

-//   used to endorse or promote products derived from this software without

-//   specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-// POSSIBILITY OF SUCH DAMAGE.

-//

-//------------------------------------------------------------------------------

-

-module subtractor32_generic

-	(

-		input					clk,

-		input		[31: 0]	a,

-		input		[31: 0]	b,

-		output	[31: 0]	d,

-		input					b_in,

-		output				b_out	

-	);

-

-		//
-		// Difference
-		//
-	reg	[32: 0]	d_int;

-	

-	always @(posedge clk)

-		d_int <= {1'b0, a} - {1'b0, b} - {{32{1'b0}}, b_in};

-		

-		//

-		// Output

-		//

-	assign d = d_int[31:0];

-	assign b_out = d_int[32];

-

-endmodule

-

-//------------------------------------------------------------------------------

-// End-of-File

-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------
+//
+// subtractor32_generic.v
+// -----------------------------------------------------------------------------
+// Generic 32-bit subtractor.
+//
+// Authors: Pavel Shatov
+//
+// Copyright (c) 2016, NORDUnet A/S
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither the name of the NORDUnet nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+//------------------------------------------------------------------------------
+
+module subtractor32_generic
+  (
+   input 	  clk,
+   input [31: 0]  a,
+   input [31: 0]  b,
+   output [31: 0] d,
+   input 	  b_in,
+   output 	  b_out
+   );
+
+   //
+   // Difference
+   //
+   reg [32: 0] 	  d_int;
+
+   always @(posedge clk)
+     d_int <= {1'b0, a} - {1'b0, b} - {{32{1'b0}}, b_in};
+
+   //
+   // Output
+   //
+   assign d = d_int[31:0];
+   assign b_out = d_int[32];
+
+endmodule
+
+//------------------------------------------------------------------------------
+// End-of-File
+//------------------------------------------------------------------------------
diff --git a/rtl/lowlevel/mac16_wrapper.v b/rtl/lowlevel/mac16_wrapper.v
index b91e518..89dbba1 100644
--- a/rtl/lowlevel/mac16_wrapper.v
+++ b/rtl/lowlevel/mac16_wrapper.v
@@ -2,7 +2,7 @@
 //
 // mac16_wrapper.v
 // -----------------------------------------------------------------------------
-// Wrapper for 16-bit multiplier and 48-bit accumulator.

+// Wrapper for 16-bit multiplier and 48-bit accumulator.
 //
 // Authors: Pavel Shatov
 //
@@ -34,42 +34,42 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
-//------------------------------------------------------------------------------

-

-module mac16_wrapper

-	(

-		input					clk,		// clock

-		input					clr,		// clear accumulator (active-high)

-		input					ce,		// enable clock (active-high)

-		input		[15: 0]	a,			// operand input

-		input		[15: 0]	b,			// operand input

-		output	[46: 0]	s			// sum output

-	);

-	

-			

-		//
-		// Include Primitive Selector
-		//
+//------------------------------------------------------------------------------
+
+module mac16_wrapper
+  (
+   input 	  clk, // clock
+   input 	  clr, // clear accumulator (active-high)
+   input 	  ce, // enable clock (active-high)
+   input [15: 0]  a, // operand input
+   input [15: 0]  b, // operand input
+   output [46: 0] s			// sum output
+   );
+
+
+   //
+   // Include Primitive Selector
+   //
 `include "ecdsa_lowlevel_settings.v"
 
 
-		//
-		// Instantiate Vendor/Generic Primitive
-		//
-	`MAC16_PRIMITIVE mac16_inst
-	(
-		.clk(clk),
-		.clr(clr),
-		.ce(ce),
-		.a(a),
-		.b(b),
-		.s(s)
-	);

-	

-

-endmodule

-

-

+   //
+   // Instantiate Vendor/Generic Primitive
+   //
+   `MAC16_PRIMITIVE mac16_inst
+     (
+      .clk(clk),
+      .clr(clr),
+      .ce(ce),
+      .a(a),
+      .b(b),
+      .s(s)
+      );
+
+
+endmodule
+
+
 //------------------------------------------------------------------------------
 // End-of-File
-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------
diff --git a/rtl/lowlevel/subtractor32_wrapper.v b/rtl/lowlevel/subtractor32_wrapper.v
index 3c7e5e9..063e753 100644
--- a/rtl/lowlevel/subtractor32_wrapper.v
+++ b/rtl/lowlevel/subtractor32_wrapper.v
@@ -1,72 +1,72 @@
-//------------------------------------------------------------------------------

-//

-// subtractor32_wrapper.v

-// -----------------------------------------------------------------------------

-// Wrapper for 32-bit subtractor.

-//

-// Authors: Pavel Shatov

-//

-// Copyright (c) 2016, NORDUnet A/S

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are met:

-//

-// - Redistributions of source code must retain the above copyright notice,

-//   this list of conditions and the following disclaimer.

-//

-// - Redistributions in binary form must reproduce the above copyright notice,

-//   this list of conditions and the following disclaimer in the documentation

-//   and/or other materials provided with the distribution.

-//

-// - Neither the name of the NORDUnet nor the names of its contributors may be

-//   used to endorse or promote products derived from this software without

-//   specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-// POSSIBILITY OF SUCH DAMAGE.

-//

-//------------------------------------------------------------------------------

-

-module subtractor32_wrapper

-	(

-		input					clk,

-		input		[31: 0]	a,

-		input		[31: 0]	b,

-		output	[31: 0]	d,

-		input					b_in,

-		output				b_out	

-	);

-

-			//
-		// Include Primitive Selector
-		//
+//------------------------------------------------------------------------------
+//
+// subtractor32_wrapper.v
+// -----------------------------------------------------------------------------
+// Wrapper for 32-bit subtractor.
+//
+// Authors: Pavel Shatov
+//
+// Copyright (c) 2016, NORDUnet A/S
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither the name of the NORDUnet nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+//------------------------------------------------------------------------------
+
+module subtractor32_wrapper
+  (
+   input 	  clk,
+   input [31: 0]  a,
+   input [31: 0]  b,
+   output [31: 0] d,
+   input 	  b_in,
+   output 	  b_out
+   );
+
+   //
+   // Include Primitive Selector
+   //
 `include "ecdsa_lowlevel_settings.v"
 
 
-		//
-		// Instantiate Vendor/Generic Primitive
-		//
-	`SUBTRACTOR32_PRIMITIVE subtractor32_inst
-	(
-		.clk(clk),
-		.a(a),
-		.b(b),
-		.d(d),
-		.b_in(b_in),
-		.b_out(b_out)
-	);

-

-endmodule

-

-//------------------------------------------------------------------------------

-// End-of-File

-//------------------------------------------------------------------------------

+   //
+   // Instantiate Vendor/Generic Primitive
+   //
+   `SUBTRACTOR32_PRIMITIVE subtractor32_inst
+     (
+      .clk(clk),
+      .a(a),
+      .b(b),
+      .d(d),
+      .b_in(b_in),
+      .b_out(b_out)
+      );
+
+endmodule
+
+//------------------------------------------------------------------------------
+// End-of-File
+//------------------------------------------------------------------------------