#
# delete_file "botan/prf_ssl3.cpp"
#
# delete_file "botan/prf_tls.cpp"
#
# add_file "botan/charset.h"
#
# add_file "botan/dl_cache.cpp"
#
# add_file "botan/hash_id.h"
#
# add_file "contrib/ciabot_monotone_hookversion.py"
#
# add_file "tests/t_restriction_with_exclude.at"
#
# patch ".mt-attrs"
# from [f64f76c6bd0167f72362edd8c47724dffbe31907]
# to [43c90c1b09c5f7a6d60f0fa6ce6e4eb67911789a]
#
# patch "ChangeLog"
# from [50802639ded49c79d2f4bbfa018f0adb56206858]
# to [a8f0f6c5ccc10b4f16e1776741a2ed08326fdd34]
#
# patch "Makefile.am"
# from [4fdc45d300225991df7992a71cedf7936a7d76b5]
# to [7a233d22f09d1b0d6eb2f010fdbb0cf97461af6c]
#
# patch "app_state.cc"
# from [913741f52364afa34c20540f2008ef88fc911f30]
# to [4c8ba6a5cdc3fa945a945e19ea63e1fc857d3ca1]
#
# patch "app_state.hh"
# from [6f4dfe92668723e2ca2eb8bb005ebab6c0d050c5]
# to [869c3e0393d765e37fc17ae117ccbbe69776b177]
#
# patch "botan/aes.cpp"
# from [8135e5fa9b189d5618f67ef27f63b4b16c683ca4]
# to [f544aa7fd0dca2a0a282736d62433f046fee78f2]
#
# patch "botan/aes.h"
# from [244fd78437608f33f3e559d359f8be7abd66c931]
# to [dacdc0de1fe5484610985ef059e9368f0d7244a0]
#
# patch "botan/aes_tab.cpp"
# from [78dcee057d2aa6cf37ca4331a2ce9d499e55ec96]
# to [559a744cd416011e4850b8e19719e56ae31b18d8]
#
# patch "botan/algolist.h"
# from [d77a0da036e55d55613326f528ed680d6977bab7]
# to [ef9d8f0eb6210c1b316298d4ca6f53013db1cef0]
#
# patch "botan/allocate.cpp"
# from [8222a5340314265755a2b79469a367158fc2f99b]
# to [00af600bc30ed8c6ecfdea3fe716cd169626b05f]
#
# patch "botan/allocate.h"
# from [f0c3067f73c5cef489b345ab0751b17e5ef07624]
# to [825e8e9e89e22aba9d30c55f4e142b98bbab5dfd]
#
# patch "botan/arc4.cpp"
# from [7ea03bc134ef34a54773c90d4d21d71a9eaa2c18]
# to [5d18a5e5578d84da92e194a2c878ff7da6503844]
#
# patch "botan/arc4.h"
# from [20156d762201ad8d930a526dbce55fe08ad12996]
# to [86febd85b9edfbe8a1ca0719659171b65f67bcab]
#
# patch "botan/asn1.h"
# from [0673bdaef5291a134595648a953b67dc5d37c442]
# to [0f625e8cacf2288438d5b9f336a89e88205ac868]
#
# patch "botan/asn1_alg.cpp"
# from [c41db36633e5d356e67540a39230dc95fe36524e]
# to [ecf1238bbee1ff0c59910a3baa65581f90683678]
#
# patch "botan/asn1_alt.cpp"
# from [003f48d6763514457a190ee5e8753c562223b43d]
# to [a96db0b1830a1c2aae7d77a6ac0b5945f4398505]
#
# patch "botan/asn1_att.cpp"
# from [175de742c23d2ae762fbe5a4862ae0c131d20392]
# to [636c751ebe11b317a810f0fbd8b0a024f05c0e97]
#
# patch "botan/asn1_dn.cpp"
# from [66e58f586ee99e7e0b789250db79320cbae0de16]
# to [69534bf7311cb012090e0c9c0f64025dcadfc35c]
#
# patch "botan/asn1_ext.cpp"
# from [adcded31305574a0c37a44987c27a9c212a81260]
# to [a8cc362726b13e9e81757a214fd39b684253a0ef]
#
# patch "botan/asn1_ku.cpp"
# from [80baaded8a2bfb051b1b01f74804d51cf9f1a013]
# to [43916185735c5d26bdc5fa1772698b8db315838b]
#
# patch "botan/asn1_obj.h"
# from [197606805a327d6c05f1b98d7181861fc8a6e7ba]
# to [16357c964a2e7ee51e5501db6ff05971fa737aa5]
#
# patch "botan/asn1_oid.cpp"
# from [113696871e0ca992ff1e8c530b77605542b980c9]
# to [bd982245f5f3d15f424be78f3383d77762f848d4]
#
# patch "botan/asn1_oid.h"
# from [ff465c835e6a44e73fdabfe10c849e146437a1f3]
# to [f9678be8147d4e32f1836282704fd63060171924]
#
# patch "botan/asn1_str.cpp"
# from [56901d327ef5963962c704d9a10a2587e56884a1]
# to [75c135f4178b8dfec1363b216049809919eb1435]
#
# patch "botan/asn1_tm.cpp"
# from [4a339d34777a8c8f19da139ef0c41d11161dd44d]
# to [69296df4a30b2b4d4213d6a78274f5a0f813e48c]
#
# patch "botan/barrett.cpp"
# from [5c0327d2445b9f3fc066f155674ad2235ca2b64e]
# to [ea5008b06d86cd1f84a53bb3babec53e2f5973de]
#
# patch "botan/barrett.h"
# from [8b76f90ed2cd705a5d3a5fb1e57ac9ea2f33b4a2]
# to [30768ab0d31c2200e713237e7f4b8aaf1c6ab679]
#
# patch "botan/base.cpp"
# from [2d56945dad7cbca306fd1cdfa376297eb796a723]
# to [3fcd48a2b31dc404fcc861f0c1150d764f276e1f]
#
# patch "botan/base.h"
# from [1fe7fb64e2f2d4cdf9373205ba255ec0296d19ab]
# to [7223b306fb862c20a89c03a1460c366aca16fc6f]
#
# patch "botan/base64.cpp"
# from [9fe31429403b86d01c267309c04fc90e1e606ff5]
# to [f8f825aa6ababa4d464f193348d429e8729c6cb8]
#
# patch "botan/base64.h"
# from [6903d988dfe5ba1bbc2e82d7c03f3f8ed838ed81]
# to [a230286f7ddfefab2e317197aed37cfa407e4494]
#
# patch "botan/base_eng.h"
# from [a1137490aeb1da477c7f827b4cb0c0a4d83be21e]
# to [e2c682688a68ca8c392fef8febe24a5f163a5c22]
#
# patch "botan/basefilt.cpp"
# from [a87e31f5925cc6a1226c1f9e47f206ff7c279d8b]
# to [c62ab8ed09c29b42cab4060b763eaa12f5ae4ed5]
#
# patch "botan/basefilt.h"
# from [35b6dbe10c295089d744ebbdef3f98c35b65bfd7]
# to [dc993b59b350b86f39fd125e42c925c4067edd64]
#
# patch "botan/ber_code.cpp"
# from [45e75d9d3f7d32d0daf0f692da91cb8c1d4fc326]
# to [41b67aa4c136a6acfe9757658dd4ccbb5d52c340]
#
# patch "botan/ber_dec.cpp"
# from [b42fae01777b272d26888808e10b95d195801700]
# to [85736204e607a95c150ee1a5e6b9ac1b82373349]
#
# patch "botan/ber_dec.h"
# from [f0b877d1cfa5d94ec9c0793fc25ac03f24840de8]
# to [380987e05bd500b7663f5954bdb4a7c8b0e84241]
#
# patch "botan/big_base.cpp"
# from [018118b988d580e6ffb34e98d4ccafcd0be4d070]
# to [6b393b5416c22430149721f291e3f6839239d3fb]
#
# patch "botan/big_code.cpp"
# from [50c850ceff3facc002653a9b8d0a1dacfea8c741]
# to [9d421e837b118c241771431e97b8269a0049339a]
#
# patch "botan/big_io.cpp"
# from [6a91448edae6ea766cc3159b6ef011acaeabc9ae]
# to [17083ec29a3235fba2817a5117cc4c303434df3d]
#
# patch "botan/big_ops2.cpp"
# from [6568718ebd4e38e1e238421efa1be22d37b05db2]
# to [b951478dcd76378226809a907f402ec29abb43c3]
#
# patch "botan/big_ops3.cpp"
# from [ed3b596d0ac13f3ba549ad1e2849e9966cdf0fea]
# to [7fcfc51d05c038b3cc268b9993c9140524d91afb]
#
# patch "botan/bigint.h"
# from [39ccfdeac610512103d16674c299939e1e693d5a]
# to [0f4e2101aad1e358bfbba6a7e5b136c42566786c]
#
# patch "botan/blinding.cpp"
# from [69a1b620f677a22b7c6a55039e964678c3bc2d0a]
# to [409b0a4f351117490772f07a5328ce0ec88a420b]
#
# patch "botan/blinding.h"
# from [55ffef0dd36306cf00d35f6f261040c659e2edf7]
# to [93d726432666ec51edd74003647882948261d9fd]
#
# patch "botan/botan.h"
# from [69d369bbb161dadf9db1e224ce7a5b01b97298a4]
# to [e19178830bd4ceadbc977e8f54ce45f9f18c7ec4]
#
# patch "botan/buf_es.cpp"
# from [17ffcafc5f0091775f5ff82361b0e8d211557f0d]
# to [22b201e4e9b1a2704dd762e5d8670d74790b53c8]
#
# patch "botan/buf_es.h"
# from [dadb51dc51778193c22232774300054aa6771ff8]
# to [92c7fed684a29fa220d3320c0b3ca431874ddc8e]
#
# patch "botan/buf_filt.cpp"
# from [258d2b85a47bc42faf4e50849f125686fe83b2ac]
# to [42c8a97f415ccacfe8b3ddaa29df18151b5dc6a7]
#
# patch "botan/buf_filt.h"
# from [0e7534629e985eb81b751339e8c6244007f7c65e]
# to [82b9c858e60af6bf816750888764e9330a6125c4]
#
# patch "botan/cbc.cpp"
# from [ae938d9c8632da302d82fba0a8efab4e609c3885]
# to [07356236e863c7453b30c33fbdb6a10507a02e24]
#
# patch "botan/cbc.h"
# from [f741d411a9bd09ee108836e0bf02962ae55cd241]
# to [0ea0edd6d72aa5c8baec83cf46d075e326b05006]
#
# patch "botan/certstor.h"
# from [7f5bbeb13d876da9b0905f252110e70250f25289]
# to [0ac4c8644a5d17b7adb2868f37fe9fcc8adc310c]
#
# patch "botan/certstore.cpp"
# from [12cddfbff8d0ebf1ddf323198f2381992b527b80]
# to [d9840e20d737606905f1b846de1faa49870e4357]
#
# patch "botan/cfb.cpp"
# from [e33d8760634d2b5e10329e0c34b5cebe72848904]
# to [fe3b9c70b199eb3671f1d1a7e678acf81be143ee]
#
# patch "botan/cfb.h"
# from [9b9f3a3ce4094e6f968d12cf0d41bd579219b900]
# to [283d95f7f0336c5c97242104439f666b5d190e13]
#
# patch "botan/charset.cpp"
# from [fb06b37e3cc3dd2f01c30901397d6417bde0a91d]
# to [4eefedeea00d833c01b8968cf09a391821389bfe]
#
# patch "botan/charset.h"
# from []
# to [0a2fc0cf36512cdfbe8725d7a08cf7c239638cc5]
#
# patch "botan/conf.cpp"
# from [643f2ea2ddb23e57d0dc3b190c2c9931d4a1fc9c]
# to [a4d66f1f29a263d401e17af592c184131422f682]
#
# patch "botan/conf.h"
# from [0b602b8e2b927d74ec28d6d87a584aa3e31195ef]
# to [71b0151c64d71a4a3450a0fad05fc3c6a227815f]
#
# patch "botan/crc32.cpp"
# from [53cbb50cd0477189162fd30c87167042dceeac44]
# to [6f79aadddee3ca58108dbb79eaf9818c917df452]
#
# patch "botan/crc32.h"
# from [85099a7b83816dc20cb891c999527074187f1ac1]
# to [14797da7c705de3d822da4419a90d8eced1dbd1f]
#
# patch "botan/crl_ent.cpp"
# from [54b739d37d71f1abcddeb944a58cbee0fa632a84]
# to [e066797dbdeb2eb2f8124a791e2739deb847fdc4]
#
# patch "botan/crl_ent.h"
# from [0539e983d16efda8ee76c3fa87b285e774f0b391]
# to [cec8c4510b2505708ff6dd2bb2a6d8e60ec792eb]
#
# patch "botan/ctr.cpp"
# from [31a49ab9c99c151565fa8f7298586f342baf7afe]
# to [f03e800de4653a9a335c30abde0b6a1fbb8b64df]
#
# patch "botan/ctr.h"
# from [e9b82176a17a126b51e9baab8be858f80c6ca3f6]
# to [60b1b31f804d1f2808420b3869f6c1141ae5ba19]
#
# patch "botan/cts.cpp"
# from [0af0fd46dc6c5bb65af0189ef9d5e03bf593df39]
# to [2008cc5f4cc4303c9d8179a689513de479d5a08e]
#
# patch "botan/cts.h"
# from [4c9a0ee6740a624bbf39533f44f24f37c7f0a302]
# to [c458d765007da986f16e0775a69a8635b8f69742]
#
# patch "botan/data_snk.cpp"
# from [4c1f45222a6f41b3b1777f757dbc3687edc5806a]
# to [fa0cc906ebf754c99f054b78f02f2906da140db7]
#
# patch "botan/data_snk.h"
# from [cb2454f0182f6416729cb5a75279b6a84812be16]
# to [9e221cab38c1145c37fc832e802c091cfe7dac75]
#
# patch "botan/data_src.cpp"
# from [8e0cd9e19678dc472149b2a87a2fc4ad40772e5e]
# to [00dc4c8f2680501212b65a712d6eef20ae9a271e]
#
# patch "botan/data_src.h"
# from [0e7c72b15f861375f65d44b837e24809fb5246cb]
# to [b386d479f8908dcc942ed10013d6cfb2bbc8f031]
#
# patch "botan/def_eng.cpp"
# from [036ea54c991b78627bbb43cc80e731f9c8ee2ee6]
# to [cebe435088b0f3cae4e4b103211a3d19609966cb]
#
# patch "botan/def_eng.h"
# from [a4906d5dd169dc71c5f35111ebe9e7161bebfa16]
# to [cb6c6b9768a0e7c77e67e9eef6598904d85f3b0e]
#
# patch "botan/def_ops.cpp"
# from [ca3801883a7902957cded598081a5761aaa10e79]
# to [18c63eab3d6ada615f8988fd13f0a4d39d218ae3]
#
# patch "botan/defalloc.cpp"
# from [e330d915e67e2b1ff2ea1e01b6f7dc21c752f511]
# to [0a8c4ea4f0ff0831f906e30415ab78d3fe0678b9]
#
# patch "botan/defalloc.h"
# from [beda55c363ee2fd4ed5b50d654372a0dd40bf222]
# to [f3cbe94e43909da2f169b34e04217b2946fc429e]
#
# patch "botan/der_code.cpp"
# from [906a1062209a1f6ecb16ee64c69aa2f653ca9c3e]
# to [7d1a406cbfb6bef841797d6c44fe49d5dd730c03]
#
# patch "botan/der_enc.cpp"
# from [ac9170917e29853420f5df76943c00eb6df150ea]
# to [2898db4a4312ab8887c241f1758f8871153fe844]
#
# patch "botan/der_enc.h"
# from [a2ddf690cbe1290e24a38b8cc24232b25e48e6a3]
# to [612aef07516329e81624156d1481208dd64a88f7]
#
# patch "botan/dh.cpp"
# from [7410d18e0689cf0b88fcd629377532c953fb9372]
# to [88888aafa2ba75594db9f3fc9884ad2397e76e6d]
#
# patch "botan/dh.h"
# from [82659d1abc7e35ddb1462a3ff64d26066a17c8a5]
# to [0eb696b0a935052659c8a3bd123d0e0f4f965a65]
#
# patch "botan/divide.cpp"
# from [272b0e327dd778b55e36e54e41a6552e1c0c56dd]
# to [71a6766759d8ea7a4f148fc7187b99c17168502c]
#
# patch "botan/dl_algo.cpp"
# from [06b5b14b241a3dcf402ac8b86446e58dcd762560]
# to [407d1a5e155d69d0248bdf003b1d4ae1c59eb07e]
#
# patch "botan/dl_algo.h"
# from [96e5c93c3d952b29f368ba26ca216bd7781e6675]
# to [ba177f21543053329ffa01070970973d5db39a52]
#
# patch "botan/dl_cache.cpp"
# from []
# to [beccd9ed986895e885d4dd553b3667c585c3b842]
#
# patch "botan/dl_group.cpp"
# from [eb98c6c708e299d70dae4ad614828345ce036a74]
# to [c335b79e38e853a394fd76e734ea102480cf6042]
#
# patch "botan/dl_param.cpp"
# from [2a49018926bb9e393705a2b7c9202af9342fae15]
# to [46da7888784c4d2e733f2f014aa93644326251be]
#
# patch "botan/dl_param.h"
# from [245ee588426a4fbee58bf4834ae9c373ffcacf32]
# to [8b1d46bcb1a5ee06d536ef8edb244aae8196d6d9]
#
# patch "botan/dlies.cpp"
# from [d803e4b7eb0b31f497aac7b06223e7aa28ede268]
# to [0c9a9eb14c241d9a974d69851be22eff0ad9ff9d]
#
# patch "botan/dlies.h"
# from [8cabc3fab297e1d9ffecfd0fec371a3546dbf4f8]
# to [220cf9a63bc846e59dbe6c10b59207b25259131e]
#
# patch "botan/eax.cpp"
# from [65ab636998b9d9b96d5e90209dfcbc97c0d687a7]
# to [3d883a13778ce6be5beffd6ab42db67750c0765f]
#
# patch "botan/eax.h"
# from [d1b07e0ba2e6ce2de493b5cf387fb66464f4688a]
# to [5d9f4d8474c9a222fb53579cbecf4e5a46558fe5]
#
# patch "botan/ecb.cpp"
# from [a75694b9df00cbc3ee19e07f95dd42fb53e4598f]
# to [519758ea66834c37ce4da85b634e1f54fe1e67f1]
#
# patch "botan/ecb.h"
# from [737e78fd8af5c8f26487aa2e6e94deef2aedbdcd]
# to [43b8217ca2da247c5d3f5169e227ef0a2cd09ce5]
#
# patch "botan/eme.h"
# from [51b86440d4403db028c50548757795fe49a2192e]
# to [4412c54e61d8e70e2d1f42e5bb48ffb1ab1fb92a]
#
# patch "botan/eme1.cpp"
# from [3c08f892e78d4b3093a3e35cb7351f2b47766e47]
# to [096712e2e91e96d4684e5cc447bd44ade28e349c]
#
# patch "botan/eme_pkcs.cpp"
# from [dcc6a4ae10f3bc1d50d284cc4285fdf84bc7cad3]
# to [0300e9b5bff3abc77f2550e099f9079adcc27535]
#
# patch "botan/emsa.h"
# from [5e8b0377da8b2f6d7ce03df9d189498dccce53a2]
# to [8aed2c73d0d4b9b0e8dd48331d00d99475d62b17]
#
# patch "botan/emsa1.cpp"
# from [cdc6b0242927da271f6488eb39502eb36eae3fa4]
# to [3256c2a0d2f330e83926775165e5727a69db8c89]
#
# patch "botan/emsa2.cpp"
# from [fae5e6b530c838fccebeac5b6d419efafe0597f1]
# to [cc579ea8d68707008de96718e57aa45744ba7d2f]
#
# patch "botan/emsa3.cpp"
# from [747190a9e3a8802dd7aefb60b87e6935903fe844]
# to [7ceb6622645006dbf646a9597260a04167bfd248]
#
# patch "botan/emsa4.cpp"
# from [fb48cbf028544c50bdbb6c4f3df82846a576d31f]
# to [0be0a60693c31c83cf2a2df0f03a4479b8444b3d]
#
# patch "botan/emsa_raw.cpp"
# from [4856d228aa6a7ea5367a91559eae933c5ca3f281]
# to [4f061b051bf6e32e48f4e56ee2f2b9a12054e076]
#
# patch "botan/eng_base.cpp"
# from [c21bf7a9a3b1e3da0f91db105a4d02d10d574e0b]
# to [470b429437811de062b605a3eef110f890be77c4]
#
# patch "botan/engine.cpp"
# from [516153822616553bed646431168c348713de1e93]
# to [f9f3e140d9d596fba3bdee49d93f3348cc02c799]
#
# patch "botan/engine.h"
# from [547b4edca4ac9df32d5121c0b0b5e58d5fbba518]
# to [e564fba257a1af6a72dfb4e68dfa387846189ee0]
#
# patch "botan/enums.h"
# from [8d70f172c1b79d03cbc0d4126d1ae56555207336]
# to [fe74b7deb3e19aa07f2db2351381079fd4f73d80]
#
# patch "botan/es_file.cpp"
# from [5772d21d1ff18c7d2a091c89f19351e84232611c]
# to [6d3c2b5bd05b067cf5df1720a585e7a2fa99a166]
#
# patch "botan/es_file.h"
# from [83027d4b6bc201ef272309df3697e43bc846a381]
# to [a375d7011922508810394364ac39a357a5a75b83]
#
# patch "botan/exceptn.cpp"
# from [8f5ca9fc666267df72fccd96fc851fdcb7b123f1]
# to [3cd2986ddf5c3d967a5dd20991068545a456c7c2]
#
# patch "botan/exceptn.h"
# from [48d813b9a3ca6c896e8cd873cf2491ada522973c]
# to [0f90c643393d85de7e81ae26d6a57e0f52fad8b4]
#
# patch "botan/filter.cpp"
# from [3506db191bc2d7eaaa67e4e1666add6c3d23a19c]
# to [23a3c3907950660091292e50544a89e04e641f71]
#
# patch "botan/filter.h"
# from [d60e7a9d3900ba32b4e2856df6b441007d010138]
# to [18e52ca7710b7762627297db5a27722b5afce3aa]
#
# patch "botan/filters.cpp"
# from [ad14e0a2e1639d623b45a8ad63b812945297987a]
# to [d8f8d8e488482d394b59ffbe7d666ab190698914]
#
# patch "botan/filters.h"
# from [67ed0a521e02165d787c81efee085863b624105e]
# to [dba4116f6d25355809ef86ea71b64a4d031029af]
#
# patch "botan/fips140.cpp"
# from [e6fc1426744e58b90917f77c2863627b6bfe3e95]
# to [c1d4019e258c3b9b85fdf007083420759505ddef]
#
# patch "botan/fips140.h"
# from [f887fa80632ca747a142f383f8c0a9f4ce6b3f75]
# to [b975066cc64ce52da09af0ba5ed907e786e426b8]
#
# patch "botan/fips_rng.cpp"
# from [305b3d093136ae275b7a5c667e3c96d860fe5efc]
# to [f59f382c107f935b4eb2f9c90cc179077c79da6d]
#
# patch "botan/fips_rng.h"
# from [45a4189cb973451fbc27a310e9666fc66eec983d]
# to [33d9795345f1e9a5a5ed083de4df1daf5d5cc55a]
#
# patch "botan/fused.cpp"
# from [6fb7c8ea89ea577cf638ca0829f3161261470d8c]
# to [0e069924c640428d0145066882384e73cf767409]
#
# patch "botan/get_algo.cpp"
# from [fa25847dacdd675514855ff915204e6d9ead8dfa]
# to [83b4c671f852dbf233ce7da7c81c1f8e63e92e46]
#
# patch "botan/get_enc.cpp"
# from [b0e587e9e8289d9b9ad153491d81f2c81c14a3ef]
# to [fb775372aa0d45261c2890e7ed0069c1d5c8a8a4]
#
# patch "botan/get_pbe.cpp"
# from [cba554a352ad0c15f4da112f89e6069a723d5de2]
# to [7701f52c0f08f0a0ee3f97d770294b1dafca7788]
#
# patch "botan/hash_id.cpp"
# from [41540ab3948c994cfc3f59d5a0a42075779a33ff]
# to [30976df969f81420191833f90bfe0f20941a6c8f]
#
# patch "botan/hash_id.h"
# from []
# to [518f07b3e6f9ec8ebce5e01bcaa41d005fc509de]
#
# patch "botan/hex.cpp"
# from [98bbd41c4609c6b02b7af53f09b7e690c4c967be]
# to [d90dd533be84454b70bd07f7639c6d2371ee9416]
#
# patch "botan/hex.h"
# from [2cfc0e0f5f5a7e368f30225714a3254a362108ed]
# to [2bba7745b808634f2ff705e21ad9a6d20f6be763]
#
# patch "botan/hmac.cpp"
# from [de1313f2eb1b0aa55b39a7b2990682c78f9c9662]
# to [d7bc77900a2af2ba418deebbd87b30c9f3ea3811]
#
# patch "botan/hmac.h"
# from [2e2149c3036fe4f61e4959787e17d000ec01472d]
# to [d608aecb93bd9d0d3a9fa47443696c766e0c7a14]
#
# patch "botan/if_algo.cpp"
# from [8ba8e73da35f455f2d33c5364bb8ec50a335e1a9]
# to [4ee708729d33713d47c64828d1d43c646690b4b2]
#
# patch "botan/if_algo.h"
# from [4d4b55bbc30d46ede166f16c49a8205772dedcfc]
# to [d8597f0265745faa4743802b44de16660e326e5e]
#
# patch "botan/inifile.cpp"
# from [93c083a2c23c7fa9594cbfa8e753bba843abd805]
# to [28f3c77682edec2d7a2108f7437d75a96cb422a1]
#
# patch "botan/init.cpp"
# from [fe867ad3ec390b9dfcf9d03f9f3a92a2844fd1bf]
# to [2b67a947e2133a4a9fbd93774c2a67a5d7cf5344]
#
# patch "botan/init.h"
# from [ef58b0990e2ff7abf148e2983417b4696c69872f]
# to [cbc00892b37c81723cb8476d33a7f674fb73f79b]
#
# patch "botan/kdf.cpp"
# from [7a1872d488218b86b88751f7925349d1771483dd]
# to [9f9a6e9c4a779b5a8c169512ab55fd8dd5712d19]
#
# patch "botan/kdf.h"
# from [ce2bf9dca868ce3648fbd60f0c89dd41dda8eccb]
# to [7d0cda0fb2a44516987c1e1508df26cf1016e355]
#
# patch "botan/keypair.cpp"
# from [c2ba6d27c702e602ebc5c19401b06a63acd1e1ad]
# to [95b67905dbc153558bdd0d8addee5eb6b1568356]
#
# patch "botan/keypair.h"
# from [8f3a5a2a87301f0597153df0255d190484036790]
# to [50f23526d06bebe6b49881342da49dc2fb0a19f3]
#
# patch "botan/look_add.h"
# from [ea5876a5bbbe2115a1b85a26f89a91a9c91f4be9]
# to [18561a6954c6011dd60b458c5affe02e73a6a0c0]
#
# patch "botan/look_pk.cpp"
# from [46272ca274e843f3ffbb455a781cc4206cca2551]
# to [870251a124f84ba2c175753b2946377abbd2c4c9]
#
# patch "botan/look_pk.h"
# from [f80d5fba4ca6ae87969224851151d9dd56c68d9c]
# to [b868af6a79123e844310d943647cd21b63fe5d34]
#
# patch "botan/lookup.cpp"
# from [b7017306350e0d5cec1bf29fa7aae5fc1476aa14]
# to [790c93fcff02eb4564f3e30cbb37d2b3b0b9662a]
#
# patch "botan/lookup.h"
# from [fc8a5e763db679996fc7bbe67259b70b3fb65c72]
# to [aa7bce79307989caf3699175148af3d3d3ab6481]
#
# patch "botan/make_prm.cpp"
# from [38f0b945a62ef720897c2d0641ef1c30b22850cf]
# to [13d08902b6d25716e14e5cdef8365673f8929d3c]
#
# patch "botan/mdx_hash.cpp"
# from [60980f2b531f0ccc6d9f817a5df85dd30f36724e]
# to [70a6a226456a3eed5dea25e9ec2428984796f7fa]
#
# patch "botan/mdx_hash.h"
# from [cf686de334af142d0a4bead6ffd6fdb6f7b61eb8]
# to [a38578d1f39ffd7ffea279a92e3a6d9e42f3f74c]
#
# patch "botan/mem_ops.h"
# from [f5603c43d5c102fa371bdf63e232e6006dc3cecc]
# to [02ab0ae42b9c6bf677886935d8dfb85e447ab6ba]
#
# patch "botan/mem_pool.cpp"
# from [943ebcf01580253115bc2f3e1088791371a55c4d]
# to [e2303f64ab0a279072bdbe59313ed10842702c20]
#
# patch "botan/mem_pool.h"
# from [71b41bee14798c742c2a6977bd00764f6b31f160]
# to [79cc34c1b88e2ab2419e609d8c0c208a490f913e]
#
# patch "botan/mgf1.cpp"
# from [fdb622c050a16e39088b0a2b5d29e03b732601ce]
# to [6f1bd57e1eceacffaa09086d688430f533801e75]
#
# patch "botan/mgf1.h"
# from [128d53c1a67b591b96f6c4a5044da775cc4eb416]
# to [07c9dbfb8d70d446eb0735b9e7a0109334a728e6]
#
# patch "botan/mlock.cpp"
# from [3010066a99142f353ecdc582c1a18d5bac09dd3d]
# to [d357780c56771b5779d6c0f95ff7a20ef3f81898]
#
# patch "botan/mod_exp.cpp"
# from [1149f9d2c943c0956b769ac266b0d29e9c98f188]
# to [58d392bddf6314f1450a6e890595381e4c60d875]
#
# patch "botan/mod_exp.h"
# from [18c6c30f361b8693f2f4ee33e2b2a597972564fb]
# to [c98cbd466ef7156a788de00755671f174fffa2cf]
#
# patch "botan/mode_pad.cpp"
# from [fbcf81f6972834b9a58fba4bbc462feaac03d290]
# to [6e13929f903c51c67f4f9cae3f1636d15a6e94b1]
#
# patch "botan/mode_pad.h"
# from [fabc318779665eefe72f430ba028ab05f12fcbe0]
# to [d33d5fd3116799e3acc4510bbe8ec00b9ecf203a]
#
# patch "botan/modebase.cpp"
# from [441199d5d032597f222e399c80da05c0466e770d]
# to [f55df855ab15cd85c53f74fcd09019136969253c]
#
# patch "botan/modebase.h"
# from [34f3886367213a4a120d1b2bab370ecc9991b203]
# to [9c6b1c98f71e261ecd853037c2a6f2a6abf4a09f]
#
# patch "botan/mp_comba.cpp"
# from [cd4bd559010fca3e8f6decfd45ce6801771bc2cd]
# to [fe79003f739437691f78090af30ff3c0d08c7000]
#
# patch "botan/mp_core.cpp"
# from [422451560f3daa8f8cd665dffcfd63d40edda6f3]
# to [c3cf34cadb010c8e432d639cd78413880f14b01f]
#
# patch "botan/mp_core.h"
# from [1792183f9a720f9fd33838b76eda4ae1515b2f6a]
# to [5f8d926528ccb7e579d3778bfa61c6fc2d388b43]
#
# patch "botan/mp_fkmul.cpp"
# from [9b24a4c785d41a51a4e6326c8c3f6453c1a34fd8]
# to [2451d3e11ed8dfa1eaa75ed02337c0f72f1fbd0e]
#
# patch "botan/mp_madd.h"
# from [91d7732e96d3a7e6da267164c1984091fb567180]
# to [8ebba5caec2b7972ad4970fc79bbf5db8f1ae970]
#
# patch "botan/mp_misc.cpp"
# from [22d22eba1424da339cf5b710ea421035819a12ca]
# to [14c95fd2efacea3ba45e7f29e71a676ef834433c]
#
# patch "botan/mp_mul.cpp"
# from [6f4b0d753bc894dc0b4a0795645ae560cfc07132]
# to [1a89216eb5fb97faaa1b948ed019813cf4404d80]
#
# patch "botan/mp_shift.cpp"
# from [406513cc6422b5f25d4fd42240dcc6c618f7be64]
# to [b0d06068404ec8818092b23bfcbdbafe0f804be6]
#
# patch "botan/mp_smul.cpp"
# from [ed5ffd208b8b7fa3dc8487fce5f16290a1ecd6f7]
# to [89a3d539993e7d617a7c9f0afff131b6e6ec95f3]
#
# patch "botan/mp_types.h"
# from [627e3b785902f58ca71f7cb2321b36f0901b090b]
# to [0883c2c34245124a245ffeb74802a6d0c866ea93]
#
# patch "botan/mutex.cpp"
# from [5e0337d3e2dbae707c2d873a299e3c403c17962d]
# to [5178b950cb9ac2c1e726d470bd9edf1e2afb4afb]
#
# patch "botan/mutex.h"
# from [edfbdfa03538e369e29e72532faa2f2e6eacc55e]
# to [28413d972111f69c83901ddd9909b532008ba6f2]
#
# patch "botan/numthry.cpp"
# from [565ae305cf2ac5ca822796a7527b329403b9204b]
# to [b72c9ca258ad576c7b6a9d2664281b23d223cb05]
#
# patch "botan/numthry.h"
# from [17458fbabc1602802e514147f7bcebee4414647e]
# to [9e48c28c48157564d28d2db1f6637d77dd3fa022]
#
# patch "botan/ofb.cpp"
# from [80169c91ae291656e6c4eeec82c3a399b18f09f2]
# to [d98618ab0fd9a03e671e5f034740f3e2746a9696]
#
# patch "botan/ofb.h"
# from [8120445492ab6d9449b761d5005c1de676dffce6]
# to [b829ab377c4d4ffd01d08317ab44af8e94b52ed4]
#
# patch "botan/oids.cpp"
# from [1a0baccbffdd0f231320d6e554f58a177c18fce8]
# to [2c16a47ec99aa367578e36a96ddb52e4c1315de8]
#
# patch "botan/oids.h"
# from [4875b136924adcd55cbb4d8ba4c0ddc784dc3d43]
# to [ff39689a4be354d6e3f7572d8685a35d129f9f44]
#
# patch "botan/omac.h"
# from [999a56ae665d31f7f616b5f6e014cb76d1526f58]
# to [c385a6e2195757673b1aeb527fb18ebd0fc55769]
#
# patch "botan/par_hash.h"
# from [d8401812eec5c2b7e4b60f77f8493a163d178fa5]
# to [db8899df56e0764c6d1c01cbecf5e8c665fad98b]
#
# patch "botan/parse.cpp"
# from [a3def2f20cd11724087c05da4dcc46a4a383b142]
# to [0e43f72e1606149dbcc4770fa5fe6a4533119761]
#
# patch "botan/pbe.h"
# from [4993ed6aa4c679740ac5a3003664c720443d44b4]
# to [06e59820482660316ca05b7039f35b3705c5acf5]
#
# patch "botan/pbe_pkcs.h"
# from [47e6d844b94e58ac325f6de110c6565398a3c917]
# to [3c1f0cfeb63a5ef197b4d25078183f124fec7fad]
#
# patch "botan/pbes1.cpp"
# from [4f8d05c302729c7821e4b40a3076c3fc08c9f26b]
# to [6068b4f4789773bc100896d6114db18b434dd140]
#
# patch "botan/pbes2.cpp"
# from [68bfe2135c3a4fe2ca4eeb5c83ed61e2368f8ccf]
# to [3c3e6d6ea030fc44f63b8bcfdaf15ab86c7a624e]
#
# patch "botan/pem.cpp"
# from [b72ae3b0a1a422b736f21fc5605d3b4d1591c135]
# to [eb4f3783b73f95b339fb1e3579c98ee8028b084a]
#
# patch "botan/pem.h"
# from [bc1422cbd42a4028333a569b150f1ceda195fec4]
# to [be2e43f828cff05d5f0ae7b02ee81adf0f1cda8d]
#
# patch "botan/pipe.cpp"
# from [d9c837aa093bfb230cf5c9f9b3978b5bd5bdd0c7]
# to [8b611a67111f11d7da354d6248412ab1eb8239af]
#
# patch "botan/pipe.h"
# from [04cb9c849abc6a94e396870f27330ed23b262d31]
# to [c1a3ae0a2ac4d5714f471298a9b978612af93a06]
#
# patch "botan/pipe_io.cpp"
# from [974d2e5f91be38025de9db7f01c4fe535facc620]
# to [b91a0b4c82f460a14549cbc89580dcaab1aadd47]
#
# patch "botan/pipe_rw.cpp"
# from [1b9c6fd0645251c17ef56a8f18c62f41fd307a8e]
# to [a26836077fabc8d34bc89c1b96876391494fca1e]
#
# patch "botan/pk_algs.cpp"
# from [0cf7a8301f09c75bdb93f055fad2f0cd0478e71f]
# to [4db1878384c2944381591a79e7d615f5d638d229]
#
# patch "botan/pk_algs.h"
# from [68c25007661b1503ea7431ab871bf4a674844c6d]
# to [fb2336a4e5ecb6c99ff27495ac9a2a2bda8dd965]
#
# patch "botan/pk_core.cpp"
# from [4c3ad70aabe63a760c189fdbfbcad946f73d9d95]
# to [d0e5257141362be13da44c2e83b5d5d90c8925cc]
#
# patch "botan/pk_core.h"
# from [b37fa3da4f807b7f45740b6110d8b4c28cea5fe1]
# to [10477efff2a9f24a8bf0119ca6d341a190563df3]
#
# patch "botan/pk_filts.cpp"
# from [63d8141f6e0dd0fff341b64327846e33d35c6c00]
# to [a854cd0ea434d4376b575936345ef2a049d5b047]
#
# patch "botan/pk_filts.h"
# from [c33f0ad0101684ecdc19fff8126ede12124fafd4]
# to [0d1647a1bdf4cad2f490ddd0e4ebce0784955bcc]
#
# patch "botan/pk_keys.cpp"
# from [bb3f3b5fa9ffa98e4949d7f27e1af9d8efbb14cb]
# to [10fcbc235a7fd98607ef6e931b97be3931fb64c9]
#
# patch "botan/pk_keys.h"
# from [fa50b78eeda21fc33442d229575c3106b74c5dff]
# to [708654f66730aef50e3ebbeadeed4f51befec530]
#
# patch "botan/pk_ops.h"
# from [d7f762f8ec5b0e52da91ae8864a063bbf94d66d1]
# to [3528538ab9d79c80e3f1ca31883cbb0a470451a2]
#
# patch "botan/pk_util.cpp"
# from [2c208fd991b109f7621bc7b99611aae97ae15822]
# to [07159fe81e167b59fcffd638f755d4672c8c42fa]
#
# patch "botan/pk_util.h"
# from [874530cc97e7f4ca7edc1f540048e6d774a1aee1]
# to [f6402de5949c76a9788e261361c7317fd3b18f5b]
#
# patch "botan/pkcs10.cpp"
# from [9dd6579c59ce03c6cbd1b11ea2a2db606e9b2206]
# to [d46f70b67ddf31df4414c885a62855b56ccbc246]
#
# patch "botan/pkcs10.h"
# from [04ea5a06ff5f73eff2964e9e50353caff8bf9a7f]
# to [7fdfce431e83e7cf380f877e3b7c726f3d698c1f]
#
# patch "botan/pkcs8.cpp"
# from [7ddd271b73aac637d42007f2104781d9f64b924d]
# to [6d12f636a9d038c815ba1a19ed4b5dafa2f4a052]
#
# patch "botan/pkcs8.h"
# from [aa88456c2b2961b74d006b240164b7dbf576b652]
# to [d6bc45f4d153674b5120c345ef1753b7fcbed396]
#
# patch "botan/policy.cpp"
# from [f61a5ad0ee7ddd9ee0fc7e64ae166021f7816051]
# to [ab5c3e85a557a472bfdbbc779a55f6deb79389c1]
#
# patch "botan/pow_mod.cpp"
# from [59ae9d116647e81fbb6de8f911823034015f16c6]
# to [d329aa0377ba3cb1b4249c155cacadb76cc0a43f]
#
# patch "botan/prf_x942.cpp"
# from [7b218685f195886dae2ee986c2f55bfdc03fc899]
# to [2e82d09acdab42e88e3dc6cf9fe3b8b545e6d1c2]
#
# patch "botan/primes.cpp"
# from [8c5513f27be0fdb55ffbe22bb3429a4cd582ae4e]
# to [6ece0b544fbb2d23c817999b4211dbd5c22cc092]
#
# patch "botan/pubkey.cpp"
# from [dbaf12a2c0e0be641f8d85e9af2c049eb25933cc]
# to [a79e182ed1aabf231ff5fd910240fd9e2fc517c3]
#
# patch "botan/pubkey.h"
# from [91491173f8aa0f79394f66791b2f73e1db044e0c]
# to [eb5a007ee85161d484036b2325def6afa731be7c]
#
# patch "botan/randpool.cpp"
# from [77d0870820eb8ff049b1c5510f22944d31572331]
# to [5d45a17b8b6f6311a3dd39fa0e1e8825164d8204]
#
# patch "botan/randpool.h"
# from [e485e25942f8e026a1b4c5d309eafba4e58143ae]
# to [8c3837ac3ca62bdbf5e584ca350aee650df6dd56]
#
# patch "botan/reducer.cpp"
# from [ac3ca2c65a244603aa74a72375350d2666605658]
# to [feddcce261ed731795367445fcf5f316ae598f96]
#
# patch "botan/reducer.h"
# from [782a5a9da892b8ef50c0acd50a7e2f35dc56200b]
# to [3f84481f5c8f523e7d2e2aee651aac211d88b16e]
#
# patch "botan/rng.cpp"
# from [61a3c6a4ce80ac0b893ac682e6f3adc26f8468b6]
# to [a87b1336b2275f4083f991b28ec602681eb17e1b]
#
# patch "botan/rng.h"
# from [ca1a9f356c4e746ef2597ac401325ac746a86221]
# to [23a42a4209ff8c1050f7d12d8b6e75696f549067]
#
# patch "botan/rsa.cpp"
# from [53430bdf7157f135af0e74098840e8e75b75a479]
# to [93dedfdfc017f5c2dbb93d548003101f580761d4]
#
# patch "botan/rsa.h"
# from [2e6a072ffe722bb6bd472f6b447d20501bcc3cee]
# to [f30ab1f3965b3f7f93c32a1acee311079c780d1a]
#
# patch "botan/s2k.cpp"
# from [c9392e2e13421cdbfef0ccab45dc59e9f155c013]
# to [ccfb48a2afc91995ebef9d2ddd413ee635db7327]
#
# patch "botan/s2k.h"
# from [68a6ccdce0fede7384124e12fcb442898492a9bf]
# to [d7098ee5352337e1cad8416f9f36d07a8ac81d17]
#
# patch "botan/secalloc.h"
# from [b310dff174a674d820a6b76b30e7666f05ff8b64]
# to [49f0e22d1760535fd353a53ee097f0fd5d72b52a]
#
# patch "botan/secmem.h"
# from [29935c5b1dc179460e8286f21746322db2ff05bb]
# to [2aa44f66962bab3f1bba1cc32cc1b4de51e192aa]
#
# patch "botan/secqueue.cpp"
# from [5037fd475d246948677e44e2236e800b7c115f92]
# to [47286a3fe1c00e49d0320be854bbef8f16e5df15]
#
# patch "botan/secqueue.h"
# from [106ee36176db91e6152a5b5276980b44aa09b0f1]
# to [88829bd53deeb58ef405f2a51367f0258723fd28]
#
# patch "botan/socket.h"
# from [e8849706085cdea44dc8ff3009a2a966965b4b56]
# to [791b0f5d68be7da7d8faa38808a52d1aac5146f0]
#
# patch "botan/symkey.cpp"
# from [074224d0aa4368c8291071f47dffe45cb3558206]
# to [9a1dbc137d57bd32958639b12e0c151d4b9e6f86]
#
# patch "botan/symkey.h"
# from [f33355c7fd13e785fc6f94b21fc0534a4f15b77d]
# to [ae5be2affed3758d5383cd96c60d5643235b2be6]
#
# patch "botan/timers.cpp"
# from [feff979b666a34d14788555eedf270b7060e592f]
# to [988a7b75cf3464c0176894cddc741fb271e48a16]
#
# patch "botan/timers.h"
# from [29ede2e248a818cc5b17b7688a94221259ce38a9]
# to [7faf9a0353f4d8fe1c11b15bcf76a6db4e34860b]
#
# patch "botan/types.h"
# from [93238b7a0ee25051c6ddc0ee1a61fcd734978899]
# to [be7494e11341bccc6fa12fe984b2a892f88a8532]
#
# patch "botan/ui.cpp"
# from [54e27258cd81e065af6b57f9a0acf171ff760760]
# to [d5b192eb455808424d41a1e7112d7cb11c5cbe7f]
#
# patch "botan/ui.h"
# from [9455f4dce960f0f2b2a05e3e92cc9ba136d31e6e]
# to [a749e0f49028256cd9a159c54c56db95a8a6e66e]
#
# patch "botan/util.cpp"
# from [6a85e690a9d0de8c77fd7c9006a3fcabc5f3c097]
# to [bffaf59d7153d3f2f8b5482031a10a4b68a2d00e]
#
# patch "botan/util.h"
# from [c98b09d26267303db39c6930316ec4bfaa577af2]
# to [f79616d4efd20a9b88d57cdc3f536bc389e4b12f]
#
# patch "botan/version.h"
# from [0384ce49a78d1f67268676f1b3544a8003fbe283]
# to [e73ea207b4bcd5f6bb75baff61666b274b205cb9]
#
# patch "botan/x509_ca.cpp"
# from [8b3275ed1718d77b664a4dac69f9e8df5f25a07e]
# to [9f52746349237842fd87650177ec418ab196abb3]
#
# patch "botan/x509_ca.h"
# from [cacda562e7cb5db8e3bc6bb03cb60a30850f9711]
# to [8078cf9f2328251a13a938c506447d103a4df5c4]
#
# patch "botan/x509_crl.cpp"
# from [c9aa820103b53c0d8a55aa949fdf8a02e1e8077f]
# to [f6d30db8bc65b12ed646fe5418bf14d058a01257]
#
# patch "botan/x509_crl.h"
# from [17dff45daf11dde3f216958689b06845ed172a4b]
# to [3976dc632eea02244c6cc1e98b6f50b04c0aaf62]
#
# patch "botan/x509_key.cpp"
# from [f47cf89e09ff326de8136ce3e03f7114eaad2088]
# to [7b5056172f3f94a53935a8582b4bc42f69bdc036]
#
# patch "botan/x509_key.h"
# from [3acac47396c685c507c8a049f0a583dbed5d0a74]
# to [1bc439ee441be814c600aa25263bc3a1e9a0f519]
#
# patch "botan/x509_obj.cpp"
# from [18ea0c22c805e2dc52d92b86a788c1430ffca24d]
# to [1d6e176d66362ef556dcdca527924776db81c427]
#
# patch "botan/x509_obj.h"
# from [990f87e55fc16c14e143ba9061180486240646ba]
# to [2fa126c9ed1f9229d5a704c55757c48edb7d0d07]
#
# patch "botan/x509cert.cpp"
# from [2754555bc83253250a1168e7067d288dac9c1905]
# to [9554fb9bca448dc6ee6236ba3841f67728c857e8]
#
# patch "botan/x509cert.h"
# from [3799c01700dffeef0a6d241c656e67f3a4af8dd4]
# to [373ec84916c1d04b14060e7591d35c8a0c95b7ca]
#
# patch "botan/x509find.cpp"
# from [fa00cdf310b5642aa8896c693b92db77a66defb9]
# to [4424040676ed96bf27580bff45226299060557e9]
#
# patch "botan/x509opt.cpp"
# from [fba4119a768cdc2f109f87be143a6fe45fbfc914]
# to [8cc80bac5a3867975b45f3e390a09eb9b72adf0d]
#
# patch "botan/x509self.cpp"
# from [41060ba068e0afb39c729c5b43955d0f8a0bcef9]
# to [094994e2e470e89abf1975f722f6bfa539063e96]
#
# patch "botan/x509self.h"
# from [395ce349b2550df1a44e5a4eb6cf3e98e35a7125]
# to [9e92e9d4c47782f41374b1e4829f65cb51b4dd8e]
#
# patch "botan/x509stor.cpp"
# from [1d4f8428283468c42c16e6dcccd4cd7fc87c9533]
# to [ab702468d4cd4cdfbe36adcaf37b0782ac4f643a]
#
# patch "botan/x509stor.h"
# from [317580b669aabc7ea56d0fa1e68e7d51a0d6e58c]
# to [a78774e7bde040bb909220fef6c9e5536540788d]
#
# patch "botan/x917_rng.cpp"
# from [1025931766017ebe0ad8ebcd50d8a4649f358b14]
# to [b1f28ea6de070326b1cc69ee01ffa6aefe57be2e]
#
# patch "botan/x917_rng.h"
# from [cb25b08a536563d9e5341db6f181530bd79a867a]
# to [04ab9985fbd607ccfb2ab2d7a783c3d8af0290d7]
#
# patch "botan/x919_mac.h"
# from [1705fe887e86ebfdade77bbb4486878f72cbfbc5]
# to [7687240f8465f0ad5f51fb74fc246c4851f9fad6]
#
# patch "commands.cc"
# from [55800638c9bd2da0aa48ab46d06beba1d5845c32]
# to [61185ae5cc7cd776c25ca1655199a314bdd40378]
#
# patch "contrib/ciabot_monotone_hookversion.py"
# from []
# to [3fc87a62b0d4ed9900f6735ebef812fc9948bc93]
#
# patch "database.cc"
# from [04b7bf7f3d9722bb194a0623a339babc83d95c74]
# to [83c0e4fe4b672da030bc50966c118ac0c2c98017]
#
# patch "database_check.cc"
# from [415b63b94a1150b3aff78b9e7fa512e0141577e8]
# to [c6145a7b639d6a67fd63c3816af36e67ada5144b]
#
# patch "lua.cc"
# from [f8a4f1818ea770532218416cb55752238c1f3ce3]
# to [fc053070a0c0a106e6f9a3e5678ef2a427ad1fcd]
#
# patch "lua.hh"
# from [db3bb1c0a41f36d245e8f1cdbbada5b7a42f7dae]
# to [950e24bc4b2c16b258f00aee0c4923ae93f256df]
#
# patch "monotone.cc"
# from [21176c710f4d646215c27d82b55f182830d13268]
# to [21be582ccd322a35a5d1864ee1251e5773054619]
#
# patch "monotone.texi"
# from [b9423f2c78e69bf6307613fd2c4efc81427a92b9]
# to [9b7b9ab00d31aead6a87466ff1a2d843c54084a8]
#
# patch "netsync.cc"
# from [47d8fd00598b41e501700e9cf63e6300eb0fb1be]
# to [6e37489151e0809548e293eb4d0495b8921cebfe]
#
# patch "po/POTFILES.in"
# from [0f66018918c56534036a8a549e3b81fb12a9c4b6]
# to [bd06ee5116d53df04a0065e56e3a6ef2b7837d8c]
#
# patch "po/POTFILES.skip"
# from [8d5f6c3d6059a2c943f11a6208ead30399dca3c7]
# to [61bc7af140315b993cde1192087564ea2105250d]
#
# patch "rcs_import.cc"
# from [22646283896c3db9024ffa6b1f57dd8d76c6598c]
# to [e01d4dc824657c684430fdf98d0132a1298f10d3]
#
# patch "tests/t_restriction_with_exclude.at"
# from []
# to [bf85428b2d62062acb23d375b0b18a3706adc5dd]
#
# patch "testsuite.at"
# from [f37b217c9d261739b96a0f8ccdc61269f1c0ee67]
# to [9843a5c53ec471614fc6d5ef5dfcf16fc6995608]
#
========================================================================
--- .mt-attrs f64f76c6bd0167f72362edd8c47724dffbe31907
+++ .mt-attrs 43c90c1b09c5f7a6d60f0fa6ce6e4eb67911789a
@@ -1,6 +1,9 @@
file "contrib/ciabot_monotone.py"
execute "true"
+ file "contrib/ciabot_monotone_hookversion.py"
+execute "true"
+
file "contrib/color-logs.sh"
execute "true"
========================================================================
--- ChangeLog 50802639ded49c79d2f4bbfa018f0adb56206858
+++ ChangeLog a8f0f6c5ccc10b4f16e1776741a2ed08326fdd34
@@ -1,3 +1,39 @@
+2005-09-16 Matt Johnston
+
+ * botan/pkcs8.cpp: re-add the monotone-specific code for guessing if
+ a key is DER encoded or not.
+
+2005-09-16 Matt Johnston
+
+ * botan/*: update to Botan 1.4.6
+ * Makefile.am: ditto
+
+2005-09-15 Timothy Brownawell
+
+ * app_state.{cc,hh}: restrictions now understand --exclude
+ * commands.cc: commit and revert now take OPT_EXCLUDE
+ * monotone.cc: update description of --exclude
+ * tests/t_restriction_with_exclude.at: new test
+ * testsuite.at: add it
+
+2005-09-14 Timothy Brownawell
+
+ * contrib/ciabot_monotone_hookversion.py: CIA bot client script
+ meant to be called from the note_netsync_revision_received hook.
+ * lua.{cc,hh}: hook_note_commit and hook_note_netsync_revision_received
+ now take the text of the revision as an argument.
+ * netsync.cc, commands.cc: Give hooks new argument.
+ * monotone.texi: Update documentation for those hooks.
+
+2005-09-11 Benoît Dejean
+
+ * database.cc
+ * database_check.cc
+ * netsync.cc
+ * po/POTFILES.in
+ * po/POTFILES.skip
+ * rcs_import.cc: More i18n strings.
+
2005-09-07 Jim Meyering
* tests/t_rename_dir_cross_level.at: When invoking mv to rename
========================================================================
--- Makefile.am 4fdc45d300225991df7992a71cedf7936a7d76b5
+++ Makefile.am 7a233d22f09d1b0d6eb2f010fdbb0cf97461af6c
@@ -83,6 +83,7 @@
botan/def_ops.cpp botan/defalloc.cpp botan/der_code.cpp \
botan/der_enc.cpp botan/divide.cpp botan/dl_algo.cpp \
botan/dl_get.cpp botan/dl_group.cpp botan/dl_param.cpp \
+ botan/dl_cache.cpp \
botan/dlies.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 \
@@ -104,7 +105,7 @@
botan/pipe_rw.cpp botan/pk_algs.cpp botan/pk_core.cpp \
botan/pk_filts.cpp botan/pk_keys.cpp botan/pk_util.cpp \
botan/pkcs10.cpp botan/pkcs8.cpp botan/policy.cpp \
- botan/pow_mod.cpp botan/prf_ssl3.cpp botan/prf_tls.cpp \
+ botan/pow_mod.cpp \
botan/prf_x942.cpp botan/primes.cpp botan/pubkey.cpp \
botan/randpool.cpp botan/reducer.cpp botan/rng.cpp \
botan/rsa.cpp botan/s2k.cpp botan/secqueue.cpp \
========================================================================
--- app_state.cc 913741f52364afa34c20540f2008ef88fc911f30
+++ app_state.cc 4c8ba6a5cdc3fa945a945e19ea63e1fc857d3ca1
@@ -123,6 +123,7 @@
{
static file_path root = file_path_internal("");
restrictions.clear();
+ excludes.clear();
for (vector::const_iterator i = paths.begin(); i != paths.end(); ++i)
{
file_path p = file_path_external(*i);
@@ -140,6 +141,24 @@
restrictions.insert(p);
}
+ for (std::set::const_iterator i = exclude_patterns.begin();
+ i != exclude_patterns.end(); ++i)
+ {
+ file_path p = file_path_external(*i);
+
+ if (respect_ignore && lua.hook_ignore_file(p))
+ {
+ L(F("'%s' ignored by excluded path set\n") % p);
+ continue;
+ }
+
+ N(p == root || valid_paths.find(p) != valid_paths.end(),
+ F("unknown path '%s'\n") % p);
+
+ L(F("'%s' added to excluded path set\n") % p);
+ excludes.insert(p);
+ }
+
// if user supplied a depth but provided no paths
// assume current directory
if ((depth != -1) && restrictions.empty())
@@ -152,23 +171,37 @@
app_state::restriction_includes(file_path const & path)
{
static file_path root = file_path_internal("");
- if (restrictions.empty())
+
+ if (restrictions.empty())
{
- return true;
- }
+ if (!excludes.empty())
+ {
+ if (excludes.find(root) != excludes.end())
+ return false;
+ fs::path test = fs::path(path.as_external(), fs::native);
- bool user_supplied_depth = (depth != -1);
+ while (!test.empty())
+ {
+ L(F("checking excluded path set for '%s'\n") % test.string());
- // a path that normalizes to "." means that the restriction has been
- // essentially cleared (all files are included). rather than be
- // careful about what goes in to the restricted path set we just
- // check for this special case here.
+ file_path p = file_path_internal(test.string());
+ path_set::const_iterator i = excludes.find(p);
- if ((!user_supplied_depth) && restrictions.find(root) != restrictions.end())
- {
+ if (i != excludes.end())
+ {
+ L(F("path '%s' found in excluded path set; '%s' excluded\n")
+ % test.string() % path);
+ return false;
+ }
+
+ test = test.branch_path();
+ }
+ }
return true;
}
+ bool user_supplied_depth = (depth != -1);
+
fs::path test = fs::path(path.as_external(), fs::native);
long branch_depth = 0;
long max_depth = depth + 1;
@@ -179,6 +212,7 @@
file_path p = file_path_internal(test.string());
path_set::const_iterator i = restrictions.find(p);
+ path_set::const_iterator j = excludes.find(p);
if (i != restrictions.end())
{
@@ -186,10 +220,11 @@
% test.string() % path);
return true;
}
- else
+ else if (j != excludes.end())
{
- L(F("path '%s' not found in restricted path set; '%s' excluded\n")
+ L(F("path '%s' found in excluded path set; '%s' excluded\n")
% test.string() % path);
+ return false;
}
if (user_supplied_depth && (max_depth == branch_depth)) return false;
@@ -197,9 +232,13 @@
++branch_depth;
}
- if (user_supplied_depth && (restrictions.find(root) != restrictions.end()))
+ // a path that normalizes to "." means that the restriction has been
+ // essentially cleared (all files are included). rather than be
+ // careful about what goes in to the restricted path set we just
+ // check for this special case here.
+ if (restrictions.find(root) != restrictions.end())
{
- return (branch_depth <= max_depth);
+ return (!user_supplied_depth) || (branch_depth <= max_depth);
}
return false;
========================================================================
--- app_state.hh 6f4dfe92668723e2ca2eb8bb005ebab6c0d050c5
+++ app_state.hh 869c3e0393d765e37fc17ae117ccbbe69776b177
@@ -50,6 +50,7 @@
std::set exclude_patterns;
std::vector extra_rcfiles;
path_set restrictions;
+ path_set excludes;
bool found_working_copy;
long depth;
long last;
========================================================================
--- botan/aes.cpp 8135e5fa9b189d5618f67ef27f63b4b16c683ca4
+++ botan/aes.cpp f544aa7fd0dca2a0a282736d62433f046fee78f2
@@ -1,6 +1,6 @@
/*************************************************
* AES Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/aes.h 244fd78437608f33f3e559d359f8be7abd66c931
+++ botan/aes.h dacdc0de1fe5484610985ef059e9368f0d7244a0
@@ -1,6 +1,6 @@
/*************************************************
* AES Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_AES_H__
========================================================================
--- botan/aes_tab.cpp 78dcee057d2aa6cf37ca4331a2ce9d499e55ec96
+++ botan/aes_tab.cpp 559a744cd416011e4850b8e19719e56ae31b18d8
@@ -1,6 +1,6 @@
/*************************************************
* S-Box and Diffusion Tables for AES *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/algolist.h d77a0da036e55d55613326f528ed680d6977bab7
+++ botan/algolist.h ef9d8f0eb6210c1b316298d4ca6f53013db1cef0
@@ -1,6 +1,6 @@
/*************************************************
* Algorithm Lookup Table Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_ALGOLIST_H__
========================================================================
--- botan/allocate.cpp 8222a5340314265755a2b79469a367158fc2f99b
+++ botan/allocate.cpp 00af600bc30ed8c6ecfdea3fe716cd169626b05f
@@ -1,6 +1,6 @@
/*************************************************
* Allocator Factory Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
@@ -25,12 +25,12 @@
void add(const std::string&, Allocator*);
std::string set_default_allocator(const std::string&);
- AllocatorFactory() { factory_lock = get_mutex(); }
+ AllocatorFactory() { factory_mutex = get_mutex(); }
~AllocatorFactory();
private:
- std::map alloc;
+ std::map alloc_map;
std::string default_allocator;
- Mutex* factory_lock;
+ Mutex* factory_mutex;
};
/*************************************************
@@ -38,13 +38,13 @@
*************************************************/
Allocator* AllocatorFactory::get(const std::string& type) const
{
- Mutex_Holder lock(factory_lock);
+ Mutex_Holder lock(factory_mutex);
std::map::const_iterator iter;
- if(type == "default") iter = alloc.find(default_allocator);
- else iter = alloc.find(type);
+ if(type == "default") iter = alloc_map.find(default_allocator);
+ else iter = alloc_map.find(type);
- if(iter == alloc.end())
+ if(iter == alloc_map.end())
return 0;
return iter->second;
}
@@ -54,12 +54,12 @@
*************************************************/
Allocator* AllocatorFactory::get_default() const
{
- Mutex_Holder lock(factory_lock);
+ Mutex_Holder lock(factory_mutex);
std::map::const_iterator iter;
- iter = alloc.find(default_allocator);
+ iter = alloc_map.find(default_allocator);
- if(iter == alloc.end())
+ if(iter == alloc_map.end())
return 0;
return iter->second;
}
@@ -69,9 +69,9 @@
*************************************************/
void AllocatorFactory::add(const std::string& type, Allocator* allocator)
{
- Mutex_Holder lock(factory_lock);
+ Mutex_Holder lock(factory_mutex);
allocator->init();
- alloc[type] = allocator;
+ alloc_map[type] = allocator;
}
/*************************************************
@@ -79,7 +79,7 @@
*************************************************/
std::string AllocatorFactory::set_default_allocator(const std::string& alloc)
{
- Mutex_Holder lock(factory_lock);
+ Mutex_Holder lock(factory_mutex);
std::string old_default = default_allocator;
default_allocator = alloc;
@@ -92,12 +92,12 @@
AllocatorFactory::~AllocatorFactory()
{
std::map::iterator iter;
- for(iter = alloc.begin(); iter != alloc.end(); iter++)
+ for(iter = alloc_map.begin(); iter != alloc_map.end(); iter++)
{
iter->second->destroy();
delete iter->second;
}
- delete factory_lock;
+ delete factory_mutex;
}
/*************************************************
========================================================================
--- botan/allocate.h f0c3067f73c5cef489b345ab0751b17e5ef07624
+++ botan/allocate.h 825e8e9e89e22aba9d30c55f4e142b98bbab5dfd
@@ -1,6 +1,6 @@
/*************************************************
* Allocator Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_ALLOCATOR_H__
========================================================================
--- botan/arc4.cpp 7ea03bc134ef34a54773c90d4d21d71a9eaa2c18
+++ botan/arc4.cpp 5d18a5e5578d84da92e194a2c878ff7da6503844
@@ -1,6 +1,6 @@
/*************************************************
* ARC4 Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/arc4.h 20156d762201ad8d930a526dbce55fe08ad12996
+++ botan/arc4.h 86febd85b9edfbe8a1ca0719659171b65f67bcab
@@ -1,6 +1,6 @@
/*************************************************
* ARC4 Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_ARC4_H__
========================================================================
--- botan/asn1.h 0673bdaef5291a134595648a953b67dc5d37c442
+++ botan/asn1.h 0f625e8cacf2288438d5b9f336a89e88205ac868
@@ -1,6 +1,6 @@
/*************************************************
* ASN.1 Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_ASN1_H__
========================================================================
--- botan/asn1_alg.cpp c41db36633e5d356e67540a39230dc95fe36524e
+++ botan/asn1_alg.cpp ecf1238bbee1ff0c59910a3baa65581f90683678
@@ -1,6 +1,6 @@
/*************************************************
* Algorithm Identifier Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/asn1_alt.cpp 003f48d6763514457a190ee5e8753c562223b43d
+++ botan/asn1_alt.cpp a96db0b1830a1c2aae7d77a6ac0b5945f4398505
@@ -1,6 +1,6 @@
/*************************************************
* AlternativeName Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
@@ -38,6 +38,17 @@
}
/*************************************************
+* Add an OtherName field *
+*************************************************/
+void AlternativeName::add_othername(const OID& oid, const std::string& value,
+ ASN1_Tag type)
+ {
+ if(value == "")
+ return;
+ multimap_insert(othernames, oid, ASN1_String(value, type));
+ }
+
+/*************************************************
* Get the attributes of this alternative name *
*************************************************/
std::multimap AlternativeName::get_attributes() const
@@ -46,11 +57,19 @@
}
/*************************************************
+* Get the otherNames *
+*************************************************/
+std::multimap AlternativeName::get_othernames() const
+ {
+ return othernames;
+ }
+
+/*************************************************
* Return if this object has anything useful *
*************************************************/
bool AlternativeName::has_items() const
{
- return (alt_info.size() > 0);
+ return (alt_info.size() > 0 || othernames.size() > 0);
}
namespace DER {
@@ -78,9 +97,24 @@
void encode(DER_Encoder& encoder, const AlternativeName& alt_name)
{
encoder.start_sequence();
+
encode_entries(encoder, alt_name, "RFC822", ASN1_Tag(1));
encode_entries(encoder, alt_name, "DNS", ASN1_Tag(2));
encode_entries(encoder, alt_name, "URI", ASN1_Tag(6));
+
+ std::multimap othernames = alt_name.get_othernames();
+
+ std::multimap::const_iterator i;
+ for(i = othernames.begin(); i != othernames.end(); i++)
+ {
+ encoder.start_explicit(ASN1_Tag(0));
+ DER::encode(encoder, i->first);
+ encoder.start_explicit(ASN1_Tag(0));
+ DER::encode(encoder, i->second);
+ encoder.end_explicit(ASN1_Tag(0));
+ encoder.end_explicit(ASN1_Tag(0));
+ }
+
encoder.end_sequence();
}
@@ -97,15 +131,49 @@
while(names.more_items())
{
BER_Object obj = names.get_next_object();
- if(obj.class_tag != CONTEXT_SPECIFIC)
+ if((obj.class_tag != CONTEXT_SPECIFIC) &&
+ (obj.class_tag != (CONTEXT_SPECIFIC | CONSTRUCTED)))
continue;
ASN1_Tag tag = obj.type_tag;
- const std::string value = iso2local(BER::to_string(obj));
- if(tag == 1) alt_name.add_attribute("RFC822", value);
- else if(tag == 2) alt_name.add_attribute("DNS", value);
- else if(tag == 6) alt_name.add_attribute("URI", value);
+ if(tag == 0)
+ {
+ BER_Decoder othername(obj.value);
+
+ OID oid;
+ BER::decode(othername, oid);
+ if(othername.more_items())
+ {
+ BER_Object othername_value_outer = othername.get_next_object();
+ othername.verify_end();
+
+ if(othername_value_outer.type_tag != ASN1_Tag(0) ||
+ othername_value_outer.class_tag !=
+ (CONTEXT_SPECIFIC | CONSTRUCTED)
+ )
+ throw Decoding_Error("Invalid tags on otherName value");
+
+ BER_Decoder othername_value_inner(othername_value_outer.value);
+
+ BER_Object value = othername_value_inner.get_next_object();
+ othername_value_inner.verify_end();
+
+ ASN1_Tag value_type = value.type_tag;
+
+ if(is_string_type(value_type) && value.class_tag == UNIVERSAL)
+ alt_name.add_othername(oid, BER::to_string(value), value_type);
+ }
+ }
+ else if(tag == 1 || tag == 2 || tag == 6)
+ {
+ const std::string value = iso2local(BER::to_string(obj));
+
+ if(tag == 1) alt_name.add_attribute("RFC822", value);
+ if(tag == 2) alt_name.add_attribute("DNS", value);
+ if(tag == 6) alt_name.add_attribute("URI", value);
+ }
+
}
}
========================================================================
--- botan/asn1_att.cpp 175de742c23d2ae762fbe5a4862ae0c131d20392
+++ botan/asn1_att.cpp 636c751ebe11b317a810f0fbd8b0a024f05c0e97
@@ -1,6 +1,6 @@
/*************************************************
* Attribute Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/asn1_dn.cpp 66e58f586ee99e7e0b789250db79320cbae0de16
+++ botan/asn1_dn.cpp 69534bf7311cb012090e0c9c0f64025dcadfc35c
@@ -1,6 +1,6 @@
/*************************************************
* X509_DN Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/asn1_ext.cpp adcded31305574a0c37a44987c27a9c212a81260
+++ botan/asn1_ext.cpp a8cc362726b13e9e81757a214fd39b684253a0ef
@@ -1,6 +1,6 @@
/*************************************************
* Extension Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/asn1_ku.cpp 80baaded8a2bfb051b1b01f74804d51cf9f1a013
+++ botan/asn1_ku.cpp 43916185735c5d26bdc5fa1772698b8db315838b
@@ -1,6 +1,6 @@
/*************************************************
* KeyUsage Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/asn1_obj.h 197606805a327d6c05f1b98d7181861fc8a6e7ba
+++ botan/asn1_obj.h 16357c964a2e7ee51e5501db6ff05971fa737aa5
@@ -1,6 +1,6 @@
/*************************************************
* Common ASN.1 Objects Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_ASN1_OBJ_H__
@@ -131,12 +131,16 @@
void add_attribute(const std::string&, const std::string&);
std::multimap get_attributes() const;
+ void add_othername(const OID&, const std::string&, ASN1_Tag);
+ std::multimap get_othernames() const;
+
bool has_items() const;
AlternativeName(const std::string& = "", const std::string& = "",
const std::string& = "");
private:
std::multimap alt_info;
+ std::multimap othernames;
};
/*************************************************
@@ -156,6 +160,8 @@
s32bit validity_check(const X509_Time&, const X509_Time&, u64bit);
+bool is_string_type(ASN1_Tag);
+
/*************************************************
* DER Encoding Functions *
*************************************************/
========================================================================
--- botan/asn1_oid.cpp 113696871e0ca992ff1e8c530b77605542b980c9
+++ botan/asn1_oid.cpp bd982245f5f3d15f424be78f3383d77762f848d4
@@ -1,6 +1,6 @@
/*************************************************
* ASN.1 OID Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/asn1_oid.h ff465c835e6a44e73fdabfe10c849e146437a1f3
+++ botan/asn1_oid.h f9678be8147d4e32f1836282704fd63060171924
@@ -1,6 +1,6 @@
/*************************************************
* ASN.1 OID Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_ASN1_OID_H__
========================================================================
--- botan/asn1_str.cpp 56901d327ef5963962c704d9a10a2587e56884a1
+++ botan/asn1_str.cpp 75c135f4178b8dfec1363b216049809919eb1435
@@ -1,6 +1,6 @@
/*************************************************
* Simple ASN.1 String Types Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
@@ -53,6 +53,18 @@
}
/*************************************************
+* Check if type is a known ASN.1 string type *
+*************************************************/
+bool is_string_type(ASN1_Tag tag)
+ {
+ if(tag == NUMERIC_STRING || tag == PRINTABLE_STRING ||
+ tag == VISIBLE_STRING || tag == T61_STRING || tag == IA5_STRING ||
+ tag == UTF8_STRING || tag == BMP_STRING)
+ return true;
+ return false;
+ }
+
+/*************************************************
* Create an ASN1_String *
*************************************************/
ASN1_String::ASN1_String(const std::string& str, ASN1_Tag t) : tag(t)
========================================================================
--- botan/asn1_tm.cpp 4a339d34777a8c8f19da139ef0c41d11161dd44d
+++ botan/asn1_tm.cpp 69296df4a30b2b4d4213d6a78274f5a0f813e48c
@@ -1,6 +1,6 @@
/*************************************************
* X.509 Time Types Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/barrett.cpp 5c0327d2445b9f3fc066f155674ad2235ca2b64e
+++ botan/barrett.cpp ea5008b06d86cd1f84a53bb3babec53e2f5973de
@@ -1,6 +1,6 @@
/*************************************************
* Barrett Reducer Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/barrett.h 8b76f90ed2cd705a5d3a5fb1e57ac9ea2f33b4a2
+++ botan/barrett.h 30768ab0d31c2200e713237e7f4b8aaf1c6ab679
@@ -1,6 +1,6 @@
/*************************************************
* Barrett Reducer Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_BARRETT_H__
========================================================================
--- botan/base.cpp 2d56945dad7cbca306fd1cdfa376297eb796a723
+++ botan/base.cpp 3fcd48a2b31dc404fcc861f0c1150d764f276e1f
@@ -1,6 +1,6 @@
/*************************************************
* Base Classes Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
@@ -217,13 +217,13 @@
*************************************************/
void RandomNumberGenerator::add_entropy(EntropySource& source, bool slowpoll)
{
- SecureVector entropy(slowpoll ? 192 : 64);
+ SecureVector buffer(slowpoll ? 192 : 64);
u32bit returned;
- if(slowpoll) returned = source.slow_poll(entropy, entropy.size());
- else returned = source.fast_poll(entropy, entropy.size());
+ if(slowpoll) returned = source.slow_poll(buffer, buffer.size());
+ else returned = source.fast_poll(buffer, buffer.size());
- add_entropy(entropy, returned);
+ add_entropy(buffer, returned);
}
/*************************************************
========================================================================
--- botan/base.h 1fe7fb64e2f2d4cdf9373205ba255ec0296d19ab
+++ botan/base.h 7223b306fb862c20a89c03a1460c366aca16fc6f
@@ -1,6 +1,6 @@
/*************************************************
* Base Classes Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_BASE_H__
@@ -10,7 +10,6 @@
#include
#include
#include
-#include
namespace Botan {
========================================================================
--- botan/base64.cpp 9fe31429403b86d01c267309c04fc90e1e606ff5
+++ botan/base64.cpp f8f825aa6ababa4d464f193348d429e8729c6cb8
@@ -1,6 +1,6 @@
/*************************************************
* Base64 Encoder/Decoder Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/base64.h 6903d988dfe5ba1bbc2e82d7c03f3f8ed838ed81
+++ botan/base64.h a230286f7ddfefab2e317197aed37cfa407e4494
@@ -1,6 +1,6 @@
/*************************************************
* Base64 Encoder/Decoder Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_BASE64_H__
========================================================================
--- botan/base_eng.h a1137490aeb1da477c7f827b4cb0c0a4d83be21e
+++ botan/base_eng.h e2c682688a68ca8c392fef8febe24a5f163a5c22
@@ -1,6 +1,6 @@
/*************************************************
* Default Engine Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_DEFAULT_ENGINE_H__
========================================================================
--- botan/basefilt.cpp a87e31f5925cc6a1226c1f9e47f206ff7c279d8b
+++ botan/basefilt.cpp c62ab8ed09c29b42cab4060b763eaa12f5ae4ed5
@@ -1,6 +1,6 @@
/*************************************************
* Basic Filters Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/basefilt.h 35b6dbe10c295089d744ebbdef3f98c35b65bfd7
+++ botan/basefilt.h dc993b59b350b86f39fd125e42c925c4067edd64
@@ -1,6 +1,6 @@
/*************************************************
* Basic Filters Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_BASEFILT_H__
========================================================================
--- botan/ber_code.cpp 45e75d9d3f7d32d0daf0f692da91cb8c1d4fc326
+++ botan/ber_code.cpp 41b67aa4c136a6acfe9757658dd4ccbb5d52c340
@@ -1,6 +1,6 @@
/*************************************************
* BER Decoding Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/ber_dec.cpp b42fae01777b272d26888808e10b95d195801700
+++ botan/ber_dec.cpp 85736204e607a95c150ee1a5e6b9ac1b82373349
@@ -1,6 +1,6 @@
/*************************************************
* BER Decoder Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/ber_dec.h f0b877d1cfa5d94ec9c0793fc25ac03f24840de8
+++ botan/ber_dec.h 380987e05bd500b7663f5954bdb4a7c8b0e84241
@@ -1,6 +1,6 @@
/*************************************************
* BER Decoder Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_BER_DECODER_H__
========================================================================
--- botan/big_base.cpp 018118b988d580e6ffb34e98d4ccafcd0be4d070
+++ botan/big_base.cpp 6b393b5416c22430149721f291e3f6839239d3fb
@@ -1,6 +1,6 @@
/*************************************************
* BigInt Base Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/big_code.cpp 50c850ceff3facc002653a9b8d0a1dacfea8c741
+++ botan/big_code.cpp 9d421e837b118c241771431e97b8269a0049339a
@@ -1,6 +1,6 @@
/*************************************************
* BigInt Encoding/Decoding Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/big_io.cpp 6a91448edae6ea766cc3159b6ef011acaeabc9ae
+++ botan/big_io.cpp 17083ec29a3235fba2817a5117cc4c303434df3d
@@ -1,6 +1,6 @@
/*************************************************
* BigInt Input/Output Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/big_ops2.cpp 6568718ebd4e38e1e238421efa1be22d37b05db2
+++ botan/big_ops2.cpp b951478dcd76378226809a907f402ec29abb43c3
@@ -1,6 +1,6 @@
/*************************************************
* BigInt Assignment Operators Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/big_ops3.cpp ed3b596d0ac13f3ba549ad1e2849e9966cdf0fea
+++ botan/big_ops3.cpp 7fcfc51d05c038b3cc268b9993c9140524d91afb
@@ -1,6 +1,6 @@
/*************************************************
* BigInt Binary Operators Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/bigint.h 39ccfdeac610512103d16674c299939e1e693d5a
+++ botan/bigint.h 0f4e2101aad1e358bfbba6a7e5b136c42566786c
@@ -1,6 +1,6 @@
/*************************************************
* BigInt Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_BIGINT_H__
========================================================================
--- botan/blinding.cpp 69a1b620f677a22b7c6a55039e964678c3bc2d0a
+++ botan/blinding.cpp 409b0a4f351117490772f07a5328ce0ec88a420b
@@ -1,6 +1,6 @@
/*************************************************
* Blinder Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/blinding.h 55ffef0dd36306cf00d35f6f261040c659e2edf7
+++ botan/blinding.h 93d726432666ec51edd74003647882948261d9fd
@@ -1,6 +1,6 @@
/*************************************************
* Blinder Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_BLINDER_H__
========================================================================
--- botan/botan.h 69d369bbb161dadf9db1e224ce7a5b01b97298a4
+++ botan/botan.h e19178830bd4ceadbc977e8f54ce45f9f18c7ec4
@@ -1,6 +1,6 @@
/*************************************************
* Basic Interface Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/buf_es.cpp 17ffcafc5f0091775f5ff82361b0e8d211557f0d
+++ botan/buf_es.cpp 22b201e4e9b1a2704dd762e5d8670d74790b53c8
@@ -1,6 +1,6 @@
/*************************************************
* Buffered EntropySource Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/buf_es.h dadb51dc51778193c22232774300054aa6771ff8
+++ botan/buf_es.h 92c7fed684a29fa220d3320c0b3ca431874ddc8e
@@ -1,6 +1,6 @@
/*************************************************
* Buffered EntropySource Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_BUFFERED_ES_H__
========================================================================
--- botan/buf_filt.cpp 258d2b85a47bc42faf4e50849f125686fe83b2ac
+++ botan/buf_filt.cpp 42c8a97f415ccacfe8b3ddaa29df18151b5dc6a7
@@ -1,6 +1,6 @@
/*************************************************
* Buffering Filter Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/buf_filt.h 0e7534629e985eb81b751339e8c6244007f7c65e
+++ botan/buf_filt.h 82b9c858e60af6bf816750888764e9330a6125c4
@@ -1,6 +1,6 @@
/*************************************************
* Buffering Filter Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_BUFFERING_FILTER_H__
========================================================================
--- botan/cbc.cpp ae938d9c8632da302d82fba0a8efab4e609c3885
+++ botan/cbc.cpp 07356236e863c7453b30c33fbdb6a10507a02e24
@@ -1,6 +1,6 @@
/*************************************************
* CBC Mode Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/cbc.h f741d411a9bd09ee108836e0bf02962ae55cd241
+++ botan/cbc.h 0ea0edd6d72aa5c8baec83cf46d075e326b05006
@@ -1,6 +1,6 @@
/*************************************************
* CBC Mode Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_CBC_H__
========================================================================
--- botan/certstor.h 7f5bbeb13d876da9b0905f252110e70250f25289
+++ botan/certstor.h 0ac4c8644a5d17b7adb2868f37fe9fcc8adc310c
@@ -1,6 +1,6 @@
/*************************************************
* Certificate Store Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_CERT_STORE_H__
========================================================================
--- botan/certstore.cpp 12cddfbff8d0ebf1ddf323198f2381992b527b80
+++ botan/certstore.cpp d9840e20d737606905f1b846de1faa49870e4357
@@ -1,6 +1,6 @@
/*************************************************
* Certificate Store Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/cfb.cpp e33d8760634d2b5e10329e0c34b5cebe72848904
+++ botan/cfb.cpp fe3b9c70b199eb3671f1d1a7e678acf81be143ee
@@ -1,6 +1,6 @@
/*************************************************
* CFB Mode Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
========================================================================
--- botan/cfb.h 9b9f3a3ce4094e6f968d12cf0d41bd579219b900
+++ botan/cfb.h 283d95f7f0336c5c97242104439f666b5d190e13
@@ -1,6 +1,6 @@
/*************************************************
* CFB Mode Header File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#ifndef BOTAN_CFB_H__
========================================================================
--- botan/charset.cpp fb06b37e3cc3dd2f01c30901397d6417bde0a91d
+++ botan/charset.cpp 4eefedeea00d833c01b8968cf09a391821389bfe
@@ -1,9 +1,9 @@
/*************************************************
* Character Set Handling Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
-#include
+#include
#include
#include
#include
@@ -11,6 +11,63 @@
namespace Botan {
/*************************************************
+* Check if a character represents a digit *
+*************************************************/
+bool is_digit(char c)
+ {
+ if(c == '0' || c == '1' || c == '2' || c == '3' || c == '4' ||
+ c == '5' || c == '6' || c == '7' || c == '8' || c == '9')
+ return true;
+ return false;
+ }
+
+/*************************************************
+* Check if a character represents whitespace *
+*************************************************/
+bool is_space(char c)
+ {
+ if(c == ' ' || c == '\t' || c == '\n' || c == '\r')
+ return true;
+ return false;
+ }
+
+/*************************************************
+* Convert a character to a digit *
+*************************************************/
+byte char2digit(char c)
+ {
+ if(c == '0') return 0;
+ if(c == '1') return 1;
+ if(c == '2') return 2;
+ if(c == '3') return 3;
+ if(c == '4') return 4;
+ if(c == '5') return 5;
+ if(c == '6') return 6;
+ if(c == '7') return 7;
+ if(c == '8') return 8;
+ if(c == '9') return 9;
+ throw Invalid_Argument("char2digit: Invalid decimal char " + c);
+ }
+
+/*************************************************
+* Convert a digit to a character *
+*************************************************/
+char digit2char(byte b)
+ {
+ if(b == 0) return '0';
+ if(b == 1) return '1';
+ if(b == 2) return '2';
+ if(b == 3) return '3';
+ if(b == 4) return '4';
+ if(b == 5) return '5';
+ if(b == 6) return '6';
+ if(b == 7) return '7';
+ if(b == 8) return '8';
+ if(b == 9) return '9';
+ throw Invalid_Argument("digit2char: Input is not a digit");
+ }
+
+/*************************************************
* Return the lower-case representation *
*************************************************/
char to_lower(char c)
========================================================================
--- botan/charset.h
+++ botan/charset.h 0a2fc0cf36512cdfbe8725d7a08cf7c239638cc5
@@ -0,0 +1,32 @@
+/*************************************************
+* Character Set Handling Header File *
+* (C) 1999-2005 The Botan Project *
+*************************************************/
+
+#ifndef BOTAN_CHARSET_H__
+#define BOTAN_CHARSET_H__
+
+#include
+#include
+
+namespace Botan {
+
+/*************************************************
+* Character Set Handling *
+*************************************************/
+bool is_digit(char);
+bool is_space(char);
+char to_lower(char);
+
+byte char2digit(char);
+char digit2char(byte);
+
+std::string local2iso(const std::string&);
+std::string iso2local(const std::string&);
+
+std::string utf2iso(const std::string&);
+std::string iso2utf(const std::string&);
+
+}
+
+#endif
========================================================================
--- botan/conf.cpp 643f2ea2ddb23e57d0dc3b190c2c9931d4a1fc9c
+++ botan/conf.cpp a4d66f1f29a263d401e17af592c184131422f682
@@ -1,64 +1,99 @@
/*************************************************
* Configuration Handling Source File *
-* (C) 1999-2004 The Botan Project *
+* (C) 1999-2005 The Botan Project *
*************************************************/
#include
#include
#include
+#include
#include