Add the vectors for different (L,N) pairs again for the loader test

1 files changed, 246 insertions, 108 deletions

diff --git a/tests/test_utils.py b/tests/test_utils.py
index 643860dc..433dab04 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -16,8 +16,6 @@ from __future__ import absolute_import, division, print_function
 import os
 import textwrap
 
-import six
-
 import pretend
 
 import pytest
@@ -1175,7 +1173,7 @@ e9933921e627f4b2e011d1c79e45d8ea1eb7e4e59a1cbd8382b3238474eb949749c985200fbb25\
 41e2dce080aa881945d4d935076e48a0846dc5513bb4da8563b946af54f546455931e79c065ce7\
 ca223a98f8fde40091d38eb2c3eb8e3b81d88374f3146b0afc42
 
-   [mod = L=2048, N=256]
+    [mod = L=2048, N=256]
 
     P = ea1fb1af22881558ef93be8a5f8653c5a559434c49c8c2c12ace5e9c41434c9cf0a8e9\
 498acb0f4663c08b4484eace845f6fb17dac62c98e706af0fc74e4da1c6c2b3fbf5a1d58ff82fc\
@@ -1211,113 +1209,253 @@ a17f4550590378f2b074030c20e36911598a1018772f61be3b24de4be5a388ccc09e15a92819c3\
 6e50c9e3305fd09cab6ed4aff6fda6e0d5bf375c81ac9054406d9193b003c89272f1bd83d48250\
 134b65c77c2b6332d38d34d9016f0e8975536ad6c348a1faedb0
 
+    [mod = L=3072, N=256]
+
+    P = f335666dd1339165af8b9a5e3835adfe15c158e4c3c7bd53132e7d5828c352f593a9a7\
+87760ce34b789879941f2f01f02319f6ae0b756f1a842ba54c85612ed632ee2d79ef17f06b77c6\
+41b7b080aff52a03fc2462e80abc64d223723c236deeb7d201078ec01ca1fbc1763139e25099a8\
+4ec389159c409792080736bd7caa816b92edf23f2c351f90074aa5ea2651b372f8b58a0a65554d\
+b2561d706a63685000ac576b7e4562e262a14285a9c6370b290e4eb7757527d80b6c0fd5df831d\
+36f3d1d35f12ab060548de1605fd15f7c7aafed688b146a02c945156e284f5b71282045aba9844\
+d48b5df2e9e7a5887121eae7d7b01db7cdf6ff917cd8eb50c6bf1d54f90cce1a491a9c74fea88f\
+7e7230b047d16b5a6027881d6f154818f06e513faf40c8814630e4e254f17a47bfe9cb519b9828\
+9935bf17673ae4c8033504a20a898d0032ee402b72d5986322f3bdfb27400561f7476cd715eaab\
+b7338b854e51fc2fa026a5a579b6dcea1b1c0559c13d3c1136f303f4b4d25ad5b692229957
+    Q = d3eba6521240694015ef94412e08bf3cf8d635a455a398d6f210f6169041653b
+    G = ce84b30ddf290a9f787a7c2f1ce92c1cbf4ef400e3cd7ce4978db2104d7394b493c183\
+32c64cec906a71c3778bd93341165dee8e6cd4ca6f13afff531191194ada55ecf01ff94d6cf7c4\
+768b82dd29cd131aaf202aefd40e564375285c01f3220af4d70b96f1395420d778228f1461f5d0\
+b8e47357e87b1fe3286223b553e3fc9928f16ae3067ded6721bedf1d1a01bfd22b9ae85fce7782\
+0d88cdf50a6bde20668ad77a707d1c60fcc5d51c9de488610d0285eb8ff721ff141f93a9fb23c1\
+d1f7654c07c46e58836d1652828f71057b8aff0b0778ef2ca934ea9d0f37daddade2d823a4d8e3\
+62721082e279d003b575ee59fd050d105dfd71cd63154efe431a0869178d9811f4f231dc5dcf3b\
+0ec0f2b0f9896c32ec6c7ee7d60aa97109e09224907328d4e6acd10117e45774406c4c947da802\
+0649c3168f690e0bd6e91ac67074d1d436b58ae374523deaf6c93c1e6920db4a080b744804bb07\
+3cecfe83fa9398cf150afa286dc7eb7949750cf5001ce104e9187f7e16859afa8fd0d775ae
+
+    X = b2764c46113983777d3e7e97589f1303806d14ad9f2f1ef033097de954b17706
+    Y = 814824e435e1e6f38daa239aad6dad21033afce6a3ebd35c1359348a0f2418871968c2\
+babfc2baf47742148828f8612183178f126504da73566b6bab33ba1f124c15aa461555c2451d86\
+c94ee21c3e3fc24c55527e01b1f03adcdd8ec5cb08082803a7b6a829c3e99eeb332a2cf5c035b0\
+ce0078d3d414d31fa47e9726be2989b8d06da2e6cd363f5a7d1515e3f4925e0b32adeae3025cc5\
+a996f6fd27494ea408763de48f3bb39f6a06514b019899b312ec570851637b8865cff3a52bf5d5\
+4ad5a19e6e400a2d33251055d0a440b50d53f4791391dc754ad02b9eab74c46b4903f9d76f8243\
+39914db108057af7cde657d41766a99991ac8787694f4185d6f91d7627048f827b405ec67bf2fe\
+56141c4c581d8c317333624e073e5879a82437cb0c7b435c0ce434e15965db1315d64895991e6b\
+be7dac040c42052408bbc53423fd31098248a58f8a67da3a39895cd0cc927515d044c1e3cb6a32\
+59c3d0da354cce89ea3552c59609db10ee989986527436af21d9485ddf25f90f7dff6d2bae
+
+    X = 52e3e040efb30e1befd909a0bdbcfd140d005b1bff094af97186080262f1904d
+    Y = a5ae6e8f9b7a68ab0516dad4d7b7d002126f811d5a52e3d35c6d387fcb43fd19bf7792\
+362f9c98f8348aa058bb62376685f3d0c366c520d697fcd8416947151d4bbb6f32b53528a01647\
+9e99d2cd48d1fc679027c15f0042f207984efe05c1796bca8eba678dfdd00b80418e3ea840557e\
+73b09e003882f9a68edba3431d351d1ca07a8150b018fdbdf6c2f1ab475792a3ccaa6594472a45\
+f8dc777b60bf67de3e0f65c20d11b7d59faedf83fbce52617f500d9e514947c455274c6e900464\
+767fb56599b81344cf6d12c25cb2b7d038d7b166b6cf30534811c15d0e8ab880a2ac06786ae2dd\
+de61329a78d526f65245380ce877e979c5b50de66c9c30d66382c8f254653d25a1eb1d3a4897d7\
+623399b473ce712a2184cf2da1861706c41466806aefe41b497db82aca6c31c8f4aa68c17d1d9e\
+380b57998917655783ec96e5234a131f7299398d36f1f5f84297a55ff292f1f060958c358fed34\
+6db2de45127ca728a9417b2c54203e33e53b9a061d924395b09afab8daf3e8dd7eedcec3ac
     """).splitlines()
 
-    expected_vectors = [
-        {'g': '06b7861abbd35cc89e79c52f68d20875389b127361ca66'
-            '822138ce4991d2b862259d6b4548a6495b195aa0e0b6137ca37eb23b94074d3c3'
-            'd300042bdf15762812b6333ef7b07ceba78607610fcc9ee68491dbc1e34cd1261'
-            '5474e52b18bc934fb00c61d39e7da8902291c4434a4e2224c3f4fd9f93cd6f4f1'
-            '7fc076341a7e7d9',
-         'p': 'd38311e2cd388c3ed698e82fdf88eb92b5a9a483dc8800'
-            '5d4b725ef341eabb47cf8a7a8a41e792a156b7ce97206c4f9c5ce6fc5ae791210'
-            '2b6b502e59050b5b21ce263dddb2044b652236f4d42ab4b5d6aa73189cef1ace7'
-            '78d7845a5c1c1c7147123188f8dc551054ee162b634d60f097f719076640e2098'
-            '0a0093113a8bd73',
-         'q': '96c5390a8b612c0e422bb2b0ea194a3ec935a281',
-         'x': '8185fee9cc7c0e91fd85503274f1cd5a3fd15a49',
-         'y': '6f26d98d41de7d871b6381851c9d91fa03942092ab6097'
-            'e76422070edb71db44ff568280fdb1709f8fc3feab39f1f824adaeb2a29808815'
-            '6ac31af1aa04bf54f475bdcfdcf2f8a2dd973e922d83e76f016558617603129b2'
-            '1c70bf7d0e5dc9e68fe332e295b65876eb9a12fe6fca9f1a1ce80204646bf99b5'
-            '771d249a6fea627'},
-        {'g': '06b7861abbd35cc89e79c52f68d20875389b127361ca66822138'
-            'ce4991d2b862259d6b4548a6495b195aa0e0b6137ca37eb23b94074d3c3d30004'
-            '2bdf15762812b6333ef7b07ceba78607610fcc9ee68491dbc1e34cd12615474e5'
-            '2b18bc934fb00c61d39e7da8902291c4434a4e2224c3f4fd9f93cd6f4f17fc076'
-            '341a7e7d9',
-         'p': 'd38311e2cd388c3ed698e82fdf88eb92b5a9a483dc88005d4b72'
-            '5ef341eabb47cf8a7a8a41e792a156b7ce97206c4f9c5ce6fc5ae7912102b6b50'
-            '2e59050b5b21ce263dddb2044b652236f4d42ab4b5d6aa73189cef1ace778d784'
-            '5a5c1c1c7147123188f8dc551054ee162b634d60f097f719076640e20980a0093'
-            '113a8bd73',
-         'q': '96c5390a8b612c0e422bb2b0ea194a3ec935a281',
-         'x': '85322d6ea73083064376099ca2f65f56e8522d9b',
-         'y': '21f8690f717c9f4dcb8f4b6971de2f15b9231fcf41b7eeb997d7'
-            '81f240bfdddfd2090d22083c26cca39bf37c9caf1ec89518ea64845a50d747b49'
-            '131ffff6a2fd11ea7bacbb93c7d05137383a06365af82225dd3713ca5a4500631'
-            '6f53bd12b0e260d5f79795e5a4c9f353f12867a1d3202394673ada8563b71555e'
-            '53f415254'},
-        {'g': 'e4c4eca88415b23ecf811c96e48cd24200fe916631a68a684e6c'
-            'cb6b1913413d344d1d8d84a333839d88eee431521f6e357c16e6a93be111a9807'
-            '6739cd401bab3b9d565bf4fb99e9d185b1e14d61c93700133f908bae03e28764d'
-            '107dcd2ea7674217622074bb19efff482f5f5c1a86d5551b2fc68d1c6e9d80119'
-            '58ef4b9c2a3a55d0d3c882e6ad7f9f0f3c61568f78d0706b10a26f23b4f197c32'
-            '2b825002284a0aca91807bba98ece912b80e10cdf180cf99a35f210c1655fbfdd'
-            '74f13b1b5046591f8403873d12239834dd6c4eceb42bf7482e1794a1601357b62'
-            '9ddfa971f2ed273b146ec1ca06d0adf55dd91d65c37297bda78c6d210c0bc26e5'
-            '58302',
-         'p': 'ea1fb1af22881558ef93be8a5f8653c5a559434c49c8c2c12ace'
-            '5e9c41434c9cf0a8e9498acb0f4663c08b4484eace845f6fb17dac62c98e706af'
-            '0fc74e4da1c6c2b3fbf5a1d58ff82fc1a66f3e8b12252c40278fff9dd7f102eed'
-            '2cb5b7323ebf1908c234d935414dded7f8d244e54561b0dca39b301de8c49da9f'
-            'b23df33c6182e3f983208c560fb5119fbf78ebe3e6564ee235c6a15cbb9ac247b'
-            'aba5a423bc6582a1a9d8a2b4f0e9e3d9dbac122f750dd754325135257488b1f6e'
-            'cabf21bff2947fe0d3b2cb7ffe67f4e7fcdf1214f6053e72a5bb0dd20a0e9fe6d'
-            'b2df0a908c36e95e60bf49ca4368b8b892b9c79f61ef91c47567c40e1f80ac5aa'
-            '66ef7',
-         'q': '8ec73f3761caf5fdfe6e4e82098bf10f898740dcb808204bf6b1'
-            '8f507192c19d',
-         'x': '405772da6e90d809e77d5de796562a2dd4dfd10ef00a83a3aba6'
-            'bd818a0348a1',
-         'y': '6b32e31ab9031dc4dd0b5039a78d07826687ab087ae6de4736f5'
-            'b0434e1253092e8a0b231f9c87f3fc8a4cb5634eb194bf1b638b7a7889620ce67'
-            '11567e36aa36cda4604cfaa601a45918371d4ccf68d8b10a50a0460eb1dc0fff6'
-            '2ef5e6ee4d473e18ea4a66c196fb7e677a49b48241a0b4a97128eff30fa437050'
-            '501a584f8771e7280d26d5af30784039159c11ebfea10b692fd0a58215eeb18bf'
-            'f117e13f08db792ed4151a218e4bed8dddfb0793225bd1e9773505166f4bd8ced'
-            'bb286ea28232972da7bae836ba97329ba6b0a36508e50a52a7675e476d4d4137e'
-            'ae13f22a9d2fefde708ba8f34bf336c6e76331761e4b0617633fe7ec3f23672fb'
-            '19d27'},
-        {'g': 'e4c4eca88415b23ecf811c96e48cd24200fe916631a68a684e6c'
-            'cb6b1913413d344d1d8d84a333839d88eee431521f6e357c16e6a93be111a9807'
-            '6739cd401bab3b9d565bf4fb99e9d185b1e14d61c93700133f908bae03e28764d'
-            '107dcd2ea7674217622074bb19efff482f5f5c1a86d5551b2fc68d1c6e9d80119'
-            '58ef4b9c2a3a55d0d3c882e6ad7f9f0f3c61568f78d0706b10a26f23b4f197c32'
-            '2b825002284a0aca91807bba98ece912b80e10cdf180cf99a35f210c1655fbfdd'
-            '74f13b1b5046591f8403873d12239834dd6c4eceb42bf7482e1794a1601357b62'
-            '9ddfa971f2ed273b146ec1ca06d0adf55dd91d65c37297bda78c6d210c0bc26e5'
-            '58302',
-         'p': 'ea1fb1af22881558ef93be8a5f8653c5a559434c49c8c2c12ace'
-            '5e9c41434c9cf0a8e9498acb0f4663c08b4484eace845f6fb17dac62c98e706af'
-            '0fc74e4da1c6c2b3fbf5a1d58ff82fc1a66f3e8b12252c40278fff9dd7f102eed'
-            '2cb5b7323ebf1908c234d935414dded7f8d244e54561b0dca39b301de8c49da9f'
-            'b23df33c6182e3f983208c560fb5119fbf78ebe3e6564ee235c6a15cbb9ac247b'
-            'aba5a423bc6582a1a9d8a2b4f0e9e3d9dbac122f750dd754325135257488b1f6e'
-            'cabf21bff2947fe0d3b2cb7ffe67f4e7fcdf1214f6053e72a5bb0dd20a0e9fe6d'
-            'b2df0a908c36e95e60bf49ca4368b8b892b9c79f61ef91c47567c40e1f80ac5aa'
-            '66ef7',
-         'q': '8ec73f3761caf5fdfe6e4e82098bf10f898740dcb808204bf6b1'
-            '8f507192c19d',
-         'x': '0e0b95e31fda3f888059c46c3002ef8f2d6be112d0209aeb9e95'
-            '45da67aeea80',
-         'y': '778082b77ddba6f56597cc74c3a612abf2ddbd85cc81430c99ab'
-            '843c1f630b9db0139965f563978164f9bf3a8397256be714625cd41cd7fa0067d'
-            '94ea66d7e073f7125af692ad01371d4a17f4550590378f2b074030c20e3691159'
-            '8a1018772f61be3b24de4be5a388ccc09e15a92819c31dec50de9fde105b49eaa'
-            '097b9d13d9219eeb33b628facfd1c78a7159c8430d0647c506e7e3de74763cb35'
-            '1eada72c00bef3c9641881e6254870c1e6599f8ca2f1bbb74f39a905e3a34e454'
-            '4168e6e50c9e3305fd09cab6ed4aff6fda6e0d5bf375c81ac9054406d9193b003'
-            'c89272f1bd83d48250134b65c77c2b6332d38d34d9016f0e8975536ad6c348a1f'
-            'aedb0'}
+    expected = [
+        {'g': int('06b7861abbd35cc89e79c52f68d20875389b127361ca66822138ce499'
+                  '1d2b862259d6b4548a6495b195aa0e0b6137ca37eb23b94074d3c3d3000'
+                  '42bdf15762812b6333ef7b07ceba78607610fcc9ee68491dbc1e34cd12'
+                  '615474e52b18bc934fb00c61d39e7da8902291c4434a4e2224c3f'
+                  '4fd9f93cd6f4f17fc076341a7e7d9', 16),
+         'p': int('d38311e2cd388c3ed698e82fdf88eb92b5a9a483dc88005d4b725e'
+                  'f341eabb47cf8a7a8a41e792a156b7ce97206c4f9c5ce6fc5ae791210'
+                  '2b6b502e59050b5b21ce263dddb2044b652236f4d42ab4b5d6aa73189c'
+                  'ef1ace778d7845a5c1c1c7147123188f8dc551054ee162b634d60f097f7'
+                  '19076640e20980a0093113a8bd73', 16),
+         'q': int('96c5390a8b612c0e422bb2b0ea194a3ec935a281', 16),
+         'x': int('8185fee9cc7c0e91fd85503274f1cd5a3fd15a49', 16),
+         'y': int('6f26d98d41de7d871b6381851c9d91fa03942092ab6097e76422'
+                  '070edb71db44ff568280fdb1709f8fc3feab39f1f824adaeb2a29808815'
+                  '6ac31af1aa04bf54f475bdcfdcf2f8a2dd973e922d83e76f01655861760'
+                  '3129b21c70bf7d0e5dc9e68fe332e295b65876eb9a12fe6fca9f1a1ce80'
+                  '204646bf99b5771d249a6fea627', 16)},
+        {'g': int('06b7861abbd35cc89e79c52f68d20875389b127361ca66822138ce4991d'
+                  '2b862259d6b4548a6495b195aa0e0b6137ca37eb23b94074d3c3d30004'
+                  '2bdf15762812b6333ef7b07ceba78607610fcc9ee68491dbc1e34cd126'
+                  '15474e52b18bc934fb00c61d39e7da8902291c4434a4e2224c3f4fd9'
+                  'f93cd6f4f17fc076341a7e7d9', 16),
+         'p': int('d38311e2cd388c3ed698e82fdf88eb92b5a9a483dc88005d4b725ef341e'
+                  'abb47cf8a7a8a41e792a156b7ce97206c4f9c5ce6fc5ae7912102b6b50'
+                  '2e59050b5b21ce263dddb2044b652236f4d42ab4b5d6aa73189cef1a'
+                  'ce778d7845a5c1c1c7147123188f8dc551054ee162b634d6'
+                  '0f097f719076640e20980a0093113a8bd73', 16),
+         'q': int('96c5390a8b612c0e422bb2b0ea194a3ec935a281', 16),
+         'x': int('85322d6ea73083064376099ca2f65f56e8522d9b', 16),
+         'y': int('21f8690f717c9f4dcb8f4b6971de2f15b9231fcf41b7eeb997d781f240'
+                  'bfdddfd2090d22083c26cca39bf37c9caf1ec89518ea64845a50d747b49'
+                  '131ffff6a2fd11ea7bacbb93c7d05137383a06365af82225dd3713c'
+                  'a5a45006316f53bd12b0e260d5f79795e5a4c9f353f12867a1d3'
+                  '202394673ada8563b71555e53f415254', 16)},
+
+        {'g': int('e4c4eca88415b23ecf811c96e48cd24200fe916631a68a684e6ccb6b191'
+                  '3413d344d1d8d84a333839d88eee431521f6e357c16e6a93be111a9807'
+                  '6739cd401bab3b9d565bf4fb99e9d185b1e14d61c93700133f908bae0'
+                  '3e28764d107dcd2ea7674217622074bb19efff482f5f5c1a86d5551b2'
+                  'fc68d1c6e9d8011958ef4b9c2a3a55d0d3c882e6ad7f9f0f3c61568f78'
+                  'd0706b10a26f23b4f197c322b825002284a0aca91807bba98ece912'
+                  'b80e10cdf180cf99a35f210c1655fbfdd74f13b1b5046591f8403873d'
+                  '12239834dd6c4eceb42bf7482e1794a1601357b629ddfa971f2ed273b1'
+                  '46ec1ca06d0adf55dd91d65c37297bda78c6d210c0bc26e558302', 16),
+         'p': int('ea1fb1af22881558ef93be8a5f8653c5a559434c49c8c2c12ace'
+                  '5e9c41434c9cf0a8e9498acb0f4663c08b4484eace845f6fb17d'
+                  'ac62c98e706af0fc74e4da1c6c2b3fbf5a1d58ff82fc1a66f3e8b122'
+                  '52c40278fff9dd7f102eed2cb5b7323ebf1908c234d935414dded7f8d2'
+                  '44e54561b0dca39b301de8c49da9fb23df33c6182e3f983208c560fb5'
+                  '119fbf78ebe3e6564ee235c6a15cbb9ac247baba5a423bc6582a1a9d8a'
+                  '2b4f0e9e3d9dbac122f750dd754325135257488b1f6ecabf21bff2947'
+                  'fe0d3b2cb7ffe67f4e7fcdf1214f6053e72a5bb0dd20a0e9fe6db2df0a'
+                  '908c36e95e60bf49ca4368b8b892b9c79f61ef91c47567c40e1f80ac'
+                  '5aa66ef7', 16),
+         'q': int('8ec73f3761caf5fdfe6e4e82098bf10f898740dcb808204bf6b1'
+                  '8f507192c19d', 16),
+         'x': int('405772da6e90d809e77d5de796562a2dd4dfd10ef00a83a3aba6'
+                  'bd818a0348a1', 16),
+         'y': int('6b32e31ab9031dc4dd0b5039a78d07826687ab087ae6de4736f5'
+                  'b0434e1253092e8a0b231f9c87f3fc8a4cb5634eb194bf1b638'
+                  'b7a7889620ce6711567e36aa36cda4604cfaa601a45918371d'
+                  '4ccf68d8b10a50a0460eb1dc0fff62ef5e6ee4d473e18ea4a6'
+                  '6c196fb7e677a49b48241a0b4a97128eff30fa437050501a584'
+                  'f8771e7280d26d5af30784039159c11ebfea10b692fd0a58215ee'
+                  'b18bff117e13f08db792ed4151a218e4bed8dddfb0793225bd1e97'
+                  '73505166f4bd8cedbb286ea28232972da7bae836ba97329ba6b0a36508'
+                  'e50a52a7675e476d4d4137eae13f22a9d2fefde708ba8f34bf336c6e7'
+                  '6331761e4b0617633fe7ec3f23672fb19d27', 16)},
+        {'g': int('e4c4eca88415b23ecf811c96e48cd24200fe916631a68a684e6ccb6b191'
+                  '3413d344d1d8d84a333839d88eee431521f6e357c16e6a93be111a9807'
+                  '6739cd401bab3b9d565bf4fb99e9d185b1e14d61c93700133f908bae0'
+                  '3e28764d107dcd2ea7674217622074bb19efff482f5f5c1a86d5551b2'
+                  'fc68d1c6e9d8011958ef4b9c2a3a55d0d3c882e6ad7f9f0f3c61568f78'
+                  'd0706b10a26f23b4f197c322b825002284a0aca91807bba98ece912'
+                  'b80e10cdf180cf99a35f210c1655fbfdd74f13b1b5046591f8403873d'
+                  '12239834dd6c4eceb42bf7482e1794a1601357b629ddfa971f2ed273b1'
+                  '46ec1ca06d0adf55dd91d65c37297bda78c6d210c0bc26e558302', 16),
+         'p': int('ea1fb1af22881558ef93be8a5f8653c5a559434c49c8c2c12ace'
+                  '5e9c41434c9cf0a8e9498acb0f4663c08b4484eace845f6fb17d'
+                  'ac62c98e706af0fc74e4da1c6c2b3fbf5a1d58ff82fc1a66f3e8b122'
+                  '52c40278fff9dd7f102eed2cb5b7323ebf1908c234d935414dded7f8d2'
+                  '44e54561b0dca39b301de8c49da9fb23df33c6182e3f983208c560fb5'
+                  '119fbf78ebe3e6564ee235c6a15cbb9ac247baba5a423bc6582a1a9d8a'
+                  '2b4f0e9e3d9dbac122f750dd754325135257488b1f6ecabf21bff2947'
+                  'fe0d3b2cb7ffe67f4e7fcdf1214f6053e72a5bb0dd20a0e9fe6db2df0a'
+                  '908c36e95e60bf49ca4368b8b892b9c79f61ef91c47567c40e1f80ac'
+                  '5aa66ef7', 16),
+         'q': int('8ec73f3761caf5fdfe6e4e82098bf10f898740dcb808204bf6b1'
+                  '8f507192c19d', 16),
+         'x': int('0e0b95e31fda3f888059c46c3002ef8f2d6be112d0209aeb9e95'
+                  '45da67aeea80', 16),
+         'y': int('778082b77ddba6f56597cc74c3a612abf2ddbd85cc81430c99ab'
+                  '843c1f630b9db0139965f563978164f9bf3a8397256be714625'
+                  'cd41cd7fa0067d94ea66d7e073f7125af692ad01371d4a17f45'
+                  '50590378f2b074030c20e36911598a1018772f61be3b24de4be'
+                  '5a388ccc09e15a92819c31dec50de9fde105b49eaa097b9d13d'
+                  '9219eeb33b628facfd1c78a7159c8430d0647c506e7e3de74763c'
+                  'b351eada72c00bef3c9641881e6254870c1e6599f8ca2f1bbb74f'
+                  '39a905e3a34e4544168e6e50c9e3305fd09cab6ed4aff6fda6e0d'
+                  '5bf375c81ac9054406d9193b003c89272f1bd83d48250134b65c77'
+                  'c2b6332d38d34d9016f0e8975536ad6c348a1faedb0', 16)},
+
+        {'g': int('ce84b30ddf290a9f787a7c2f1ce92c1cbf4ef400e3cd7ce4978d'
+                  'b2104d7394b493c18332c64cec906a71c3778bd93341165dee8'
+                  'e6cd4ca6f13afff531191194ada55ecf01ff94d6cf7c4768b82'
+                  'dd29cd131aaf202aefd40e564375285c01f3220af4d70b96f1'
+                  '395420d778228f1461f5d0b8e47357e87b1fe3286223b553e3'
+                  'fc9928f16ae3067ded6721bedf1d1a01bfd22b9ae85fce77820d88cdf'
+                  '50a6bde20668ad77a707d1c60fcc5d51c9de488610d0285eb8ff721f'
+                  'f141f93a9fb23c1d1f7654c07c46e58836d1652828f71057b8aff0b077'
+                  '8ef2ca934ea9d0f37daddade2d823a4d8e362721082e279d003b575ee'
+                  '59fd050d105dfd71cd63154efe431a0869178d9811f4f231dc5dcf3b'
+                  '0ec0f2b0f9896c32ec6c7ee7d60aa97109e09224907328d4e6acd1011'
+                  '7e45774406c4c947da8020649c3168f690e0bd6e91ac67074d1d436b'
+                  '58ae374523deaf6c93c1e6920db4a080b744804bb073cecfe83fa939'
+                  '8cf150afa286dc7eb7949750cf5001ce104e9187f7e16859afa8fd0d'
+                  '775ae', 16),
+         'p': int('f335666dd1339165af8b9a5e3835adfe15c158e4c3c7bd53132e7d5828'
+                  'c352f593a9a787760ce34b789879941f2f01f02319f6ae0b756f1a842'
+                  'ba54c85612ed632ee2d79ef17f06b77c641b7b080aff52a03fc2462e8'
+                  '0abc64d223723c236deeb7d201078ec01ca1fbc1763139e25099a84ec'
+                  '389159c409792080736bd7caa816b92edf23f2c351f90074aa5ea2651'
+                  'b372f8b58a0a65554db2561d706a63685000ac576b7e4562e262a1428'
+                  '5a9c6370b290e4eb7757527d80b6c0fd5df831d36f3d1d35f12ab0605'
+                  '48de1605fd15f7c7aafed688b146a02c945156e284f5b71282045aba9'
+                  '844d48b5df2e9e7a5887121eae7d7b01db7cdf6ff917cd8eb50c6bf1d'
+                  '54f90cce1a491a9c74fea88f7e7230b047d16b5a6027881d6f154818f'
+                  '06e513faf40c8814630e4e254f17a47bfe9cb519b98289935bf17673a'
+                  'e4c8033504a20a898d0032ee402b72d5986322f3bdfb27400561f7476'
+                  'cd715eaabb7338b854e51fc2fa026a5a579b6dcea1b1c0559c13d3c11'
+                  '36f303f4b4d25ad5b692229957', 16),
+         'q': int('d3eba6521240694015ef94412e08bf3cf8d635a455a398d6f210'
+                  'f6169041653b', 16),
+         'x': int('b2764c46113983777d3e7e97589f1303806d14ad9f2f1ef03309'
+                  '7de954b17706', 16),
+         'y': int('814824e435e1e6f38daa239aad6dad21033afce6a3ebd35c1359348a0f2'
+                  '418871968c2babfc2baf47742148828f8612183178f126504da73566b6'
+                  'bab33ba1f124c15aa461555c2451d86c94ee21c3e3fc24c55527e'
+                  '01b1f03adcdd8ec5cb08082803a7b6a829c3e99eeb332a2cf5c035b0c'
+                  'e0078d3d414d31fa47e9726be2989b8d06da2e6cd363f5a7d1515e3f4'
+                  '925e0b32adeae3025cc5a996f6fd27494ea408763de48f3bb39f6a06'
+                  '514b019899b312ec570851637b8865cff3a52bf5d54ad5a19e6e400'
+                  'a2d33251055d0a440b50d53f4791391dc754ad02b9eab74c46b4903'
+                  'f9d76f824339914db108057af7cde657d41766a99991ac8787694f'
+                  '4185d6f91d7627048f827b405ec67bf2fe56141c4c581d8c317333'
+                  '624e073e5879a82437cb0c7b435c0ce434e15965db1315d648959'
+                  '91e6bbe7dac040c42052408bbc53423fd31098248a58f8a67da3a'
+                  '39895cd0cc927515d044c1e3cb6a3259c3d0da354cce89ea3552c'
+                  '59609db10ee989986527436af21d9485ddf25f90f7dff6d2bae', 16)},
+        {'g': int('ce84b30ddf290a9f787a7c2f1ce92c1cbf4ef400e3cd7ce4978d'
+                  'b2104d7394b493c18332c64cec906a71c3778bd93341165dee8'
+                  'e6cd4ca6f13afff531191194ada55ecf01ff94d6cf7c4768b82'
+                  'dd29cd131aaf202aefd40e564375285c01f3220af4d70b96f1'
+                  '395420d778228f1461f5d0b8e47357e87b1fe3286223b553e3'
+                  'fc9928f16ae3067ded6721bedf1d1a01bfd22b9ae85fce77820d88cdf'
+                  '50a6bde20668ad77a707d1c60fcc5d51c9de488610d0285eb8ff721f'
+                  'f141f93a9fb23c1d1f7654c07c46e58836d1652828f71057b8aff0b077'
+                  '8ef2ca934ea9d0f37daddade2d823a4d8e362721082e279d003b575ee'
+                  '59fd050d105dfd71cd63154efe431a0869178d9811f4f231dc5dcf3b'
+                  '0ec0f2b0f9896c32ec6c7ee7d60aa97109e09224907328d4e6acd1011'
+                  '7e45774406c4c947da8020649c3168f690e0bd6e91ac67074d1d436b'
+                  '58ae374523deaf6c93c1e6920db4a080b744804bb073cecfe83fa939'
+                  '8cf150afa286dc7eb7949750cf5001ce104e9187f7e16859afa8fd0d'
+                  '775ae', 16),
+         'p': int('f335666dd1339165af8b9a5e3835adfe15c158e4c3c7bd53132e7d5828'
+                  'c352f593a9a787760ce34b789879941f2f01f02319f6ae0b756f1a842'
+                  'ba54c85612ed632ee2d79ef17f06b77c641b7b080aff52a03fc2462e8'
+                  '0abc64d223723c236deeb7d201078ec01ca1fbc1763139e25099a84ec'
+                  '389159c409792080736bd7caa816b92edf23f2c351f90074aa5ea2651'
+                  'b372f8b58a0a65554db2561d706a63685000ac576b7e4562e262a1428'
+                  '5a9c6370b290e4eb7757527d80b6c0fd5df831d36f3d1d35f12ab0605'
+                  '48de1605fd15f7c7aafed688b146a02c945156e284f5b71282045aba9'
+                  '844d48b5df2e9e7a5887121eae7d7b01db7cdf6ff917cd8eb50c6bf1d'
+                  '54f90cce1a491a9c74fea88f7e7230b047d16b5a6027881d6f154818f'
+                  '06e513faf40c8814630e4e254f17a47bfe9cb519b98289935bf17673a'
+                  'e4c8033504a20a898d0032ee402b72d5986322f3bdfb27400561f7476'
+                  'cd715eaabb7338b854e51fc2fa026a5a579b6dcea1b1c0559c13d3c11'
+                  '36f303f4b4d25ad5b692229957', 16),
+         'q': int('d3eba6521240694015ef94412e08bf3cf8d635a455a398d6f210'
+                  'f6169041653b', 16),
+         'x': int('52e3e040efb30e1befd909a0bdbcfd140d005b1bff094af97186'
+                  '080262f1904d', 16),
+         'y': int('a5ae6e8f9b7a68ab0516dad4d7b7d002126f811d5a52e3d35c6d'
+                  '387fcb43fd19bf7792362f9c98f8348aa058bb62376685f3d0c3'
+                  '66c520d697fcd8416947151d4bbb6f32b53528a016479e99d2cd'
+                  '48d1fc679027c15f0042f207984efe05c1796bca8eba678dfdd0'
+                  '0b80418e3ea840557e73b09e003882f9a68edba3431d351d1ca0'
+                  '7a8150b018fdbdf6c2f1ab475792a3ccaa6594472a45f8dc777b'
+                  '60bf67de3e0f65c20d11b7d59faedf83fbce52617f500d9e5149'
+                  '47c455274c6e900464767fb56599b81344cf6d12c25cb2b7d038'
+                  'd7b166b6cf30534811c15d0e8ab880a2ac06786ae2ddde61329a'
+                  '78d526f65245380ce877e979c5b50de66c9c30d66382c8f25465'
+                  '3d25a1eb1d3a4897d7623399b473ce712a2184cf2da1861706c4'
+                  '1466806aefe41b497db82aca6c31c8f4aa68c17d1d9e380b5799'
+                  '8917655783ec96e5234a131f7299398d36f1f5f84297a55ff292'
+                  'f1f060958c358fed346db2de45127ca728a9417b2c54203e33e5'
+                  '3b9a061d924395b09afab8daf3e8dd7eedcec3ac', 16)}
     ]
 
-    expected = []
-    for dictionary in expected_vectors:
-        new_dict = {}
-        for k, v in six.iteritems(dictionary):
-            v = int(v, 16)
-            new_dict[k] = v
-        expected.append(new_dict)
-
     assert expected == load_fips_dsa_key_pair_vectors(vector_data)