Add test vectors for RSA-KEM/KDF1

Adds test vectors for RSA-KEM with KDF1 from ISO 18033-2 and
test vectors for KDF1 and KDF2 generated with BouncyCastle.

2 files changed, 130 insertions, 3 deletions

diff --git a/src/tests/data/pubkey/rsa_kem.vec b/src/tests/data/pubkey/rsa_kem.vec
index a55523533..0ffb8a535 100644
--- a/src/tests/data/pubkey/rsa_kem.vec
+++ b/src/tests/data/pubkey/rsa_kem.vec
@@ -2,6 +2,15 @@
 # RSA-KEM tests vectors from ISO-18033-2
 # http://www.shoup.net/iso/std4.pdf
 
+# Test C.6.1
+E = 65537
+P = 74100103850091296168511028051948833436338123529747970640732238422269665602829
+Q = 79461607023043824134896992211543210236933205105414344240218914846895267687977
+R = 032E45326FA859A72EC235ACFF929B15D1372E30B207255F0611B8F785D764374152E0AC009E509E7BA30CD2F1778E113B64E135CF4E2292C75EFE5288EDFDA4
+C0 = 4603E5324CAB9CEF8365C817052D954D44447B1667099EDC69942D32CD594E4FFCF268AE3836E2C35744AAA53AE201FE499806B67DEDAA26BF72ECBD117A6FC0
+KDF = KDF1-18033(SHA-1)
+K = 5F8DE105B5E96B2E490DDECBD147DD1DEF7E3B8E0E6A26EB7B956CCB8B3BDC1CA975BC57C3989E8FBAD31A224655D800C46954840FF32052CDF0D640562BDFADFA263CFCCF3C52B29F2AF4A1869959BC77F854CF15BD7A25192985A842DBFF8E13EFEE5B7E7E55BBE4D389647C686A9A9AB3FB889B2D7767D3837EEA4E0A2F04
+
 # Test C.6.2
 E = 65537
 P = 74100103850091296168511028051948833436338123529747970640732238422269665602829
@@ -9,14 +18,131 @@ Q = 7946160702304382413489699221154321023693320510541434424021891484689526768797
 R = 032E45326FA859A72EC235ACFF929B15D1372E30B207255F0611B8F785D764374152E0AC009E509E7BA30CD2F1778E113B64E135CF4E2292C75EFE5288EDFDA4
 C0 = 4603E5324CAB9CEF8365C817052D954D44447B1667099EDC69942D32CD594E4FFCF268AE3836E2C35744AAA53AE201FE499806B67DEDAA26BF72ECBD117A6FC0
 KDF = KDF2(SHA-1)
-K = 0E6A26EB7B956CCB8B3BDC1CA975BC57C3989E8FBAD31A224655D800C46954840F
+K = 0E6A26EB7B956CCB8B3BDC1CA975BC57C3989E8FBAD31A224655D800C46954840FF32052CDF0D640562BDFADFA263CFCCF3C52B29F2AF4A1869959BC77F854CF15BD7A25192985A842DBFF8E13EFEE5B7E7E55BBE4D389647C686A9A9AB3FB889B2D7767D3837EEA4E0A2F04B53CA8F50FB31225C1BE2D0126C8C7A4753B0807
 
-# Test C.6.4
+# Test C.6.3
+E = 65537
+P = 74100103850091296168511028051948833436338123529747970640732238422269665602829
+Q = 79461607023043824134896992211543210236933205105414344240218914846895267687977
+R = 032E45326FA859A72EC235ACFF929B15D1372E30B207255F0611B8F785D764374152E0AC009E509E7BA30CD2F1778E113B64E135CF4E2292C75EFE5288EDFDA4
+C0 = 4603E5324CAB9CEF8365C817052D954D44447B1667099EDC69942D32CD594E4FFCF268AE3836E2C35744AAA53AE201FE499806B67DEDAA26BF72ECBD117A6FC0
+KDF = KDF1-18033(SHA-256)
+K = 09E2DECF2A6E1666C2F6071FF4298305E2643FD5
 
+# Test C.6.4
 E = 65537
 P = 74100103850091296168511028051948833436338123529747970640732238422269665602829
 Q = 79461607023043824134896992211543210236933205105414344240218914846895267687977
 R = 032E45326FA859A72EC235ACFF929B15D1372E30B207255F0611B8F785D764374152E0AC009E509E7BA30CD2F1778E113B64E135CF4E2292C75EFE5288EDFDA4
 C0 = 4603E5324CAB9CEF8365C817052D954D44447B1667099EDC69942D32CD594E4FFCF268AE3836E2C35744AAA53AE201FE499806B67DEDAA26BF72ECBD117A6FC0
 KDF = KDF2(SHA-256)
-K = 10a2403db42a8743cb989de86e668d168cbe6046
+K = 10A2403DB42A8743CB989DE86E668D168CBE6046
+
+
+# Test vectors generated with BouncyCastle 1.54
+
+#import java.math.BigInteger;
+#import java.security.SecureRandom;
+#
+#import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
+#import org.bouncycastle.crypto.digests.SHA1Digest;
+#import org.bouncycastle.crypto.digests.SHA256Digest;
+#import org.bouncycastle.crypto.digests.SHA512Digest;
+#import org.bouncycastle.crypto.engines.RSAEngine;
+#import org.bouncycastle.crypto.generators.KDF1BytesGenerator;
+#import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
+#import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
+#import org.bouncycastle.crypto.kems.RSAKeyEncapsulation;
+#import org.bouncycastle.crypto.params.KeyParameter;
+#import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
+#import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
+#import org.bouncycastle.crypto.CipherParameters;
+#import org.bouncycastle.crypto.InvalidCipherTextException;
+#import org.bouncycastle.util.encoders.Hex;
+#
+#public class RSA_KEM {
+#
+#	public static void main(String[] args) throws InvalidCipherTextException {
+#		// Generate RSA key pair
+#		RSAKeyPairGenerator        rsaGen = new RSAKeyPairGenerator();
+#		rsaGen.init(new RSAKeyGenerationParameters(BigInteger.valueOf(65537), new SecureRandom(), 2048, 5));
+#		AsymmetricCipherKeyPair    keys   = rsaGen.generateKeyPair();
+#
+#		// Set RSA-KEM parameters
+#		RSAKeyEncapsulation     kem;
+#		//KDF1BytesGenerator      kdf = new KDF1BytesGenerator(new SHA1Digest());
+#		KDF2BytesGenerator      kdf = new KDF2BytesGenerator(new SHA1Digest());
+#		SecureRandom            rnd = new SecureRandom();
+#		byte[]                  encKey = new byte[256];
+#		byte[]                  randElem = new byte[256];
+#		KeyParameter            sessKey;
+#
+#		// Run RSA-KEM
+#		kem = new RSAKeyEncapsulation(kdf, rnd);
+#
+#		kem.init(keys.getPublic());
+#		sessKey = (KeyParameter)kem.encrypt(encKey, 0, 256);
+#
+#		RSAEngine rsaEngine = new RSAEngine();
+#		rsaEngine.init(false, (CipherParameters) keys.getPrivate());
+#		randElem = rsaEngine.processBlock(encKey, 0, 256);
+#
+#		System.out.println("E = 65537");
+#		System.out.println("P = " + ((RSAPrivateCrtKeyParameters) keys.getPrivate()).getP());
+#		System.out.println("Q = " + ((RSAPrivateCrtKeyParameters) keys.getPrivate()).getQ());
+#		System.out.println("R = " + Hex.toHexString( randElem ).toUpperCase());
+#		System.out.println("C0 = " + Hex.toHexString( encKey ).toUpperCase());
+#		System.out.println("KDF = KDF2(SHA-1)");
+#		System.out.println("K = " + Hex.toHexString( sessKey.getKey() ).toUpperCase());
+#	}
+#
+#}
+
+
+E = 65537
+P = 164595018656847388234196458295155176106758058516345827114376462850563872821063372112958430530617671033588730874556123844100607371610222357044282210077745438573569464675422956060816242459751581224391340938674316979740379513584046730132237584210162428969621574895730609832661623255469386625333399495443111996269
+Q = 154815693339461674971201202928063553732348769555838450004553011845712199598612461913292296568174793540787763943903927157071815682359748526650950854481712029197298601776364230444684691118479599447186381098181319184319389074673921642098571884038579323293539363273392989580933234215294363547330708372978868708523
+R = 0E37156BA7E268DA28FA234531267352ACCBE1238096B46D1BCBFB9404309BF625A2EF0DFC7009DDD032A86BACCE46F105FCAF11E776D0CF8D5C8B6ACB2EA8A493D352C1394CCA37FE91A97A06758398F7C041BFAF0216B9DC9872223AE6031D995C15DCBE8DCEE7EC01FBDA1E485FAC4D3645C47617A03E941AFB0017A6BA48FB00F24F036A52029F0F032288AE9F010867C28C3FEE0A1289F2FC2302CEABC7C41441526BAB5F0B697A651C440B87752945944561471FBEEEC0E65F17B190F2C504B208674A9CDAF474FDF8F61371696105642E8FE700157C600E9E722200D371A5A177C98098F681632C1BFBC84DC7DFE8889E256DCDF8158277DF25B7ED28
+C0 = C03666B82F2E0076C9CF78056F3BE5549A2BD03349D0D52160C3D9C1C2B46FB4E65642B340EE73EE73D301CE8DB75A5CDF5B972011490758A1E0314E0E7E4B952A546FBA6EE8AA7370B6773D6E591D2561148FD049E571A5D8AEAF2BE9EA90F15FFE2736D62AC13BB6C2BA0FC993E7CD72FA890E50DBF27554D3BF7F1B913107F201C6D9EA3E56C53E5683C763C0E7E23F1CD416CBCAD7A6A688AB400CBC5D87B1D6DD3612E2615C87B398AE42B43FD5CEAF762033AC3860C38E96CEF3E5B1180C0EB5DE5D33138131A78D12B4E826ACE6BE2F1954CD56716D3BD7FE23C7187EE40E34BF5CD0F01B0F9A6DE390830EC71CB9021ADBCE5AE761E6A1439E157E01
+KDF = KDF1-18033(SHA-1)
+K = 2879A51427541B4CDAC3AD823C75FB2B4CF895BFC8F08DF4F1355CCE27C5A544B3701E91D4E6A8FB9FA7762168974202D6719DA117AB506386F6BAED09F1F8FB84620684AE4C962C05CE130D6BA770F1A54CA8C68CCEA59702DE33DDF456B0F34813CC8BFE6999C6086B5EE96122669EAF85FD427D6EC80250FB86D39AAEA752A57EDE4AD5802B709B536A42F1C9285BAA73884DA2E22204C0D60404DE70E24D03BBA5ED3A453782D0B49800EDCE562FE2793B6C9AA59881FB29992BDA65C67BF2625EBCBC66EE87F734C95DDFEC808EF6D44DD9682801F26D0F91F60F85F01A1A3D197CD13DFC2B174F4BE14CBB14A5946F8E22E9AC492472707DB684B85E0E
+
+E = 65537
+P = 165682553981176118532729182146905998679943181743603610826612411317699124590307661258927675906473733978600336684278647483508039146807670237361320224284884260137823150284470410159567305207616168401019780840936247120935592214517200106038748853738693679377569061489838937379549520603546589138787128041588064878139
+Q = 143206712570371537550995404277407237228050083266520061998580639832334534746420654502869922349173806485254421425144895914807064547119687982721578817558387859855456340407418648913018484932412203528851361523506272199499411641260838497681809120731343660418816310306493100346440107882636773330640419989066678161591
+R = 28129474639D1203418D213E86445D947F72CAB0D8E7A3C71B1CBA0CDF73374290CEA1ABE108E4E449030D1E2C6606DA563BD752E8541B5B6E450542CC77DBB0A48B7A336E8733D1294DD656B39D8093A20DE7756F919BDBDFCE659AD4067FC25157282CC278ECABAA203831CA341189E4EAEA006703CF08F9A1C03ABC5A4FA92D40ECEF8CE50D4F2F26CCDC73628BBE7434B2726FEC43DAA57E84B506BDB5B656E2D955D679B250DD4B3338F6AA1987F8583963F714D42D7D44C5AAA6ACF0167880FD429C7F675C92FEFD372DFB49856F1D56F975D15C5DA34A9934A9BF5F07B4C3FEC7B5D28BB9B84C0F56DC699AE9B41E6BBD01AD1AA716FD5D8865231325
+C0 = 1581A71B5411C07F1062F6C1336C5A36D2444635CB8F054DDFCEAC9DB1A0669C8E39305ADA0592D11950BEC110E864909102E43F83898D24D27F8537938AD0F9C944F263128DD43A34983D87546642494E1E9CBD2439D9F1BF4B82553C7442F59CC6D98FF37BCA1734F2041F448781B98E50C7B00CD6156A0BE94C54558B1B70CF56D525FEFBAB6791EE4DA16702D55A6E1A29E3C0F63197AB9C8C0F7A1678F786AF06D35E411044FCCFB5DEFD231BA565DA4E53AEEECA5A73A2A51FCC31504AA0F532B9EC9D9CF9DBD2B2F292EB628F698C407E8144365ABE978F746944E195E2CB0DDAD492F2DAD02C8ED4DAB0BC238902991C873E3DAB6F942627F35EDF5B
+KDF = KDF2(SHA-1)
+K = C5A2D782FE1C4214AB97F236A798AD36B64B0C8409AE3FBC59410DED70093FB4F7BC38B94E2678BC053D9735E09E6202CD477C74B101800673606C8C1F0A929CA3B1E34539DD7DFDEB800B42CF3DD6C14256C153682E9F84731B8261A8F45C2A6D2DAB0998BA7D3DBB29135612941B4A4585DBEF739A96DEFCD2B74CAF01A5E0909097B6DA509CD6943E89092E68D28A680CEF9C66D3CE9FE21361D29A555A9512A9C2E41C9D544286D4D4410CC88BB2A10E482DE0D4E6B315FF59C89DD10E94D627551409034786E6A2D208131F373B65109B243D470AF4CFC6A553899CAA3155A2175AE8839A4F055EDAECA1BC2684F939DCEC78EDF7FB732D7846B3A18625
+
+E = 65537
+P = 179755607498698915156472312052390412374888590078375696682532716957195195099259588363411397567713254275286890726691187860893111162737997682002393982240049851937818640585805951138169144697989793856350446557625052761041597980829377580837366042983675457609703917876740065059607053414664192851238580007259316720001
+Q = 148719184858104886900273938140975358813632106139149548242878818497931617501707960253163319706085166733518552164915488661596182276698642829123689633530834640799438040580668970280384710610904953557835073384753529961289979742647223109396909547559071386644256344079306844126126599542442383558280600414522015893031
+R = 3EE2CB0B6F63517F3CF563DFD42996FF6AAEA37C2C0DC534A394A5D993B4E5CDA2DBD3BB775BADEBFF1395F07D3C8EAA9E48B826350966613493FEDFC713CD7ED56D67619E01C87B7F077F463DD786A54AB94D69A7F4A0E2A1FAE9AA6EF3BEB65072752129FD50E69C7C83EF24185D0F6ADD80010A48C8209DB8F623D32758AC839CCFDF5FC9D21B300422C3D259E6BC93EADFFBDCD00233AD9A599852DCBB511C3553C56CD70638C208FAF37D1EF166F8578C6FD9989A1CB6CB2FD02A1D3678A955F17E8F9E3F102B04F809EB51AC2CE2F44DD71E6E92435BCDF0B390689634068D17FA5AB4ACCBDCC836543256557F5BEF58DF0FF610ABBAABA5303FAE786C
+C0 = 3F2F160FA19409E3053626B32D1C2404A01A036C05933E2C698FF22584CCC85FB07E022A346D229084F9C4DB15B17C6ACB2FC7B987D1ED0E276525113856A6A2924EF4ACC9094AFD0B27814CF3003964D3A2ED6BF9E2C1259DBB3866E8CC6459223B059B52F826CAC8FF8639522D1B96891033637A351236ABB4090F8436FDD57E5EDAD304E1910E31E2D4141CB418507256A5D4DDCBCBF460BB7331A54CE595900A7D4FE8BACCECEDCB7285250A6294EF6E6A1B1D07D5B22B5DE495A081404DC610F422066B328A200314F5E4061D772FDFF8754FFD843375BB83F19CA5D92B057556F9C90F288008E4A493AFB48098E5BF16A0566C7E7C6AEC8CFDD2993DFA
+KDF = KDF1-18033(SHA-256)
+K = EB904FC37892E8154D04243A85B4B4ECAAA57C4CBF270DABAC718FF187AA0850E0F2E7E0BDA0DE2F906669C4735F236CBC4B8B295757C92A76FCCD7E19B66B18416642B63477978DD21950520CDE6982AABAFFDF311C9D9D666841297FC6EBAAD1A303DBCD9342D524A860FBD9459921A2ABD9C7A7A76C5976FD825D1F190750BC9AF86E93A710BD1F6423B24949F74DD3D47055ED7AC2FE0731B95A1F6CF800DC6B01FAED1FBCFBF7739681A091BD71FF348DA6F873AEDF74DC78BC51E0BC12A7D961467349ADAA903B377439DA8B89B59D1AEAC218171DAC7D0161652876840E83ED257E7F442720C7A95C789C3BF71491ED9FD614C2F8361449DC828989F6
+
+E = 65537
+P = 174046890283469981585949748084588782939194923413091656190673083567523094911170964227361574020858404084585662363904510122441927570563481403504090513712717690123363848523867890907908094889910522763278946428974722067709246573085561453779287668510821777191086478423606338468569126373720116453187524405485772061839
+Q = 159886943456237230511782182155135817897256893518822406366694405173420983366707947079250785226814562408785742924747520534652016503484243119104833754434242033432495210989066912519012696876909415983027430528396497006208411998289498383728139997758102585880193256248894236292500748201796836402007794726533935272231
+R = B4CC3C096FE80BF1E684AF845BFC800D062C150008FEAD3BE59EFA151CF17396CFB3D46BBC92E0CEDEE58430C6D2C44B58A9C2A03C2A5CFAAF46BF1F8D1DF41A5371C04060688448DFBCA47D3A15B3C385283427ECCEFEE78C66491DC6760A2F455DB153C26738985841A47049458CD4753A1EC48519030B6436A48A68E8534981DAB1AB0431DC4A7CF587D09EFAD13406C51C74D5CE8D66525791A2D8A916908F691CBC7CDA5205C2D63B7CAD7FD2144D2DBFEF8D8078F87CD26A6F4E5AAEA16E5FF5EADB0D9D4F9CF5C66BF9B433499B69CF2857EDD03600253305E7D2FF94C3E2A8083B423484781E7A05229A58AC07911811104EB8DD0336FA576F5A8B35
+C0 = 49913BF2D62222EAAE1DB7F864879777BF4692D9FD37403F7507825ED715E87DF6D635170A4F55045B02B3464AF353B7E2E601640F44E280B1E19E158785C24BFB9762A5BB8FB00809990CB9E4F1771F1E522A89EFF67659CB8916B1393E19909C480EF38C22A3170C28C0C4EC60C1CEBA00FD740B3AE3AE7DFBBE142D251F4E985B95C37A1516840F2B942D18F2A0E652226617D46C4629419DC46413CF0D084AF8E02B011B2C12996187EB0550918F9AAEA2572A0D57E5DD2A115E51B9826F7B4C3D55A68F97F97F69800577104BA96AF2D6BA5093A614299F0D9DB12B9787D30F78958EFB5351E4C947A6C5B7C1A6575A6DDA273067FC6775DC421BE36F5D
+KDF = KDF2(SHA-256)
+K = 428A41D3DD6616E53FA74F810419051EBDF681B3714CA3F26170C78E17101B5C539FD6B02446EA3F7E3F4C769A0FC8960DEACB10FECF7AC1F4EEE2FDD0BFF8E84ECF02E7137C53C9B003DA9AAC897A6BC53590013037497C78C76FFA6DE9F663023430DCAA9BBFDBECDF040CB6A53233517604CF130F27BC3D6071160A4F3C7BF3025B391B75BCE68978D22530047C88210EC3B7D5C70B818EFB918E9BE81A4DD4E43C3C2234A0EF04840DB4092FAEFE6B216DA7E153B8D3306583FB2605635FC7EA829D28C78DFA6A268F83FF0C7413203C8E4D0BD6804A81C6E89B7D6CA75128BCB08CB6034FBDCCFA21120A03419568588842C76E020A0421A8A87E64251B
+
+E = 65537
+P = 146322265547229421453860780971902143051303041033416042645882020825094157913878642939804253448552439940923642759323031670253155786844025280534330614230541220963959783346500062839405049709904412394986928442891456821174158709683716293283651651769705737708866705750158297813695995634661647418391504788057547514647
+Q = 129767039082616161544399761373644746030229222410917829012071323664225125630516983958202525186512259379284360095733938992803044795665548845422328358269410402137832225443746550997158014332624820747790487469585420099915597895802412802364656829129766039650228465555912059986552091776600128100526678441920008253431
+R = 0A7DDB169851D28F0A0A330F283AB8DD63FF201668B17AB9138E4BE781D7963376A2E242C30664182422338704FAE793C8E474577EEF7382AD46635157840DFF73D0E72FB3F248F5C79EEFA759379D3CC49EEB8B4755EFFA61905A8FE6C0A20A6791D5DBB56DF9D974B9EFE0AF7804092D80FAC58F37CAD6367AB5BC3C183998DC582CF2DF7115592A23E58E1C40FD0CA76E6C3EF2620B4A4451FBF0379305E6333B18C95FA97C88F0AE985D2F091F2B0359000EDD5A67356BFCCE6B89ACC38F99035628A9D8FC946C13399D9813650ACB2C672C01B43FAD68785063A74FCE2B134050606B92ABE1E1C00685FE2C3E781F458C525E017BBAB8C3FEE99E4C78E9
+C0 = 40B5857B61D2A93B5CF161082FD038411A66F050D67E7F5311259558F5C39E2A28B4A11EB589751604E6DC7C1BEB202AF36DDE8E989C7D417FB57B463992A87DBF6156B6D6CB1859192BF24880DFDFF029B59E89E1880D02FE034F5FF7A6EB261D246BA01EA99ACFAA63891D8D407696AF6BFDEF8E8ADA674B64240B9DA8158D8702CED3B1C53CE8873A211846C78731E1749FFDCEBE7A82C06FB29D9120C1BB010356D4706A0CA63278D54F1A4B4AF2235A960376ADBFE1009569F47BA0A238356137B48C898256117F5649DA7CD3B37E07146BE20503FCBBB7B56936F55E644274DB8FB223EB742F6571C0F138BF7D47D7B22B74840F7C25D6303EE509ED90
+KDF = KDF1-18033(SHA-512)
+K = A7578BFE83F5DFC954AA77B1500223ADAE95732FE4E0F9A113BAA64FDCB9B6DB90FD0F5FC368A03260F6E6D9B7A09690CC3CDA377DF6F610305ED5B1081DF74FF652624969959528610D7213673B1DEE617ECFAEA5C2B90A51041AAE90C3776BE3BAF8C34F3E3C6697BD68C0E30CCF2017C3D1BAE437FE3986F24CE169FC45C5A66D77EE3907F3DB528DBD1130B50E5057ECD6FF0AF0A60B0014D530893C86E09E6A648BC90FEB05C25F2CCD5E86C7528592FF327EDBA50B24B70962C9A3452C95A112422DB2AABA0CEA6975C618B416D5BA9839F07EC6EBE546FDE124E3711444E163C3FC35E3C556225DB8D4609D82A464F8A25B947FBE07BB33AB68CCE7E2
+
+E = 65537
+P = 173466727612170665053230974561284992669615075850373117935328353815057776125036931883590530932574436808197614319625448483719789159280294890998552972249170781694144018291911167398959048875645193355003315200680151736397370782143501256220377331633473554658664634675386428423257172040331555908065971198679611755071
+Q = 147514752710875817505922751816319995058312482129669054703409146925442819936600608407673355354605646058684922838932503269856024866278652403898079964020914797278930030920509188075473372339780176843394194955659795410885348609060042900468496002515833355095851932369334931994425808408373828494286063225583413423723
+R = 5148AC6B207F40FF0C045F542B69D66DB95FAFAA8BFF49C586662300106FBBF820D2C419C9BEEB826D3C3EF1E67036A448BB5B95F0EB4B50371AB511638AB7FABA8ECC386E9E5BB54645CE111F45CA78E4188BE7B892FDC01D04E92D89709ED4F19A8C4226C929BF150D8C9E4AA1B9FF15A515A248467E2220F9FC1A04414344299C5A6FCC08212E1613F6E67337B9CC972A0D5321F387E6803C702FCEF97FDB160C828524D22FDF78C1B5DF05393EBE29100A5826780D28E2F868139D97D43F6D5CAC4762125796043C8680171F2F1E58B286052350FEAF221371EAB7E24C5AD9F7EE1E9C722CC26963BC51D2C39688E987C2BC0407E33FAB1EF191322C4E24
+C0 = 20BF68E7E981F3BA049692825770D1A98F2E64A5676207AC292E0287B7654315CDCD18791F2A68AF1AFAB550D4BE19345F0B22B693C90C79A4C88D46AAEE16A0D60A8B7520F8D80258B35C60B331F927A0E5045AD537116E77F887431966BE730505B951A81D34C34D5FBEB22D1A498C917C4648173EB5EC884848CBE01C3294C3C32EA6219A5E7B11BD53D4FC25B27A9F980B3E41022B4ABA0F92EE0A7B005F8D64229CCF0B44FCC21DBF64AEC354FB8F2140BD25AFD5FC9AED9EC7E53356CDBBCB556757BFAB594A5A13BAC870079F902AC310CAED87E57542DFBD0D9DE554B19DFB37FE04B7912B263C08B089E3A0EFD4DFA5E88995873C581553F3FB98A5
+KDF = KDF2(SHA-512)
+K = 487A8CDECF57A062E9FCFDCC2EB966296DE5874CEB725D15A17EAB2E55F622BA01E3863D7A8023D84BF043FC067F0710DFF710C0E7E4BAA78383894975050A43AAE975A755657828EA7B421E2E131A50CD43908AE9D8B7C3215BF6592F93D4D3DB0E15583DCBF91AB3DC300C73319DDF273D6B3169B4B0F8E1209361C7191B3D455D52C7D1E94B2721CC8A3BFD22301757B04676B192342643995D940E3C8D393A8A2D0A6F20D3DCDF112B9DDE4AB2D094BA2E696D23BD4C0BFD97623FC1F950D8B9CE7686AE70C5E0598DB6CFEDD7AE5370BF152B26DC5AFAC08DD97D4F8BA358D08E6D430B458B11DB4278F8C84DE7A09C2882CD7AE0C36F1EF13F7C6DFB95
diff --git a/src/tests/test_pubkey.cpp b/src/tests/test_pubkey.cpp
index 2f6de639d..cdd0c99b0 100644
--- a/src/tests/test_pubkey.cpp
+++ b/src/tests/test_pubkey.cpp
@@ -276,6 +276,7 @@ Test::Result PK_KEM_Test::run_one_test(const std::string&, const VarMap& vars)
       }
    catch(Botan::Lookup_Error&)
       {
+      result.test_note("Skipping due to missing KDF: " + kdf);
       return result;
       }