1 files changed, 0 insertions, 76 deletions

diff --git a/src/tests/data/kdf/kdf2.vec b/src/tests/data/kdf/kdf2.vec
index 53979da85..7c5a771cf 100644
--- a/src/tests/data/kdf/kdf2.vec
+++ b/src/tests/data/kdf/kdf2.vec
@@ -1,380 +1,304 @@
 [KDF2(SHA-160)]
 Secret = FD7A43EA8A443C580C0DE618ECC013704505EFF8B5A4A9
 Salt = BF0B2ECD1724A348211D8C0CA7
-OutputLen = 1
 Output = 79
 
 Secret = 701F3480DFE95F57941F804B1B2413EF
 Salt = 55A4E9DD5F4CA2EF82
-OutputLen = 2
 Output = FBEC
 
 Secret = BEEA23BF806E106D0C91F8E87095AB402C433C581088E1236FD20564A8F1AF67DCD2265C40
 Salt = 36C94DC7C2353757E0778323B3DB333BBD57AA8F5C
-OutputLen = 3
 Output = 78F8E7
 
 Secret = 5A6999A96594B0989B89CA72B5C0803043D4DE78709B490EB98610
 Salt = 5F0F820B69ECA512
-OutputLen = 4
 Output = 84C92008
 
 Secret = C6E227F3F9BB5227BE37D6CE7433022D5F0DFFE18C5777EBAF396F1E40C4
 Salt = CC06A6F3F9A0AF4CC76D839D
-OutputLen = 5
 Output = F518EEE6F2
 
 Secret = CD6356CA771E3FCC4BB548B4E6EE4E3715EB7A4A806E4967B1
 Salt = 221DA543
-OutputLen = 6
 Output = E72EC27D6A81
 
 Secret = B7FA7917A833B0C0364FAC414D92DA
 Salt = DC32AA175531CF88C8D55A51DA5CAFB314A92C2B52
-OutputLen = 7
 Output = 8E54D1C86DA8A9
 
 Secret = 8A14
 Salt = 65A907357B5CBADC5C5EFF7065AD
-OutputLen = 8
 Output = A2FC623645F9AD29
 
 Secret = 135FF7296DC87F5775B64F8CFF46D366C10A8A98712345CE58CD5839E9
 Salt = A439FC03312570F9A4C76E5B17FA
-OutputLen = 9
 Output = 73036FBD1941C7955E
 
 Secret = AD499722078DF83AEC1EC23A507B190740B0A6821F8C
 Salt = 3772601ACF052CD530D91EC7
-OutputLen = 10
 Output = A461A98B6BBBB0FDB0BD
 
 Secret = CF99B7A985C223BE83F999D7
 Salt = 055396C3E0EE8190DBE10212AE099FF0BC0A8D
-OutputLen = 11
 Output = 735BFCF26A4357F5642964
 
 Secret = B640D21A1FECF5E61D79E1E09C2393915D5790EF8080E7F6CC18
 Salt = 5AE5506D6306
-OutputLen = 12
 Output = 6DB9BAE99803B2EB725FA8B3
 
 Secret = F69885268F3DF8488490419F49CD39A54D0D8C9A3861D375A8BE
 Salt = C1
-OutputLen = 13
 Output = 2A1EB238B7CB39422DE263E4FD
 
 Secret = DCF4DF1F6B5D71DF98ECFFE8A4B7C5E7234AFC10CC0C941D853BFC32487A
 Salt = 7F246E5F44DABCB5B954A1B83D456F022C924D29A21935
-OutputLen = 14
 Output = FCF8D9D4E43318EFC0056EBCD271
 
 Secret = BD2EDB4CCCB0ED3D01BA03D1A816425E40ACBC7F214126A6775AFE28B0B2646DE040B9ACF0
 Salt = A7E9F261EDC30903056744B123C3D364E979
-OutputLen = 15
 Output = C669ECC95557FE8E49457576BDABD3
 
 Secret = 3185AFBCFC621B6F9FFCBB75C7E71A4161A0AA39278676
 Salt = 80834249A9A4CFFCD655AB92
-OutputLen = 16
 Output = 687481BEF8354C8D48D8F5A5F3D9ED3D
 
 Secret = 15723A13E56CA0FF5EE43D8A4BA8284B4A946D861F
 Salt = 
-OutputLen = 17
 Output = 439082061EBAE065C434932D981603AE1B
 
 Secret = 92167440112E
 Salt = 45A9BEDED69163123D0348F5185F61ABFB1BF18D6AEA454F
-OutputLen = 18
 Output = 3A5DC9AA1C872B4744515AC2702D6396FC2A
 
 Secret = 208AA86616B4133903946BA8
 Salt = CF08208B76D97F
-OutputLen = 19
 Output = A267CC65619C84EF5FE1744EC3A92A06B99399
 
 Secret = 04879F0DB43E33435D53F0DDDC72BEB957F04F2CA5E8FB38DC4F78
 Salt = 2B688B3F6C12
-OutputLen = 20
 Output = F46E2675B807CC42FC1DD4C84A5BEA3AC175B093
 
 Secret = AAF175079CB9CD462EB2D4D62440EF18B22AEF1552CE5F04EF0158C177572D21
 Salt = 48A228E55BF52B89A8FF5FCC3F4EE4F178D406CBA265CF9166
-OutputLen = 21
 Output = 5A3796C9045712759E6DE769E5049E5829408615DC
 
 Secret = 901BBA708DAE7365ADCCB7AE056729B5DD610226966B084A02D1E8
 Salt = 3FCD4A2A5D65E4CDF29241573F
-OutputLen = 22
 Output = 8A397BBA8EA862DCD004897304B901784513754E9FF6
 
 Secret = D20CD658
 Salt = 17D7E5C9E3DB69B28EC9
-OutputLen = 23
 Output = 5C893F99FE81F1E955F2A7CFEC4F50B7CCC890BEAE4768
 
 Secret = B669EDEC3D9A78
 Salt = D072D0
-OutputLen = 24
 Output = 1A4DD8282E8B4D7A739030FF60CD88C4D3C0E5C3A0DEB127
 
 Secret = 349AD0D9BEA0D29C
 Salt = D4C8D8DB185F7EBBEC046ADC49A26DAA172F81E3
-OutputLen = 25
 Output = 678051858CED59674C06B60EE21D18ACD55C10B049B22F5CFF
 
 Secret = B809759B369EF9B2F34A0254AAE645
 Salt = D3EF4B914359E78F253FFC8B9B6D711E257B94
-OutputLen = 26
 Output = 1C2C3C95529E4C8E5677F714E122A2E348810379B09689FA4B30
 
 Secret = 20216E8DCC3AA461F9FEFA4BE06F3C63BB
 Salt = AD13544336F28B8F1B2615BB9658
-OutputLen = 27
 Output = A24D44F5194B4257B92CF85C8493B5BDA52515E18337280C45F005
 
 Secret = 40923A6409592A370301A859F1E797
 Salt = C3D9FCE8C68AFD0F97D21AAE826ADC1EAB6F580F78B139B0B43B58
-OutputLen = 28
 Output = 4C8919843B73BAA06853E1C8D9D4B18518CD857A624BE3EBBD507BCF
 
 Secret = 26541874BEBDA8DB76CCD60DE28E65E91CC5F128B9C56F6609185F108337A4A98B
 Salt = BD1D497AC525F091FBFD7389635DA5284ECE
-OutputLen = 29
 Output = B16B3FAD79618B39D2FB0983BDE7D3E8C17E2DBF2C2853CE8D92191696
 
 Secret = 5D17A9CFD9994A1CC1F0AAC3C48F60C7DB
 Salt = FC56
-OutputLen = 30
 Output = 1233A118E3B025AF2240F2AB14A61777A1347AE58033B2FFA313946631B3
 
 Secret = 32048974CBE67FE8B4E6C0D4E21035B2A657E7C5E3592A61A2
 Salt = D6ABF65542
-OutputLen = 31
 Output = 5301147F08E1D473F82558F815498F7421D8C501056402F77A186779A6C5C8
 
 Secret = F4E8338789D14BCD31EAE46199DB1A86AC76B8611809DF4D77279F53CB0F6DBF
 Salt = F7A146807292
-OutputLen = 32
 Output = 90C528975E02E3B5A9970B0074C02A691401A7BCAA94A8B731648A1732806D6D
 
 Secret = 0DE2DADDC876B4B0322B3B995B43B580B4D5DF529F4E29606F825AFA72
 Salt = BECB7FA1A65C69
-OutputLen = 33
 Output = 41163C646606A0B96EE1FA2783AAD072260670283870BB8A510A693D01F9C0A5D6
 
 Secret = CF00B2A31485DCC4D6F9296D219F4831CE80A0043CA937F9712DCD1C0AF02BD9F0DD7C
 Salt = 046259C93952F2
-OutputLen = 34
 Output = EFEAF89E578CFC169570F08452C42157EFB9905D33DCD97DF29A4CD626F9DF539E3E
 
 Secret = EE67BFB3A6F4CD
 Salt = A85EEB10A12C6B8DE05642
-OutputLen = 35
 Output = 1D02C4CE8D6AF08F2A4E8660718EBF8031C640B7502BE5F1F2EE91CB35241952D63BB4
 
 Secret = BC02C1
 Salt = E2E57EB395
-OutputLen = 36
 Output = 6D3B84710944B5A4448455C22D5CF21852123816A33269ECB29DBCB10616978FD5200FB6
 
 Secret = 85B2DFCEC6D020E7DD45933451363AF111346D52E1BA4B168D47BE178F
 Salt = CA79147C58E3422803290548BD3999F3738A04A8
-OutputLen = 37
 Output = E43AC0F5353A0ED3C35C1EC0BEA6190C49A9F8925E510DB762441BBAF8B798686C1BE6D84C
 
 Secret = 6E757BDFE044D00A96AB79F3CEB27F96
 Salt = 
-OutputLen = 38
 Output = 0A18BD32469D8FCA917A80C173C2E01B2C9E2AF978CDE34E5EFF933B563F3B26842778BAD326
 
 Secret = 26E7CF534DAF8F9243C5CE3297D807D1C6B4F0CAB16AB5CED3C737
 Salt = 8AD8F6
-OutputLen = 1
 Output = 4A
 
 Secret = 166C66F4B39A17A2
 Salt = 81
-OutputLen = 2
 Output = 8AEC
 
 Secret = 8533C513D7D26ECD416DD3DC
 Salt = 52474087F2
-OutputLen = 3
 Output = 030CAC
 
 Secret = E876D64472865C8F4B7F
 Salt = BA88B207
-OutputLen = 4
 Output = A83C863B
 
 Secret = 15AC949219878463A7B1A6599ED9
 Salt = E79A373588F3
-OutputLen = 5
 Output = AA28AD4916
 
 Secret = D288A4BBC027594788F81964C74F
 Salt = 06
-OutputLen = 6
 Output = 5777F5478B70
 
 Secret = 84D3564BA0AA5A0DAC7AD62F88D9373B9DB280D026AF0AE5BCA633AE36C24ABA95A005
 Salt = 364A60
-OutputLen = 7
 Output = 934CEDC65FDE09
 
 Secret = 5977D030DF4051B9FB03167331C6B6366A0F8CEC71B69FFB1FDC9469B5
 Salt = E734
-OutputLen = 8
 Output = F09FE23B9C34EFC1
 
 Secret = 26A51955CBF815122460E803F1B399F617A4AE1CEE
 Salt = 0E33D563
-OutputLen = 9
 Output = 17A5BFF10B516A752E
 
 Secret = EFB7C556790493E3C15B513CCD250FEF4BA7878585B8E50E1009C56BB146B5A0
 Salt = FD7B
-OutputLen = 10
 Output = EC92ACB1367E34CF1361
 
 Secret = F2EAABA8E42ADCC55CD36A2C78DD0325E55C1B4E9C6BE9F77966BFBD623CD454267FFC0BA9
 Salt = D8D005AB3A3123
-OutputLen = 11
 Output = E0DC1C8E9071A644ADEE46
 
 Secret = 01A8F53F2BBDFB05D41E9FCCDD85CFBD4BC0502C
 Salt = 6E3EAC35BA
-OutputLen = 12
 Output = 1C9D86C49E9F3DBFF9674A11
 
 Secret = 02414433D5734F
 Salt = 70
-OutputLen = 13
 Output = EDB45D5FA17F17147645DD8DC2
 
 Secret = 13EC731CB6C29FC4350FE0DE63FCBB5A6F3568E05250099715795D51C5AC10D89883F44E46
 Salt = 93127BA3F25906
-OutputLen = 14
 Output = AA07990CEAAB482272FCB3A3AB46
 
 Secret = 2BCB12D2E40A5BB81BE4297F9306
 Salt = 67
-OutputLen = 15
 Output = 3F450384BEB9C9A478F46F051FF152
 
 Secret = 4DBF180733
 Salt = 54C4
-OutputLen = 16
 Output = 0FDFEE8AF8D926763E28AB284C7B8040
 
 Secret = BD3E9044AD45F1E710529172837597E7BCBC2C27505187
 Salt = 
-OutputLen = 17
 Output = 0E4FD5D562490C5FFD0A37588344D86347
 
 Secret = 822816
 Salt = C1
-OutputLen = 18
 Output = 21E8AEDC72151B03D2F9A3E7CD9CA6805FEE
 
 Secret = 7FE688
 Salt = C9
-OutputLen = 19
 Output = 6701CD19F736B12C067D58FBF0D024E695C18B
 
 Secret = 1EC869F1476B8C7C537E8B1AC4411A10332A7DD06645C835EBBB3CEFD570A9
 Salt = F338
-OutputLen = 20
 Output = F04DCD7617D96283E463511A1A9313006EB6BD4E
 
 Secret = 6C78966EAF4DB43ADC3865962F292CDC81
 Salt = D4
-OutputLen = 21
 Output = 9093D86736C445B12843AD189410984F8B912281A5
 
 Secret = D85C07E05DDA286A4A1B9191A929FBE1D19D
 Salt = 138399
-OutputLen = 22
 Output = DCB8FF108AAE1B16901CABF9BAF0AFC4ED1B20A72312
 
 Secret = 597406
 Salt = D5A5EEBC47
-OutputLen = 23
 Output = AE58662CFE38E861B289EF9E3146A37393C798BB7ABEE0
 
 Secret = 33460E
 Salt = F8A648C9B6E9
-OutputLen = 24
 Output = 6A85B3C6A5A6D0E1734004B788FE84C744BBDDBE42C32ABC
 
 Secret = 74BF53754034B0DC
 Salt = 89
-OutputLen = 25
 Output = BDCADDFCCA599DBB24A2789DEAD088EEA633E8A15A03B65291
 
 Secret = F6B3A879AEE95C1604EF005F90D35EC4621F6BE5D52F65F1BF192FAD2D22C223D66B9C8454
 Salt = F89A58E89B
-OutputLen = 26
 Output = 9FA401DABDDEFE3B64702DB7395950A357CA32A501E43CF6DFFE
 
 Secret = 5C90E327068324D80B780A10646E01F1C57D4F67E2BF9322
 Salt = C13297
-OutputLen = 27
 Output = F95C1618F2F62B9EB4516E0AE68D38658183D30BF3B97B63BBAEB6
 
 Secret = F88AEB2006224184F1231BF42D63D2BA69C88ACD47C27996232EB2FCF04647E8D03308D6
 Salt = 55495A
-OutputLen = 28
 Output = A7666ACE2515FBF42334F21F48510174CD8944A7397EE0F0BF38262C
 
 Secret = B98B0026B2D40DD0827B58090D2698140A9CBB3B13F5
 Salt = C1AA
-OutputLen = 29
 Output = ECE9B1E55CCF257F2C7BA2B39BA852DB81FE9B32DD08130CB6041CB349
 
 Secret = F8BEF20480916E2762A77D00
 Salt = 1CE36F6EC8FE
-OutputLen = 30
 Output = 1102796B06234073DC6913318D65010A4F4C9E95358DACB3CE0D08857B28
 
 Secret = 80C9D5FD0C7BC1278F74975303D1F94600877754FCE3B8
 Salt = EA8332DE20
-OutputLen = 31
 Output = CFE56E573F2933E1728B3367F4EDAA797BE7C843B89250B98C4EB3BAF2E4D7
 
 Secret = 2EDB67D2CC64BF4B62
 Salt = 38D7ED2715EC6F
-OutputLen = 32
 Output = 52E44DB4B04F9792243508B969FF730779CB2A1EDF764324D11C14235B055D30
 
 Secret = 86D77225DB6E5EA176F5DAF433E4C2C804B24FB22F2747FC5D8978189842981F19
 Salt = 
-OutputLen = 33
 Output = 02BF3A2F5009054AF526E277EF6AB436BD8B7A53A3E4C2671F1E34556239F97453
 
 Secret = C73E664D445C0C60C59CEF54F10ACEAA456E6BFB
 Salt = F8C579F9
-OutputLen = 34
 Output = 4E984339A1FB20BD73894494B36CE8C1182BCB0D289BBAB3BBBD366B1DD061BB9E16
 
 Secret = 0651E961BA3374DE7248CE52EFC948809C20B8
 Salt = 43
-OutputLen = 35
 Output = 36AEC134DF567B1FBF448D0C56C6B62E40A375BDC74A2D44E415BCD105B48317145D95
 
 Secret = BF5BB2
 Salt = 159B4039D67403
-OutputLen = 36
 Output = 6F7533ABD09546770D6E71769A645B0D3BFA6D578B7B9B182D25CF8F8B4394C2BBDCECAE
 
 Secret = 64353C0E4D64C60C3F2FEBE1C6466E57FB28
 Salt = EF4AAB69
-OutputLen = 37
 Output = 7B80CD69345CBA9E46186372DD6602F2CB55496364CEEA96823110E28CAA68BB200F56F37F
 
 Secret = 6FD4C3C0F38E5C7A6F83E99CD9BD
 Salt = DBB986
-OutputLen = 38
 Output = 02AEB40A3D4B66FBA540F9D4B20006F2046E0F3A029DEAB201FC692B79EB27CEF7E16069046A