Use `0x' instead of `16_'.

diff --git a/tests/dsa b/tests/dsa
index c617019..7e01ddc 100644 (file)
--- a/tests/dsa
+++ b/tests/dsa
@@ -1,6 +1,6 @@
 # Test vectors for DSA
 #
-# $Id: dsa,v 1.1 1999/11/19 19:28:13 mdw Exp $
+# $Id: dsa,v 1.2 1999/11/23 00:06:02 mdw Exp $
 
 # --- About the tests ---
 #
@@ -13,44 +13,44 @@ gen {
   # --- One that I made up ---
 
   bbac0ab63411435cb72f1f95b16ab94c92c34221 256
-  16_84d192cd06ae59691897fa409da6198d5269325d
-  16_c9c7feaeaedb16505389c5582df1858d0fdb3eecfe61c230d612661bef8c1bc5
-  16_5cd41fc97d0db5322bab7d659354db2ed9f88e39d2c6fae9f29acab5a522131e;
+  0x84d192cd06ae59691897fa409da6198d5269325d
+  0xc9c7feaeaedb16505389c5582df1858d0fdb3eecfe61c230d612661bef8c1bc5
+  0x5cd41fc97d0db5322bab7d659354db2ed9f88e39d2c6fae9f29acab5a522131e;
 
   # --- FIPS-186 test vector ---
 
   d5014e4b60ef2ba8b6211b4062ba3224e0427dd3 512
-  16_c773218c737ec8ee993b4f2ded30f48edace915f
-  16_8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
-  16_626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802;
+  0xc773218c737ec8ee993b4f2ded30f48edace915f
+  0x8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
+  0x626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802;
 
   # --- And a full-sized vector ---
 
   d1a29e27dfe4d60124cc41a59e012ae690408acfc3266d07f4eaeefdc9f8c70d2d2a338d
   1024
-  16_fd367bd179b5425ef9bb1f51d7d9a916e58288f9
-  16_dde5808744e1cd37c88667e7033694b2513a7429f035f11c0bafc4dff2b96a672bd0a3ca16aba2ea526df00c8571106ba4a1d83eb62605fc9274ab70bef0a111cd070cca2d8b10edf042d6c44f863c36fabea8bb0d7340eb8c169da27a4b0ba2713c166152a0244235093391c5f71aee8c03dcaf2335a2e4689ccb27ba365ec7
-  16_65985e4c2d6027a8afdeb9b44cc619e1c4d46bde873e0d4b45325412a2f8365e51245324f888704295fe8233a6666624d9a4701172dbfcab5c9643e1caab79eb2a0c85284d1b858688b8f16804326321f53a723502a6d6ae08dcbffccf2187a799f6281c2478ef0faed5c5c80adeabc5ee435cff8b9ae0b603e47fb08d73b014;
+  0xfd367bd179b5425ef9bb1f51d7d9a916e58288f9
+  0xdde5808744e1cd37c88667e7033694b2513a7429f035f11c0bafc4dff2b96a672bd0a3ca16aba2ea526df00c8571106ba4a1d83eb62605fc9274ab70bef0a111cd070cca2d8b10edf042d6c44f863c36fabea8bb0d7340eb8c169da27a4b0ba2713c166152a0244235093391c5f71aee8c03dcaf2335a2e4689ccb27ba365ec7
+  0x65985e4c2d6027a8afdeb9b44cc619e1c4d46bde873e0d4b45325412a2f8365e51245324f888704295fe8233a6666624d9a4701172dbfcab5c9643e1caab79eb2a0c85284d1b858688b8f16804326321f53a723502a6d6ae08dcbffccf2187a799f6281c2478ef0faed5c5c80adeabc5ee435cff8b9ae0b603e47fb08d73b014;
 }
 
 sign {
 
   # --- Quick simple test ---
 
-  16_84d192cd06ae59691897fa409da6198d5269325d
-  16_c9c7feaeaedb16505389c5582df1858d0fdb3eecfe61c230d612661bef8c1bc5
-  16_5cd41fc97d0db5322bab7d659354db2ed9f88e39d2c6fae9f29acab5a522131e
-  16_1234 "An example message"
+  0x84d192cd06ae59691897fa409da6198d5269325d
+  0xc9c7feaeaedb16505389c5582df1858d0fdb3eecfe61c230d612661bef8c1bc5
+  0x5cd41fc97d0db5322bab7d659354db2ed9f88e39d2c6fae9f29acab5a522131e
+  0x1234 "An example message"
   c79ef743e2e6849c8d2dcb2bed3212844f4ad31f381
   2718bf488b981992b164e664224dd00ca1ed4e1c
   5c085679fbfa9ee806781bdbd86a67dbf14df640;
 
   # --- The FIPS-186 test vector ---
 
-  16_c773218c737ec8ee993b4f2ded30f48edace915f
-  16_8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
-  16_626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802
-  16_2070b3223dba372fde1c0ffc7b2e3b498b260614
+  0xc773218c737ec8ee993b4f2ded30f48edace915f
+  0x8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
+  0x626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802
+  0x2070b3223dba372fde1c0ffc7b2e3b498b260614
   "abc"
   358dad571462710f50e254cf1a376b2bdeaadfbf
   8bac1ab66410435cb7181f95b16ab97c92b341c0
@@ -58,10 +58,10 @@ sign {
 
   # --- 1024-bit modulus test ---
 
-  16_fd367bd179b5425ef9bb1f51d7d9a916e58288f9
-  16_dde5808744e1cd37c88667e7033694b2513a7429f035f11c0bafc4dff2b96a672bd0a3ca16aba2ea526df00c8571106ba4a1d83eb62605fc9274ab70bef0a111cd070cca2d8b10edf042d6c44f863c36fabea8bb0d7340eb8c169da27a4b0ba2713c166152a0244235093391c5f71aee8c03dcaf2335a2e4689ccb27ba365ec7
-  16_65985e4c2d6027a8afdeb9b44cc619e1c4d46bde873e0d4b45325412a2f8365e51245324f888704295fe8233a6666624d9a4701172dbfcab5c9643e1caab79eb2a0c85284d1b858688b8f16804326321f53a723502a6d6ae08dcbffccf2187a799f6281c2478ef0faed5c5c80adeabc5ee435cff8b9ae0b603e47fb08d73b014
-  16_23a252f60bae4907a8ed5b6203e2b1da32848cd9
+  0xfd367bd179b5425ef9bb1f51d7d9a916e58288f9
+  0xdde5808744e1cd37c88667e7033694b2513a7429f035f11c0bafc4dff2b96a672bd0a3ca16aba2ea526df00c8571106ba4a1d83eb62605fc9274ab70bef0a111cd070cca2d8b10edf042d6c44f863c36fabea8bb0d7340eb8c169da27a4b0ba2713c166152a0244235093391c5f71aee8c03dcaf2335a2e4689ccb27ba365ec7
+  0x65985e4c2d6027a8afdeb9b44cc619e1c4d46bde873e0d4b45325412a2f8365e51245324f888704295fe8233a6666624d9a4701172dbfcab5c9643e1caab79eb2a0c85284d1b858688b8f16804326321f53a723502a6d6ae08dcbffccf2187a799f6281c2478ef0faed5c5c80adeabc5ee435cff8b9ae0b603e47fb08d73b014
+  0x23a252f60bae4907a8ed5b6203e2b1da32848cd9
   "A message signed with a 1024-bit DSA key."
   12ccb231683a3d9c13dca6fe882349537eebfd03
   2a301061ac185440fbf595f8f7d894158b8d1897
@@ -72,48 +72,48 @@ verify-good {
 
   # --- Simple test ----
 
-  16_84d192cd06ae59691897fa409da6198d5269325d
-  16_c9c7feaeaedb16505389c5582df1858d0fdb3eecfe61c230d612661bef8c1bc5
-  16_5cd41fc97d0db5322bab7d659354db2ed9f88e39d2c6fae9f29acab5a522131e
-  16_51812af9600c89ffe0f73902eb09015c03b4e0fbf6ccf073931c12f9aad1fb47
+  0x84d192cd06ae59691897fa409da6198d5269325d
+  0xc9c7feaeaedb16505389c5582df1858d0fdb3eecfe61c230d612661bef8c1bc5
+  0x5cd41fc97d0db5322bab7d659354db2ed9f88e39d2c6fae9f29acab5a522131e
+  0x51812af9600c89ffe0f73902eb09015c03b4e0fbf6ccf073931c12f9aad1fb47
   "An example message"
   2718bf488b981992b164e664224dd00ca1ed4e1c
   5c085679fbfa9ee806781bdbd86a67dbf14df640;
 
   # --- The FIPS-186 test vector ---
 
-  16_c773218c737ec8ee993b4f2ded30f48edace915f
-  16_8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
-  16_626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802
-  16_19131871d75b1612a819f29d78d1b0d7346f7aa77bb62a859bfd6c5675da9d212d3a36ef1672ef660b8c7c255cc0ec74858fba33f44c06699630a76b030ee333
+  0xc773218c737ec8ee993b4f2ded30f48edace915f
+  0x8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
+  0x626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802
+  0x19131871d75b1612a819f29d78d1b0d7346f7aa77bb62a859bfd6c5675da9d212d3a36ef1672ef660b8c7c255cc0ec74858fba33f44c06699630a76b030ee333
   "abc"
   8bac1ab66410435cb7181f95b16ab97c92b341c0
   41e2345f1f56df2458f426d155b4ba2db6dcd8c8;
 
   # --- 1024-bit modulus test ---
 
-  16_fd367bd179b5425ef9bb1f51d7d9a916e58288f9
-  16_dde5808744e1cd37c88667e7033694b2513a7429f035f11c0bafc4dff2b96a672bd0a3ca16aba2ea526df00c8571106ba4a1d83eb62605fc9274ab70bef0a111cd070cca2d8b10edf042d6c44f863c36fabea8bb0d7340eb8c169da27a4b0ba2713c166152a0244235093391c5f71aee8c03dcaf2335a2e4689ccb27ba365ec7
-  16_65985e4c2d6027a8afdeb9b44cc619e1c4d46bde873e0d4b45325412a2f8365e51245324f888704295fe8233a6666624d9a4701172dbfcab5c9643e1caab79eb2a0c85284d1b858688b8f16804326321f53a723502a6d6ae08dcbffccf2187a799f6281c2478ef0faed5c5c80adeabc5ee435cff8b9ae0b603e47fb08d73b014
-  16_9720498d8ec1208585635faaf952c1204c37119acccc64ed7942867be24770e33db39ffcfa1194549ead8495a7918a20e15144e68125860ef4f8c1a3d771bad690938bdb2c8817e2b89a8fc615d067084a7a2f2f9280e15fb9ccebfe713584260d5ed30545b69745d7b22977bfd44d60d7c5e657aab1c79dc5cb33ff29ee9074
+  0xfd367bd179b5425ef9bb1f51d7d9a916e58288f9
+  0xdde5808744e1cd37c88667e7033694b2513a7429f035f11c0bafc4dff2b96a672bd0a3ca16aba2ea526df00c8571106ba4a1d83eb62605fc9274ab70bef0a111cd070cca2d8b10edf042d6c44f863c36fabea8bb0d7340eb8c169da27a4b0ba2713c166152a0244235093391c5f71aee8c03dcaf2335a2e4689ccb27ba365ec7
+  0x65985e4c2d6027a8afdeb9b44cc619e1c4d46bde873e0d4b45325412a2f8365e51245324f888704295fe8233a6666624d9a4701172dbfcab5c9643e1caab79eb2a0c85284d1b858688b8f16804326321f53a723502a6d6ae08dcbffccf2187a799f6281c2478ef0faed5c5c80adeabc5ee435cff8b9ae0b603e47fb08d73b014
+  0x9720498d8ec1208585635faaf952c1204c37119acccc64ed7942867be24770e33db39ffcfa1194549ead8495a7918a20e15144e68125860ef4f8c1a3d771bad690938bdb2c8817e2b89a8fc615d067084a7a2f2f9280e15fb9ccebfe713584260d5ed30545b69745d7b22977bfd44d60d7c5e657aab1c79dc5cb33ff29ee9074
   "A message signed with a 1024-bit DSA key."
   2a301061ac185440fbf595f8f7d894158b8d1897
   51aedaa73cb8d47e07281d14dda5ea8c0ddf7503;
 }
 
 verify-bad {
-  16_c773218c737ec8ee993b4f2ded30f48edace915f
-  16_8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
-  16_626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802
-  16_19131871d75b1612a819f29d78d1b0d7346f7aa77bb62a859bfd6c5675da9d212d3a36ef1672ef660b8c7c255cc0ec74858fba33f44c06699630a76b030ee333
+  0xc773218c737ec8ee993b4f2ded30f48edace915f
+  0x8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
+  0x626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802
+  0x19131871d75b1612a819f29d78d1b0d7346f7aa77bb62a859bfd6c5675da9d212d3a36ef1672ef660b8c7c255cc0ec74858fba33f44c06699630a76b030ee333
   "abd"
   8bac1ab66410435cb7181f95b16ab97c92b341c0
   41e2345f1f56df2458f426d155b4ba2db6dcd8c8;
 
-  16_c773218c737ec8ee993b4f2ded30f48edace915f
-  16_8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
-  16_626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802
-  16_19131871d75b1612a819f29d78d1b0d7346f7aa77bb62a859bfd6c5675da9d212d3a36ef1672ef660b8c7c255cc0ec74858fba33f44c06699630a76b030ee333
+  0xc773218c737ec8ee993b4f2ded30f48edace915f
+  0x8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
+  0x626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802
+  0x19131871d75b1612a819f29d78d1b0d7346f7aa77bb62a859bfd6c5675da9d212d3a36ef1672ef660b8c7c255cc0ec74858fba33f44c06699630a76b030ee333
   "abc"
   18bac1ab66410435cb7181f95b16ab97c92b341c0
   41e2345f1f56df2458f426d155b4ba2db6dcd8c8;

diff --git a/tests/mpmont b/tests/mpmont
index c1e132f..a537ede 100644 (file)
--- a/tests/mpmont
+++ b/tests/mpmont
@@ -1,6 +1,6 @@
 # Test vectors for Montgomery reduction
 #
-# $Id: mpmont,v 1.3 1999/11/19 19:27:43 mdw Exp $
+# $Id: mpmont,v 1.4 1999/11/23 00:06:17 mdw Exp $
 
 create {
   340809809850981098423498794792349    # m
@@ -32,15 +32,15 @@ exp {
 
   # --- DSA public key derivation ---
 
-  16_c9c7feaeaedb16505389c5582df1858d0fdb3eecfe61c230d612661bef8c1bc5
-  16_5cd41fc97d0db5322bab7d659354db2ed9f88e39d2c6fae9f29acab5a522131e
-  16_1234
-  16_51812af9600c89ffe0f73902eb09015c03b4e0fbf6ccf073931c12f9aad1fb47;
+  0xc9c7feaeaedb16505389c5582df1858d0fdb3eecfe61c230d612661bef8c1bc5
+  0x5cd41fc97d0db5322bab7d659354db2ed9f88e39d2c6fae9f29acab5a522131e
+  0x1234
+  0x51812af9600c89ffe0f73902eb09015c03b4e0fbf6ccf073931c12f9aad1fb47;
 
-  16_dde5808744e1cd37c88667e7033694b2513a7429f035f11c0bafc4dff2b96a672bd0a3ca16aba2ea526df00c8571106ba4a1d83eb62605fc9274ab70bef0a111cd070cca2d8b10edf042d6c44f863c36fabea8bb0d7340eb8c169da27a4b0ba2713c166152a0244235093391c5f71aee8c03dcaf2335a2e4689ccb27ba365ec7
-  16_65985e4c2d6027a8afdeb9b44cc619e1c4d46bde873e0d4b45325412a2f8365e51245324f888704295fe8233a6666624d9a4701172dbfcab5c9643e1caab79eb2a0c85284d1b858688b8f16804326321f53a723502a6d6ae08dcbffccf2187a799f6281c2478ef0faed5c5c80adeabc5ee435cff8b9ae0b603e47fb08d73b014
-  16_23a252f60bae4907a8ed5b6203e2b1da32848cd9
-  16_9720498d8ec1208585635faaf952c1204c37119acccc64ed7942867be24770e33db39ffcfa1194549ead8495a7918a20e15144e68125860ef4f8c1a3d771bad690938bdb2c8817e2b89a8fc615d067084a7a2f2f9280e15fb9ccebfe713584260d5ed30545b69745d7b22977bfd44d60d7c5e657aab1c79dc5cb33ff29ee9074;  
+  0xdde5808744e1cd37c88667e7033694b2513a7429f035f11c0bafc4dff2b96a672bd0a3ca16aba2ea526df00c8571106ba4a1d83eb62605fc9274ab70bef0a111cd070cca2d8b10edf042d6c44f863c36fabea8bb0d7340eb8c169da27a4b0ba2713c166152a0244235093391c5f71aee8c03dcaf2335a2e4689ccb27ba365ec7
+  0x65985e4c2d6027a8afdeb9b44cc619e1c4d46bde873e0d4b45325412a2f8365e51245324f888704295fe8233a6666624d9a4701172dbfcab5c9643e1caab79eb2a0c85284d1b858688b8f16804326321f53a723502a6d6ae08dcbffccf2187a799f6281c2478ef0faed5c5c80adeabc5ee435cff8b9ae0b603e47fb08d73b014
+  0x23a252f60bae4907a8ed5b6203e2b1da32848cd9
+  0x9720498d8ec1208585635faaf952c1204c37119acccc64ed7942867be24770e33db39ffcfa1194549ead8495a7918a20e15144e68125860ef4f8c1a3d771bad690938bdb2c8817e2b89a8fc615d067084a7a2f2f9280e15fb9ccebfe713584260d5ed30545b69745d7b22977bfd44d60d7c5e657aab1c79dc5cb33ff29ee9074;  
 
   # --- Quick RSA test ---
 
@@ -82,10 +82,10 @@ mexp-1 {
 }
 
 mexp-2 {
-  16_8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
-  16_626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802
-  16_bf655bd046f0b35ec791b004804afcbb8ef7d69d
-  16_19131871d75b1612a819f29d78d1b0d7346f7aa77bb62a859bfd6c5675da9d212d3a36ef1672ef660b8c7c255cc0ec74858fba33f44c06699630a76b030ee333
-  16_821a926312e97adeabcc8d082b5278978a2df4b0
-  16_2fc6cb9ac3be0eac3daf02eefb96fca3846708a28dd05730165fe50942f7f07edfef8e52fcb9369e3814aa24607e80475d0e61ad461d6b16b6cec5baae58946e;
+  0x8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291
+  0x626d027839ea0a13413163a55b4cb500299d5522956cefcb3bff10f399ce2c2e71cb9de5fa24babf58e5b79521925c9cc42e9f6f464b088cc572af53e6d78802
+  0xbf655bd046f0b35ec791b004804afcbb8ef7d69d
+  0x19131871d75b1612a819f29d78d1b0d7346f7aa77bb62a859bfd6c5675da9d212d3a36ef1672ef660b8c7c255cc0ec74858fba33f44c06699630a76b030ee333
+  0x821a926312e97adeabcc8d082b5278978a2df4b0
+  0x2fc6cb9ac3be0eac3daf02eefb96fca3846708a28dd05730165fe50942f7f07edfef8e52fcb9369e3814aa24607e80475d0e61ad461d6b16b6cec5baae58946e;
 }