#
#
# rename "tests/--no-workspace"
#     to "tests/_--no-workspace"
# 
# patch "Makefile.am"
#  from [32daafd4f09fdd8cee6b82c58518f5d9665bf904]
#    to [99d211f3a07989d2ae8b6fa5e0a0a9b3f2704e11]
# 
# patch "botan/primes.cpp"
#  from [d3f6a25e1bb8734a71e24c6df0a35e7d66ddce55]
#    to [c5d73dc8e6ad1a78f64b795008a7d9540c0eb3ef]
#
============================================================
--- Makefile.am	32daafd4f09fdd8cee6b82c58518f5d9665bf904
+++ Makefile.am	99d211f3a07989d2ae8b6fa5e0a0a9b3f2704e11
@@ -125,8 +125,8 @@ BOTAN_SOURCES = 							\
 	botan/dsa_gen.cpp botan/eax.cpp botan/ecb.cpp botan/eme1.cpp	\
 	botan/eme_pkcs.cpp botan/emsa1.cpp botan/emsa2.cpp		\
 	botan/emsa3.cpp botan/emsa4.cpp botan/emsa_raw.cpp		\
-	botan/eng_base.cpp botan/engine.cpp botan/es_dev.cpp		\
-	botan/es_egd.cpp botan/exceptn.cpp botan/filter.cpp		\
+	botan/eng_base.cpp botan/engine.cpp 		\
+	botan/exceptn.cpp botan/filter.cpp		\
 	botan/filters.cpp botan/get_algo.cpp botan/get_enc.cpp		\
 	botan/get_pbe.cpp botan/hash_id.cpp botan/hex.cpp		\
 	botan/hmac.cpp botan/if_algo.cpp botan/init_def.cpp		\
@@ -451,6 +451,7 @@ else
   libplatform_a_SOURCES += $(UNIX_PLATFORM_SOURCES)
   mtn_SOURCES += unix/main.cc
   lib3rdparty_a_SOURCES += botan/es_dev.cpp
+  lib3rdparty_a_SOURCES += botan/es_egd.cpp
   tester_SOURCES += unix/tester-plaf.cc
   check_net_SOURCES = unix/tester-check-net.c
 endif
============================================================
--- botan/primes.cpp	d3f6a25e1bb8734a71e24c6df0a35e7d66ddce55
+++ botan/primes.cpp	c5d73dc8e6ad1a78f64b795008a7d9540c0eb3ef
@@ -605,70 +605,70 @@ const u64bit PRIME_PRODUCTS[PRIME_PRODUC
 65437, 65447, 65449, 65479, 65497, 65519, 65521, 0 };
 
 const u64bit PRIME_PRODUCTS[PRIME_PRODUCTS_TABLE_SIZE] = {
-0xFF658BDE2F2A43DF, 0xFEEB94CD535119ED, 0xFA921839EC24DDD5, 0xFDDA766C77E1E605,
-0xFF3024B0EB4EE333, 0xFEEE350BBC92F4DF, 0xFFC724B7D011D01B, 0xFEED34B826C33B05,
-0xFE69D8DE3F85C6E3, 0xFE3B48909250918F, 0xFF8EC0CE9C632429, 0xFFD92A5C78226D6B,
-0xFFB4BFB0C65133CF, 0xFE77113704902C57, 0xFF8A21D222EA81FD, 0xFEDA1299661CF5AB,
-0xFF4CE86187737D0D, 0xFFD26443A07F519D, 0xFFA817B7191D7967, 0xFF00EDC142868873,
-0xFFB9C6D7F7A239B7, 0xFFE76D3481E98E39, 0xFF76D5432584120D, 0xFFAA499F071EC705,
-0xFEB5198F05722E59, 0xFF7E0431CA41107F, 0xFFCFD52FEDDC928F, 0xFE0EA42537BC6ABF,
-0xFF64937896876925, 0xFC6FC87E811607D3, 0xFFBF600E6CDD0F4F, 0xFF022700FE658243,
-0xFF2E21166779D6B9, 0xFFC224624C665C33, 0xFF1372F41FF177AD, 0xFF31E57E972D0C13,
-0xFFA891F866404D23, 0xFF7BF13EF716E9A3, 0xFE51CAFD9466E733, 0xFDA1CF55F6D6336F,
-0xFFAF6C040ED0950F, 0xFFAA1725F40BA269, 0xFEC593BC3570BEEB, 0xFEE05B35B426F413,
-0xFFCA5209A08890F9, 0xFFED8AF70EB0CC89, 0xFF3F98E3E27860A5, 0xFF92FECD017FF9F7,
-0xFEFA655B2609018F, 0xFFFC51D15AAC7B77, 0xFEF5007E71420DB1, 0xFFEC4784141332D1,
-0xFE8384ED4E1D21CD, 0xFFD3FF614D3ECC47, 0xFFDE5166FD540313, 0xFF5320ECED04B26F,
-0xFF223980F122FF75, 0xFF19C1F27CB1B4A5, 0xFF0F1DFC9DA9523B, 0xFF82DE7B387F5427,
-0xFF9A026BA87314E3, 0xFFAC7FF3ACE64E77, 0xFF808EB2FD5873C3, 0xFE983ED5BB363301,
-0xFF714856DB2CFE95, 0xFF84E1510CF3EB9F, 0xFF29D04C1DA0B115, 0xFFBCF3BF9433552F,
-0xFF32203D58A4C473, 0xFFF00910A15021C3, 0xFDE93041F28240AD, 0xFFC518BCD81C03C5,
-0xFEF504CD8BB9CBDD, 0xFEB8FFBFFF116A6B, 0xFF7642E0785ADA23, 0xFFECF068800FD50D,
-0xFFD703577CA247A7, 0xFF54C0ECAD2C9691, 0xFFC031706B8C72F5, 0xFFE59E5CA58BBDF5,
-0xFFF31FAFFD3B331D, 0xFF64DDF32349FF6D, 0xFFE38309D0BD4A51, 0xFF8C934F76B3C737,
-0xFFDC80B4BAEAFC1F, 0xFFCC1FE4C856FBD9, 0xFFDB5976DDF601FD, 0xFFD3DD25F424433D,
-0xFFC00FA367E746C7, 0xFFE08BF011CC854F, 0xFFC3F21982468F6D, 0xFFDA6C52478A76DF,
-0xFFC67D95AADED363, 0xFFD605D18C3AFC65, 0xFFE828C9D698F1DF, 0xFFBE5098D83B7737,
-0xFF79EB34474ABFB9, 0xFFD27AEED0786363, 0xFFD0FE27B77C271F, 0xFFFBB6563BD065EF,
-0xFFF3638F8635E1EB, 0xFFBE862C22C9F065, 0xFF44712D8488A01D, 0xFF7EEC97F9913111,
-0xFFC23CC78CB12AB1, 0xFFF390FE85F81D3D, 0xFFE8EA21A0FB9931, 0xFFB9D42D17A93385,
-0xFFCDB63AB21E904D, 0xFF5EB7F2210D33DF, 0xFFE6F6C7BB60C9DF, 0xFFAD4CA8DC26D699,
-0xFF7BE75BD21DCA51, 0xFEF89CE23CB61789, 0xFF40ECA3CCA22CE5, 0xF52BDF080F7ABA6F,
-0xEC8F38C8B28E0493, 0xE68E732A2ABED62F, 0xE21A13779E0CCDC7, 0xD823C075C325191B,
-0xD1B284C91EED248B, 0xCBA5A08068E8C1F7, 0xC483EE5A2228985D, 0xBCAEE9F787AC75EB,
-0xB782DAB1B77D3E09, 0xB0D77226F15E387B, 0xAA2A8727D47941CD, 0xA4A45682E9CE533D,
-0x9CAF15AF4CE7FCF7, 0x94C051DD15537305, 0x9006D2FBD933A297, 0x8C4DED05F19B7399,
-0x884FD7A270AD1B1B, 0x83C687D33F238D4B, 0xFF62E2BAE50C6C16, 0x7A59E1FD9D203DBB,
-0x764F1DC07B0E442D, 0x72732FE1F2023153, 0x6E373B550764872F, 0x680FFFD267C5F3FF,
-0x6206BFEC14F1CFC5, 0x5FA6F70CFD587265, 0x5CC7A1B4F6DF9823, 0x599291B29311407F,
-0xFF3CEBD359B67EF9, 0x51C573C14F289F6D, 0x4FA265B31B73C6DF, 0x4B3154ACBD077DED,
-0x4785C96B29A1E437, 0x451F887F646CF763, 0x429DC254C5490571, 0x408410840EAE2883,
-0x3E12CC83606624F3, 0x3A70D774B821DA71, 0x37A21449A196A825, 0x34C5D056E2278B81,
-0xFA0C6CAB29D8E297, 0x2FA5AEC982A5972B, 0x2D6831749426068F, 0x2B7F876418155CA7,
-0x2A1B897ED2AB433D, 0x28C9430D0F92132F, 0x26DF879EBF12E103, 0xFD2FAB4CA364D43B,
-0x22B5B4FC40D4C35F, 0x209298AA84D7E6A1, 0x1ED4B9F11445F1E7, 0x1DC6D2DD416CC91D,
-0x1C1517A52E37C3EF, 0x1A808916125AEF2F, 0x197A2FB2938FF13D, 0x1814AA6C087B561D,
-0xFB3B173E72947609, 0x1571187A8E3D4D6B, 0x13D306D29263C139, 0xF8AEC6ADA137E865,
-0x123EA204BAB48731, 0x11012099D202F297, 0x10290E15797C21BD, 0x0F3AB38E679D6317,
-0xF50B5505D593FCF9, 0xFF23754F7F2052B5, 0x0CC52D96BC2E5A2D, 0x0BF80EAD87B228E5,
-0x0B59A623082C9171, 0xF44E28B9221A433B, 0x09DB5CDD2505EABD, 0x09638C123BCAB351,
-0xFDB9AE6935254CD3, 0xFFE30D7E4F02F163, 0x07CF1FC053B9C61F, 0x0789244FF1705821,
-0x06FBD05649B0B9C7, 0xEF9713EC6A0C250B, 0xF47691AD6AA9F0DB, 0xF2A8EB02CB08CA51,
-0xF9559D40380A20E1, 0x04E15138A5B9BF43, 0xEECD739EA48F3ABB, 0xF76E7E7530574E79,
-0xF8393D2E42D7D277, 0xF666F9AD3A16D173, 0xF403C629749F3ED5, 0xFBD7EC45F220A473,
-0xFA8AFF7491B234FD, 0xFF471CE534D1F537, 0xF4BEBFDD9C54CEC9, 0xDD04722310A6CE9D,
-0xFD8071236214FA05, 0xFBCA07B399A482DD, 0xFD9642C104864C17, 0xFA525105AADEFA39,
-0xF71122156406E645, 0xFF415FDFD1247539, 0xFB709936F52446AF, 0xFF7734CCB806CDA7,
-0xF801E9A88CD3D70D, 0xFC0C00AC9BCC5491, 0xFF462CD8E52ED221, 0xFC97426300FCE331,
-0xFEB3049C5E37A059, 0xFFFC8AB1E05051CD, 0xFE5F4621F2D9FE63, 0xFE931DB54FC5D521,
-0xFFDE43D960FE42A5, 0xFFDBFAD1B802BDB5, 0xFF23C485F6B7BF53, 0xFFC98F169C8DF21B,
-0xF1609D0E2E564D01, 0xCB10B976C333834B, 0x9B52037A38DAB8F9, 0x800E88FF5E929095,
-0x55A9AD1C21F5E173, 0x3D1A64E4E555D699, 0x2A5D1D73694F7B93, 0x198F4260D8807623,
-0x140D45BB525C35EB, 0x102F4743FF914EEB, 0x0CB114936A734FBF, 0x096D97150B7B0A71,
-0x06F06B90B850C2E5, 0x053B17A0D7F7386B, 0xE3AD1CE3C82FE6A5, 0xDAE968B4B710E857,
-0xFA2DC15B2C96BE77, 0xF1FF5F22AF135BD9, 0xFC65C5CAAA878A13, 0xFB9427EB08CF9C11,
-0xCCB12B6FEBFE285D, 0x5BAADA462B48F999, 0x2E53167EC64B703B, 0x1264ED670CD61961,
-0x071F216A9AB74E2D, 0xEE26503C1266CE55, 0x4C6004C7E404E4B5, 0xCB649E41ECE95F85
+0xFF658BDE2F2A43DFLL, 0xFEEB94CD535119EDLL, 0xFA921839EC24DDD5LL, 0xFDDA766C77E1E605LL,
+0xFF3024B0EB4EE333LL, 0xFEEE350BBC92F4DFLL, 0xFFC724B7D011D01BLL, 0xFEED34B826C33B05LL,
+0xFE69D8DE3F85C6E3LL, 0xFE3B48909250918FLL, 0xFF8EC0CE9C632429LL, 0xFFD92A5C78226D6BLL,
+0xFFB4BFB0C65133CFLL, 0xFE77113704902C57LL, 0xFF8A21D222EA81FDLL, 0xFEDA1299661CF5ABLL,
+0xFF4CE86187737D0DLL, 0xFFD26443A07F519DLL, 0xFFA817B7191D7967LL, 0xFF00EDC142868873LL,
+0xFFB9C6D7F7A239B7LL, 0xFFE76D3481E98E39LL, 0xFF76D5432584120DLL, 0xFFAA499F071EC705LL,
+0xFEB5198F05722E59LL, 0xFF7E0431CA41107FLL, 0xFFCFD52FEDDC928FLL, 0xFE0EA42537BC6ABFLL,
+0xFF64937896876925LL, 0xFC6FC87E811607D3LL, 0xFFBF600E6CDD0F4FLL, 0xFF022700FE658243LL,
+0xFF2E21166779D6B9LL, 0xFFC224624C665C33LL, 0xFF1372F41FF177ADLL, 0xFF31E57E972D0C13LL,
+0xFFA891F866404D23LL, 0xFF7BF13EF716E9A3LL, 0xFE51CAFD9466E733LL, 0xFDA1CF55F6D6336FLL,
+0xFFAF6C040ED0950FLL, 0xFFAA1725F40BA269LL, 0xFEC593BC3570BEEBLL, 0xFEE05B35B426F413LL,
+0xFFCA5209A08890F9LL, 0xFFED8AF70EB0CC89LL, 0xFF3F98E3E27860A5LL, 0xFF92FECD017FF9F7LL,
+0xFEFA655B2609018FLL, 0xFFFC51D15AAC7B77LL, 0xFEF5007E71420DB1LL, 0xFFEC4784141332D1LL,
+0xFE8384ED4E1D21CDLL, 0xFFD3FF614D3ECC47LL, 0xFFDE5166FD540313LL, 0xFF5320ECED04B26FLL,
+0xFF223980F122FF75LL, 0xFF19C1F27CB1B4A5LL, 0xFF0F1DFC9DA9523BLL, 0xFF82DE7B387F5427LL,
+0xFF9A026BA87314E3LL, 0xFFAC7FF3ACE64E77LL, 0xFF808EB2FD5873C3LL, 0xFE983ED5BB363301LL,
+0xFF714856DB2CFE95LL, 0xFF84E1510CF3EB9FLL, 0xFF29D04C1DA0B115LL, 0xFFBCF3BF9433552FLL,
+0xFF32203D58A4C473LL, 0xFFF00910A15021C3LL, 0xFDE93041F28240ADLL, 0xFFC518BCD81C03C5LL,
+0xFEF504CD8BB9CBDDLL, 0xFEB8FFBFFF116A6BLL, 0xFF7642E0785ADA23LL, 0xFFECF068800FD50DLL,
+0xFFD703577CA247A7LL, 0xFF54C0ECAD2C9691LL, 0xFFC031706B8C72F5LL, 0xFFE59E5CA58BBDF5LL,
+0xFFF31FAFFD3B331DLL, 0xFF64DDF32349FF6DLL, 0xFFE38309D0BD4A51LL, 0xFF8C934F76B3C737LL,
+0xFFDC80B4BAEAFC1FLL, 0xFFCC1FE4C856FBD9LL, 0xFFDB5976DDF601FDLL, 0xFFD3DD25F424433DLL,
+0xFFC00FA367E746C7LL, 0xFFE08BF011CC854FLL, 0xFFC3F21982468F6DLL, 0xFFDA6C52478A76DFLL,
+0xFFC67D95AADED363LL, 0xFFD605D18C3AFC65LL, 0xFFE828C9D698F1DFLL, 0xFFBE5098D83B7737LL,
+0xFF79EB34474ABFB9LL, 0xFFD27AEED0786363LL, 0xFFD0FE27B77C271FLL, 0xFFFBB6563BD065EFLL,
+0xFFF3638F8635E1EBLL, 0xFFBE862C22C9F065LL, 0xFF44712D8488A01DLL, 0xFF7EEC97F9913111LL,
+0xFFC23CC78CB12AB1LL, 0xFFF390FE85F81D3DLL, 0xFFE8EA21A0FB9931LL, 0xFFB9D42D17A93385LL,
+0xFFCDB63AB21E904DLL, 0xFF5EB7F2210D33DFLL, 0xFFE6F6C7BB60C9DFLL, 0xFFAD4CA8DC26D699LL,
+0xFF7BE75BD21DCA51LL, 0xFEF89CE23CB61789LL, 0xFF40ECA3CCA22CE5LL, 0xF52BDF080F7ABA6FLL,
+0xEC8F38C8B28E0493LL, 0xE68E732A2ABED62FLL, 0xE21A13779E0CCDC7LL, 0xD823C075C325191BLL,
+0xD1B284C91EED248BLL, 0xCBA5A08068E8C1F7LL, 0xC483EE5A2228985DLL, 0xBCAEE9F787AC75EBLL,
+0xB782DAB1B77D3E09LL, 0xB0D77226F15E387BLL, 0xAA2A8727D47941CDLL, 0xA4A45682E9CE533DLL,
+0x9CAF15AF4CE7FCF7LL, 0x94C051DD15537305LL, 0x9006D2FBD933A297LL, 0x8C4DED05F19B7399LL,
+0x884FD7A270AD1B1BLL, 0x83C687D33F238D4BLL, 0xFF62E2BAE50C6C16LL, 0x7A59E1FD9D203DBBLL,
+0x764F1DC07B0E442DLL, 0x72732FE1F2023153LL, 0x6E373B550764872FLL, 0x680FFFD267C5F3FFLL,
+0x6206BFEC14F1CFC5LL, 0x5FA6F70CFD587265LL, 0x5CC7A1B4F6DF9823LL, 0x599291B29311407FLL,
+0xFF3CEBD359B67EF9LL, 0x51C573C14F289F6DLL, 0x4FA265B31B73C6DFLL, 0x4B3154ACBD077DEDLL,
+0x4785C96B29A1E437LL, 0x451F887F646CF763LL, 0x429DC254C5490571LL, 0x408410840EAE2883LL,
+0x3E12CC83606624F3LL, 0x3A70D774B821DA71LL, 0x37A21449A196A825LL, 0x34C5D056E2278B81LL,
+0xFA0C6CAB29D8E297LL, 0x2FA5AEC982A5972BLL, 0x2D6831749426068FLL, 0x2B7F876418155CA7LL,
+0x2A1B897ED2AB433DLL, 0x28C9430D0F92132FLL, 0x26DF879EBF12E103LL, 0xFD2FAB4CA364D43BLL,
+0x22B5B4FC40D4C35FLL, 0x209298AA84D7E6A1LL, 0x1ED4B9F11445F1E7LL, 0x1DC6D2DD416CC91DLL,
+0x1C1517A52E37C3EFLL, 0x1A808916125AEF2FLL, 0x197A2FB2938FF13DLL, 0x1814AA6C087B561DLL,
+0xFB3B173E72947609LL, 0x1571187A8E3D4D6BLL, 0x13D306D29263C139LL, 0xF8AEC6ADA137E865LL,
+0x123EA204BAB48731LL, 0x11012099D202F297LL, 0x10290E15797C21BDLL, 0x0F3AB38E679D6317LL,
+0xF50B5505D593FCF9LL, 0xFF23754F7F2052B5LL, 0x0CC52D96BC2E5A2DLL, 0x0BF80EAD87B228E5LL,
+0x0B59A623082C9171LL, 0xF44E28B9221A433BLL, 0x09DB5CDD2505EABDLL, 0x09638C123BCAB351LL,
+0xFDB9AE6935254CD3LL, 0xFFE30D7E4F02F163LL, 0x07CF1FC053B9C61FLL, 0x0789244FF1705821LL,
+0x06FBD05649B0B9C7LL, 0xEF9713EC6A0C250BLL, 0xF47691AD6AA9F0DBLL, 0xF2A8EB02CB08CA51LL,
+0xF9559D40380A20E1LL, 0x04E15138A5B9BF43LL, 0xEECD739EA48F3ABBLL, 0xF76E7E7530574E79LL,
+0xF8393D2E42D7D277LL, 0xF666F9AD3A16D173LL, 0xF403C629749F3ED5LL, 0xFBD7EC45F220A473LL,
+0xFA8AFF7491B234FDLL, 0xFF471CE534D1F537LL, 0xF4BEBFDD9C54CEC9LL, 0xDD04722310A6CE9DLL,
+0xFD8071236214FA05LL, 0xFBCA07B399A482DDLL, 0xFD9642C104864C17LL, 0xFA525105AADEFA39LL,
+0xF71122156406E645LL, 0xFF415FDFD1247539LL, 0xFB709936F52446AFLL, 0xFF7734CCB806CDA7LL,
+0xF801E9A88CD3D70DLL, 0xFC0C00AC9BCC5491LL, 0xFF462CD8E52ED221LL, 0xFC97426300FCE331LL,
+0xFEB3049C5E37A059LL, 0xFFFC8AB1E05051CDLL, 0xFE5F4621F2D9FE63LL, 0xFE931DB54FC5D521LL,
+0xFFDE43D960FE42A5LL, 0xFFDBFAD1B802BDB5LL, 0xFF23C485F6B7BF53LL, 0xFFC98F169C8DF21BLL,
+0xF1609D0E2E564D01LL, 0xCB10B976C333834BLL, 0x9B52037A38DAB8F9LL, 0x800E88FF5E929095LL,
+0x55A9AD1C21F5E173LL, 0x3D1A64E4E555D699LL, 0x2A5D1D73694F7B93LL, 0x198F4260D8807623LL,
+0x140D45BB525C35EBLL, 0x102F4743FF914EEBLL, 0x0CB114936A734FBFLL, 0x096D97150B7B0A71LL,
+0x06F06B90B850C2E5LL, 0x053B17A0D7F7386BLL, 0xE3AD1CE3C82FE6A5LL, 0xDAE968B4B710E857LL,
+0xFA2DC15B2C96BE77LL, 0xF1FF5F22AF135BD9LL, 0xFC65C5CAAA878A13LL, 0xFB9427EB08CF9C11LL,
+0xCCB12B6FEBFE285DLL, 0x5BAADA462B48F999LL, 0x2E53167EC64B703BLL, 0x1264ED670CD61961LL,
+0x071F216A9AB74E2DLL, 0xEE26503C1266CE55LL, 0x4C6004C7E404E4B5LL, 0xCB649E41ECE95F85LL
 };
 
 }