diff --git a/.gitignore b/.gitignore index bd7a36c..970128b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,8 @@ -/Botan-*.stripped.tar.gz +/Botan-1.8.9.tbz +/Botan-1.8.9.stripped.tbz +/Botan-1.8.10.stripped.tbz +/Botan-1.8.11.stripped.tbz +/Botan-1.8.12.stripped.tbz +/Botan-1.8.13.stripped.tbz +/Botan-1.8.14.stripped.tbz +/Botan-1.8.15.stripped.tar.gz diff --git a/Botan-1.10.17-add-riscv64.patch b/Botan-1.10.17-add-riscv64.patch deleted file mode 100644 index c2da72d..0000000 --- a/Botan-1.10.17-add-riscv64.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/src/build-data/arch/riscv64.txt b/src/build-data/arch/riscv64.txt -new file mode 100644 -index 0000000..6e5e0ff ---- /dev/null -+++ b/src/build-data/arch/riscv64.txt -@@ -0,0 +1 @@ -+endian little diff --git a/README.fedora b/README.fedora index 038f1bf..f3b8795 100644 --- a/README.fedora +++ b/README.fedora @@ -1,11 +1,14 @@ For legal reasons, the following modules have been completely removed from the Botan package in Fedora: -* RC5 Block Cipher [src/block/rc5] -* RC6 Block Cipher [src/block/rc6] -* GF(p) Math [src/math/ec_gfp] -* ECC Domain Parameters [src/pubkey/ec_group] -* ECC Public Key [src/pubkey/ecc_key] -* ECDH [src/pubkey/ecdh] -* ECDSA [src/pubkey/ecdsa] -* GOST 34.10 [src/pubkey/gost_3410] + * Block Ciphers + * IDEA [src/block/idea] + * RC6 [src/block/rc6] + * RC5 [src/block/rc5] + * Public Key Base + * ECC Public Key [src/pubkey/ecc_key] + * ECC Domain Parameters [src/pubkey/ec_dompar] + * ECDSA [src/pubkey/ecdsa] + * ECKAEG [src/pubkey/eckaeg] + * Math + * GF(p) Math [src/math/gfpmath] diff --git a/botan-1.10.13-python-init.patch b/botan-1.10.13-python-init.patch deleted file mode 100644 index 040a9a7..0000000 --- a/botan-1.10.13-python-init.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up Botan-1.10.13/src/wrap/python/__init__.py.orig Botan-1.10.13/src/wrap/python/__init__.py ---- Botan-1.10.13/src/wrap/python/__init__.py.orig 2016-04-28 15:27:08.000000000 +0200 -+++ Botan-1.10.13/src/wrap/python/__init__.py 2016-06-30 18:02:11.724997966 +0200 -@@ -1,4 +1,4 @@ --from _botan import * -+from botan._botan import * - - # Initialize the library when the module is imported - init = LibraryInitializer() diff --git a/botan-1.10.17-doc-conf-2to3.patch b/botan-1.10.17-doc-conf-2to3.patch deleted file mode 100644 index e826ca6..0000000 --- a/botan-1.10.17-doc-conf-2to3.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up Botan-1.10.17/doc/conf.py.orig Botan-1.10.17/doc/conf.py ---- Botan-1.10.17/doc/conf.py.orig 2017-10-02 08:00:00.000000000 +0200 -+++ Botan-1.10.17/doc/conf.py 2021-09-11 17:57:38.159934955 +0200 -@@ -40,10 +40,10 @@ version. - def check_sphinx_version(): - import sphinx - -- version = map(int, sphinx.__version__.split('.')) -+ version = list(map(int, sphinx.__version__.split('.'))) - if version[0] == 1 and version[1] == 0 and version[2] < 7: - # Exit rather than throwing to avoid a confusing backtrace -- print "This Sphinx is too old - upgrade to at least 1.0.7" -+ print("This Sphinx is too old - upgrade to at least 1.0.7") - import sys - sys.exit(1) - -@@ -66,8 +66,8 @@ source_suffix = '.txt' - master_doc = 'contents' - - # General information about the project. --project = u'botan' --copyright = u'2000-2011, Jack Lloyd' -+project = 'botan' -+copyright = '2000-2011, Jack Lloyd' - - # The version info for the project you're documenting, acts as replacement for - # |version| and |release|, also used in various other places throughout the -@@ -214,8 +214,8 @@ htmlhelp_basename = 'botandoc' - # Grouping the document tree into LaTeX files. List of tuples - # (source start file, target name, title, author, documentclass [howto/manual]). - latex_documents = [ -- ('contents', 'botan.tex', u'botan Reference Manual', -- u'Jack Lloyd', 'manual'), -+ ('contents', 'botan.tex', 'botan Reference Manual', -+ 'Jack Lloyd', 'manual'), - ] - - # The name of an image file (relative to this directory) to place at the top of diff --git a/botan-1.10.17-u64bit.patch b/botan-1.10.17-u64bit.patch deleted file mode 100644 index ea90706..0000000 --- a/botan-1.10.17-u64bit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp~ Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp ---- Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp~ 2017-10-02 08:00:00.000000000 +0200 -+++ Botan-1.10.17/src/hash/gost_3411/gost_3411.cpp 2023-01-22 13:01:38.984150336 +0100 -@@ -91,7 +91,7 @@ void GOST_34_11::compress_n(const byte i - // P transformation - for(size_t k = 0; k != 4; ++k) - { -- const uint64_t UVk = U[k] ^ V[k]; -+ const u64bit UVk = U[k] ^ V[k]; - for(size_t l = 0; l != 8; ++l) - key[4*l+k] = get_byte(l, UVk); - } diff --git a/botan-1.10.5-ecc-fix.patch b/botan-1.10.5-ecc-fix.patch deleted file mode 100644 index 4cd2e9a..0000000 --- a/botan-1.10.5-ecc-fix.patch +++ /dev/null @@ -1,327 +0,0 @@ -diff -up Botan-1.10.5/checks/cvc_tests.cpp.eccfix Botan-1.10.5/checks/cvc_tests.cpp ---- Botan-1.10.5/checks/cvc_tests.cpp.eccfix 2013-10-22 01:24:04.150239344 +0100 -+++ Botan-1.10.5/checks/cvc_tests.cpp 2013-10-22 01:24:28.166207414 +0100 -@@ -582,7 +582,7 @@ u32bit do_cvc_tests(Botan::RandomNumberG - std::cout << "Testing CVC: " << std::flush; - - test_enc_gen_selfsigned(rng); -- test_enc_gen_req(rng); -+ // test_enc_gen_req(rng); - test_cvc_req_ext(rng); - test_cvc_ado_ext(rng); - test_cvc_ado_creation(rng); -diff -up Botan-1.10.5/checks/ecdh.cpp.eccfix Botan-1.10.5/checks/ecdh.cpp ---- Botan-1.10.5/checks/ecdh.cpp.eccfix 2013-10-22 01:22:58.494326624 +0100 -+++ Botan-1.10.5/checks/ecdh.cpp 2013-10-22 01:23:52.580254726 +0100 -@@ -57,8 +57,8 @@ void test_ecdh_some_dp(RandomNumberGener - { - std::vector oids; - oids.push_back("1.2.840.10045.3.1.7"); -- oids.push_back("1.3.132.0.8"); -- oids.push_back("1.2.840.10045.3.1.1"); -+ // oids.push_back("1.3.132.0.8"); -+ // oids.push_back("1.2.840.10045.3.1.1"); - - for(u32bit i = 0; i< oids.size(); i++) - { -@@ -85,8 +85,8 @@ void test_ecdh_der_derivation(RandomNumb - { - std::vector oids; - oids.push_back("1.2.840.10045.3.1.7"); -- oids.push_back("1.3.132.0.8"); -- oids.push_back("1.2.840.10045.3.1.1"); -+ // oids.push_back("1.3.132.0.8"); -+ // oids.push_back("1.2.840.10045.3.1.1"); - - for(u32bit i = 0; i< oids.size(); i++) - { -@@ -116,7 +116,7 @@ u32bit do_ecdh_tests(RandomNumberGenerat - { - std::cout << "Testing ECDH (InSiTo unit tests): "; - -- test_ecdh_normal_derivation(rng); -+ // test_ecdh_normal_derivation(rng); - test_ecdh_some_dp(rng); - test_ecdh_der_derivation(rng); - -diff -up Botan-1.10.5/checks/ecdsa.cpp.eccfix Botan-1.10.5/checks/ecdsa.cpp ---- Botan-1.10.5/checks/ecdsa.cpp.eccfix 2013-03-02 21:19:35.000000000 +0000 -+++ Botan-1.10.5/checks/ecdsa.cpp 2013-10-22 01:22:48.882339400 +0100 -@@ -300,6 +300,7 @@ void test_create_and_verify(RandomNumber - void test_curve_registry(RandomNumberGenerator& rng) - { - std::vector oids; -+ /* Disabled. - oids.push_back("1.3.132.0.8"); - oids.push_back("1.2.840.10045.3.1.1"); - oids.push_back("1.2.840.10045.3.1.2"); -@@ -307,7 +308,9 @@ void test_curve_registry(RandomNumberGen - oids.push_back("1.2.840.10045.3.1.4"); - oids.push_back("1.2.840.10045.3.1.5"); - oids.push_back("1.2.840.10045.3.1.6"); -+ */ - oids.push_back("1.2.840.10045.3.1.7"); -+ /* Disabled - oids.push_back("1.3.132.0.6"); - oids.push_back("1.3.132.0.7"); - oids.push_back("1.3.132.0.28"); -@@ -318,7 +321,9 @@ void test_curve_registry(RandomNumberGen - oids.push_back("1.3.132.0.32"); - oids.push_back("1.3.132.0.33"); - oids.push_back("1.3.132.0.10"); -+ */ - oids.push_back("1.3.132.0.34"); -+ /* Disabled. - oids.push_back("1.3.132.0.35"); - oids.push_back("1.3.6.1.4.1.8301.3.1.2.9.0.38"); - oids.push_back("1.3.36.3.3.2.8.1.1.1"); -@@ -328,6 +333,7 @@ void test_curve_registry(RandomNumberGen - oids.push_back("1.3.36.3.3.2.8.1.1.9"); - oids.push_back("1.3.36.3.3.2.8.1.1.11"); - oids.push_back("1.3.36.3.3.2.8.1.1.13"); -+ */ - - unsigned int i; - for (i = 0; i < oids.size(); i++) -@@ -419,16 +425,16 @@ u32bit do_ecdsa_tests(Botan::RandomNumbe - { - std::cout << "Testing ECDSA (InSiTo unit tests): "; - -- test_hash_larger_than_n(rng); -- test_decode_ecdsa_X509(); -+ // test_hash_larger_than_n(rng); -+ // test_decode_ecdsa_X509(); - test_decode_ver_link_SHA256(); - test_decode_ver_link_SHA1(); -- test_sign_then_ver(rng); -- test_ec_sign(rng); -- test_create_pkcs8(rng); -- test_create_and_verify(rng); -+ // test_sign_then_ver(rng); -+ // test_ec_sign(rng); -+ // test_create_pkcs8(rng); -+ // test_create_and_verify(rng); - test_curve_registry(rng); -- test_read_pkcs8(rng); -+ // test_read_pkcs8(rng); - - std::cout << std::endl; - -diff -up Botan-1.10.5/checks/pk.cpp.eccfix Botan-1.10.5/checks/pk.cpp ---- Botan-1.10.5/checks/pk.cpp.eccfix 2013-03-02 21:19:36.000000000 +0000 -+++ Botan-1.10.5/checks/pk.cpp 2013-10-22 01:20:13.225546244 +0100 -@@ -760,14 +760,14 @@ void do_pk_keygen_tests(RandomNumberGene - #endif - - #if defined(BOTAN_HAS_ECDSA) -- EC_KEY(ECDSA_PrivateKey, "secp112r1"); -- EC_KEY(ECDSA_PrivateKey, "secp128r1"); -- EC_KEY(ECDSA_PrivateKey, "secp160r1"); -- EC_KEY(ECDSA_PrivateKey, "secp192r1"); -- EC_KEY(ECDSA_PrivateKey, "secp224r1"); -+// EC_KEY(ECDSA_PrivateKey, "secp112r1"); -+// EC_KEY(ECDSA_PrivateKey, "secp128r1"); -+// EC_KEY(ECDSA_PrivateKey, "secp160r1"); -+// EC_KEY(ECDSA_PrivateKey, "secp192r1"); -+// EC_KEY(ECDSA_PrivateKey, "secp224r1"); - EC_KEY(ECDSA_PrivateKey, "secp256r1"); - EC_KEY(ECDSA_PrivateKey, "secp384r1"); -- EC_KEY(ECDSA_PrivateKey, "secp521r1"); -+// EC_KEY(ECDSA_PrivateKey, "secp521r1"); - #endif - - #if defined(BOTAN_HAS_GOST_34_10_2001) -@@ -919,7 +919,7 @@ u32bit do_pk_validation_tests(const std: - - std::cout << std::endl; - -- do_ec_tests(rng); -+ // do_ec_tests(rng); - errors += do_ecdsa_tests(rng); - errors += do_ecdh_tests(rng); - do_pk_keygen_tests(rng); -diff -up Botan-1.10.5/checks/pk_bench.cpp.eccfix Botan-1.10.5/checks/pk_bench.cpp ---- Botan-1.10.5/checks/pk_bench.cpp.eccfix 2013-03-02 21:19:36.000000000 +0000 -+++ Botan-1.10.5/checks/pk_bench.cpp 2013-10-22 01:20:13.225546244 +0100 -@@ -77,12 +77,12 @@ using namespace Botan; - namespace { - - const char* ec_domains[] = { -- "secp160r2", -- "secp192r1", -- "secp224r1", -+// "secp160r2", -+// "secp192r1", -+// "secp224r1", - "secp256r1", - "secp384r1", -- "secp521r1", -+// "secp521r1", - 0 - }; - -diff -up Botan-1.10.5/checks/pk_valid.dat.eccfix Botan-1.10.5/checks/pk_valid.dat ---- Botan-1.10.5/checks/pk_valid.dat.eccfix 2013-03-02 21:19:36.000000000 +0000 -+++ Botan-1.10.5/checks/pk_valid.dat 2013-10-22 01:20:13.226546243 +0100 -@@ -4232,45 +4232,6 @@ MIG6AgEAMIGhBgcqhkjOOAQBMIGVAkAA8HR2W1fH - 14593FBF63EAC64976987524044D8B11AB9A95B4B75A760FE22C45A3EFD6: - - # ECDSA format is group name:private key:message:nonce:signature --[ECDSA/EMSA1(SHA-1)] -- --# From ANSI X9.62 --secp192r1:\ --1A8D598FC15BF0FD89030B5CB1111AEB92AE8BAF5EA475FB:\ --616263:\ --FA6DE29746BBEB7F8BB1E761F85F7DFB2983169D82FA2F4E:\ --885052380FF147B734C330C43D39B2C4A89F29B0F749FEAD\ --E9ECC78106DEF82BF1070CF1D4D804C3CB390046951DF686 -- --x962_p239v1:\ --7EF7C6FABEFFFDEA864206E80B0B08A9331ED93E698561B64CA0F7777F3D:\ --616263:\ --656C7196BF87DCC5D1F1020906DF2782360D36B2DE7A17ECE37D503784AF:\ --2CB7F36803EBB9C427C58D8265F11FC5084747133078FC279DE874FBECB0\ --2EEAE988104E9C2234A3C2BEB1F53BFA5DC11FF36A875D1E3CCB1F7E45CF -- --brainpool160r1:\ --1CA8A0ACE60292D2813D992C4EC7A4BCDF611C0:\ --43727970746F2B2B20352E362E312045434453412074657374206D7367:\ --9CB692B33F02179D1A6F2A0669FD8DAAF17E4FC4:\ --672EAFD043D30BAE7CA826828333FA70F10A14C7\ --0F49C076BB26178277D8E490D0C77F7A9649DE31 -- --[ECDSA/EMSA1(SHA-224)] --secp224r1:\ --42D126D0E51F3D6AA9B4D60BD1290853AA964A9C8698D5D5BDBAADEB:\ --45434453412074657374206D657373616765203230313130323135:\ --E1F6B207B4FC896879A51F65E85DB94CEB633FEC765739E689847D64:\ --A4C80AAF3D7B61200E66D6F41EC66D3D65E9E38DC06A88FE3B7F6C4C\ --8A5CEE4E04FE240464EA2DBB52489D3FAC1CDE6DA24A0E4C6598BCD2 -- --brainpool224r1:\ --47B5CCE9EED463CED28666DA57DA9D0A8BDD3F000CCFC0AE6054F1AD:\ --43727970746F2B2B20352E362E312045434453412074657374206D7367:\ --9E9D0C9E67FF5785C3AD89195567CD3990D54C628788F26DB926F5B6:\ --40369F41BD0D15C92DFB855779DBF439376FB6EDC4153E9B99019B79\ --40FEF076FC8D610EC12AFC9CC43A150BD0190E507622E6623906D6B8 -- - [ECDSA/EMSA1(SHA-256)] - secp256r1:\ - 368E89CC30AE7A3B4B4903C30C238C010257FE97DB85AF35982A7960A0DBD2F3:\ -@@ -4286,20 +4247,6 @@ C1DDAA59A4E0B5D95EB873C33BC465C6782EBF7B - A8369164EF54A67303760B77AA62C4DE8122396908EA5B06DBCC2BC48264C832\ - ADB3A8855019D5AFF789EC1F276AD38A03AAF41F88593B74E5CB9DF7E4BD4922 - --brainpool256r1:\ --4EC702404A8047A08206721DE33F02E1F06B14E09A5582171EA9BB8AB3C9BC14:\ --43727970746F2B2B20352E362E312045434453412074657374206D7367:\ --A9952A1B896FB2C2AEA88EA578E2A5323114978A765E03E397969DC0F282708C:\ --54F843E89B084EEE1CFFED09F222DF041CD46DB0C48833667BA0790ECD603089\ --5304039A927714E79E5FCDB1D043E093FD85C8DD98B835CD6C7BB492C05357E5 -- --brainpool256r1:\ --416D7FCEB966DF966CAE7BE2608C5C4D8939A7B5B3CF6D3E441A64886AC5FAD7:\ --43727970746F2B2B20352E362E312045434453412074657374206D7367:\ --A07978494C1B301C1E44467853CD367624549E0E9F5092C0100A53F877AD2EF6:\ --93935B733CCC6A8702191664346135D1D6320D86A2346DFCA41AEDFBC4260435\ --A4A9C66485C02BC2DCC858364173FAE00EA02529BA21B56BBBB2EAA4B811416D -- - [ECDSA/EMSA1(SHA-384)] - secp384r1:\ - 100CC52F0263DCB12FDB9E50D44A4C84831A98756265DF0CBFD092D27A739821\ -@@ -4321,54 +4268,6 @@ FF83C10E8D84777D17B724957B83E1500F578F10 - A34F66CA2AF31241FAF85AEE2528438DA6BED934D75ACCF2E41176D8B661AB58\ - B7B867D802C38B39E8227F9CF0865072D381948FFFF637D8FB9B37BEC6AE0772 - --brainpool384r1:\ --19AD48ECFB30F115AEF41CAFD29B265A586399C0F95166017AA7DB894413A2AE\ --821B7BE4F4E7B6BBC22A4E2EB1CC0865:\ --43727970746F2B2B20352E362E312045434453412074657374206D7367:\ --83928FD1219F1C6D5B128C0ECD2E39A83399CE609382D41890D43FD476318E0C\ --26264E98E0D5A0DBCC28A8C01C2D63D7:\ --4B800A206ED7807C0F15798509164709E94ED73B5E02B10D65F45B6C2B7FD694\ --37F3B5D1342DAF0988CA100B8875C739\ --2CFA819E10B76CFE12B2C6485D8326B66E6256CD2F4A6DFEB9B2B7BDD732EA9E\ --9D5398DDECCBEAAF3FD53D554AA1FADD -- --[ECDSA/EMSA1(SHA-512)] -- --secp521r1:\ --1511908E830069DAD59E8BA8F1BD4045612A4844805F61F7ECD92A1DEE1877B7\ --E62A57860314820C97FFC972732E3C4C0AE837103692E85B3A11B49EB3E20EF1599:\ --45434453412F53484128353132292074657374206D6573736167652032303131\ --30323135:\ --01C352020AAA6D14B6FC2B78FD46209A9EEF6A357CD8B5D53738E3D655FE7A80\ --8396E1DC5742058D05F2D76C8CBF4832BE0580A6FD7B4C7426656D17680DEAAEEEC2:\ --0138A515C79EECAAB50139FB5D9EF5A771CC1C0999F2E54B5A1A9370EA8ADCFD\ --DDD6E9933A39EDA0862F3ECAEBD49EA5ED58D93DA8F72B1CFB11E52A1528AEC8\ --63870060D717B29AD6D36DE953A4753FAC58629429EF4DD8F98B5A4F5504C5B2\ --29C23C609905632CD8D839DC472693698D7A149E8F3F17462F86BA0A7A895D80\ --583A46E9 -- --brainpool512r1:\ --1433AE89858BE7DD9346AF015FEC69F0556982FFEB9CCEF7FB1CE71155F7620C\ --ED4A6ACD0F35461A17C8370C4E600BECBACC0F7C1D2D1A2C00203A0E6626C21C:\ --43727970746F2B2B20352E362E312045434453412074657374206D7367:\ --AA72BC70ABD9E078DDE47F5440E75A93F136F6EAA5267F591E0D3F562DE48BD8\ --FED21B9E3F6F5560250566A00C7AAE7E57770BFC7D18A3E7750DC6C7083CC5B0:\ --A058CD406C7F2D87FBBDDDD1870C67D1ACBD222D45A929565101842EDFAEFB89\ --3CF07AD22CAC0F3350A7D1300741AB5ECE38498F196690CBCEDBF8C866995E5C\ --17F48EA66EB70ADE68F6C16103BE54DD004230270E1F8CAC2D6BD47F717C0D1B\ --1E335FA4AAA5212321EE93E55FED129D781912A0D87B78A5B569DA272B3C9469 -- --brainpool512r1:\ --83DBEFECAF8CFF78C575BE9659C1A104767979497AD9B589B1B13705C71F1DEF\ --AF5CA76C8700236CE2392268E0133CAADE358E3D4F2E64CB4AB8517079E3EFA0:\ --43727970746F2B2B20352E362E312045434453412074657374206D7367:\ --A110CC7BEF64F5C0349344025B97B151C735408BD2BC0D0CC4E54642EA0DF33E\ --829E85916086B51624B830BB2CDF53DAD9003A6D194115051139DBC3E81DF197:\ --3254388208915E0EEB99DA89AA198C6FDB1A31B21D3B69EF8EFE4848AE78C32A\ --4C489347510A9DD04125BBE95F847E14A2DF3267A0A6D1B5EC442B130C9B5DD1\ --924FCD9F365897570329BFEC41FBAF42961210F3FF850DE5736FFBAAB09C5C03\ --E0058BD51C8A8EF0FF221F31CF93FE59572ADA3CFEC7016085258A45D1E8544C -- - # ECC verification format is group name:public key:message:signature - [GOST_3410_VA/EMSA1(GOST-34.11)] - gost_256A:\ -diff -up Botan-1.10.5/src/libstate/policy.cpp.eccfix Botan-1.10.5/src/libstate/policy.cpp ---- Botan-1.10.5/src/libstate/policy.cpp.eccfix 2013-03-02 21:19:37.000000000 +0000 -+++ Botan-1.10.5/src/libstate/policy.cpp 2013-10-22 01:20:13.226546243 +0100 -@@ -210,6 +210,7 @@ void set_default_oids(Library_State& con - - /* ECC domain parameters */ - -+ /* Disabled. - add_oid(config, "1.3.132.0.6", "secp112r1"); - add_oid(config, "1.3.132.0.7", "secp112r2"); - add_oid(config, "1.3.132.0.8", "secp160r1"); -@@ -221,7 +222,9 @@ void set_default_oids(Library_State& con - add_oid(config, "1.3.132.0.31", "secp192k1"); - add_oid(config, "1.3.132.0.32", "secp224k1"); - add_oid(config, "1.3.132.0.33", "secp224r1"); -+ */ - add_oid(config, "1.3.132.0.34", "secp384r1"); -+ /* Disabled. - add_oid(config, "1.3.132.0.35", "secp521r1"); - - add_oid(config, "1.2.840.10045.3.1.1", "secp192r1"); -@@ -230,8 +233,10 @@ void set_default_oids(Library_State& con - add_oid(config, "1.2.840.10045.3.1.4", "x962_p239v1"); - add_oid(config, "1.2.840.10045.3.1.5", "x962_p239v2"); - add_oid(config, "1.2.840.10045.3.1.6", "x962_p239v3"); -+ */ - add_oid(config, "1.2.840.10045.3.1.7", "secp256r1"); - -+ /* Disabled. - add_oid(config, "1.3.36.3.3.2.8.1.1.1", "brainpool160r1"); - add_oid(config, "1.3.36.3.3.2.8.1.1.3", "brainpool192r1"); - add_oid(config, "1.3.36.3.3.2.8.1.1.5", "brainpool224r1"); -@@ -242,6 +247,7 @@ void set_default_oids(Library_State& con - - add_oid(config, "1.2.643.2.2.35.1", "gost_256A"); - add_oid(config, "1.2.643.2.2.36.0", "gost_256A"); -+ */ - - /* CVC */ - add_oid(config, "0.4.0.127.0.7.3.1.2.1", diff --git a/botan-1.8.15-fix-x509-dn-cmp.patch b/botan-1.8.15-fix-x509-dn-cmp.patch new file mode 100644 index 0000000..1757d23 --- /dev/null +++ b/botan-1.8.15-fix-x509-dn-cmp.patch @@ -0,0 +1,13 @@ +diff --git a/src/utils/parsing.cpp b/src/utils/parsing.cpp +index bdb9e79..3f56d12 100644 +--- a/src/utils/parsing.cpp ++++ b/src/utils/parsing.cpp +@@ -227,6 +227,8 @@ bool x500_name_cmp(const std::string& name1, const std::string& name2) + + if(p1 == name1.end() && p2 == name2.end()) + return true; ++ if(p1 == name1.end() || p2 == name2.end()) ++ return false; + } + + if(!Charset::caseless_cmp(*p1, *p2)) diff --git a/botan-1.8.15-soname.patch b/botan-1.8.15-soname.patch new file mode 100644 index 0000000..92621f0 --- /dev/null +++ b/botan-1.8.15-soname.patch @@ -0,0 +1,12 @@ +diff -up Botan-1.8.15/configure.py.orig Botan-1.8.15/configure.py +--- Botan-1.8.15/configure.py.orig 2016-02-13 17:52:52.000000000 +0100 ++++ Botan-1.8.15/configure.py 2016-02-13 19:42:13.768986406 +0100 +@@ -38,7 +38,7 @@ class BuildConfigurationInformation(obje + version_major = 1 + version_minor = 8 + version_patch = 15 +- version_so_patch = 13 ++ version_so_patch = 2 + version_suffix = '' + + version_string = '%d.%d.%d%s' % ( diff --git a/botan-boost_python.patch b/botan-boost_python.patch deleted file mode 100644 index ccc016b..0000000 --- a/botan-boost_python.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up Botan-1.10.13/src/build-data/makefile/python.in.orig Botan-1.10.13/src/build-data/makefile/python.in ---- Botan-1.10.13/src/build-data/makefile/python.in.orig 2016-04-28 15:27:08.000000000 +0200 -+++ Botan-1.10.13/src/build-data/makefile/python.in 2016-06-30 16:12:04.001859858 +0200 -@@ -15,13 +15,15 @@ BOTAN_PYTHON_MODDIR = %{python_obj_dir} - - PYTHON_OBJS = %{python_objs} - -+BOOST_PYTHON = boost_python -+ - all: $(BOTAN_PYTHON_MODDIR)/_botan.so - - %{python_build_cmds} - - $(BOTAN_PYTHON_MODDIR)/_botan.so: $(PYTHON_OBJS) - cp %{python_dir}/*.py $(BOTAN_PYTHON_MODDIR) -- $(CXX) -shared -Wl,-soname,$@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) $(LDFLAGS) -lbotan-$(SERIES) -lboost_python -o $@ -+ $(CXX) -shared -Wl,-soname,$@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) $(LDFLAGS) -lbotan-$(SERIES) -l$(BOOST_PYTHON) -o $@ - - clean: - rm -rf $(BOTAN_PYTHON_MODDIR)/* diff --git a/botan.spec b/botan.spec index 975d0a8..52f393e 100644 --- a/botan.spec +++ b/botan.spec @@ -1,45 +1,29 @@ -%global major_version 1.10 - Name: botan -Version: %{major_version}.17 -Release: 51%{?dist} +Version: 1.8.15 +Release: 2%{?dist} Summary: Crypto library written in C++ -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +Group: System Environment/Libraries +License: BSD URL: http://botan.randombit.net/ # tarfile is stripped using repack.sh. original tarfile to be found # here: http://botan.randombit.net/releases/Botan-%%{version}.tgz Source0: Botan-%{version}.stripped.tar.gz Source1: README.fedora -# Enable only cleared ECC algorithms -Patch0: botan-1.10.5-ecc-fix.patch -# Make boost_python selectable -Patch1: botan-boost_python.patch -# Fix wrong path -Patch2: botan-1.10.13-python-init.patch -# 2to3 doc/conf.py -Patch3: botan-1.10.17-doc-conf-2to3.patch -# Fix FTBFS -Patch4: botan-1.10.17-u64bit.patch -# Add RISC-V (riscv64) -# Upstream in later versions: -# https://github.com/randombit/botan/blob/master/src/build-data/arch/riscv64.txt -Patch9: Botan-1.10.17-add-riscv64.patch +# soname was changed unintentionally upstream, revert it. +Patch0: botan-1.8.15-soname.patch +# cherry-pick commit c9271016 from 1.10 branch: fix for CVE-2017-2801 +Patch1: botan-1.8.15-fix-x509-dn-cmp.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ -BuildRequires: python3 -BuildRequires: python3-devel -BuildRequires: python3-sphinx -BuildRequires: boost-devel +BuildRequires: python + BuildRequires: bzip2-devel BuildRequires: zlib-devel -BuildRequires: make +BuildRequires: gmp-devel +BuildRequires: openssl-devel -# do not check .so files in the python_sitelib directories -%global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so)$ - -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %description Botan is a BSD-licensed crypto library written in C++. It provides a @@ -52,435 +36,103 @@ flavor of the library. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: bzip2-devel Requires: zlib-devel +Requires: gmp-devel +Requires: openssl-devel + %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package doc -Summary: Documentation for %{name} -BuildArch: noarch - -%description doc -%{summary} - -This package contains HTML documentation for %{name}. - - -%package -n python3-%{name} -Summary: Python3 bindings for %{name} -%{?python_provide:%python_provide python3-%{name}} - -%description -n python3-%{name} -%{summary} - -This package contains the Python3 binding for %{name}. - -Note: The Python binding should be considered alpha software, and the -interfaces may change in the future. - - %prep %setup -q -n Botan-%{version} -%autosetup -p1 -n Botan-%{version} - -# These tests will fail. -rm -rf checks/ec_tests.cpp +%patch0 -p1 +%patch1 -p1 +cp -av %{SOURCE1} . %build - # we have the necessary prerequisites, so enable optional modules -%global enable_modules bzip2,zlib +%define enable_modules gnump,bzip2,zlib,openssl # fixme: maybe disable unix_procs, very slow. -%global disable_modules gnump +%define disable_modules %{nil} -%{__python3} ./configure.py \ +./configure.py \ --prefix=%{_prefix} \ --libdir=%{_lib} \ --cc=gcc \ --os=linux \ --cpu=%{_arch} \ --enable-modules=%{enable_modules} \ - --disable-modules=%{disable_modules} \ - --with-boost-python \ - --with-python-version=dummy.dummy \ - --with-sphinx + --disable-modules=%{disable_modules} # (ab)using CXX as an easy way to inject our CXXFLAGS -make CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} +make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} -make -f Makefile.python \ - CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ - PYTHON_INC="$(python3-config --includes)" \ - PYTHON_ROOT=. \ - BOOST_PYTHON=boost_python%{python3_version_nodots} %install +rm -rf %{buildroot} make install \ DESTDIR=%{buildroot}%{_prefix} \ - DOCDIR=%{buildroot}%{_pkgdocdir} \ + DOCDIR=_doc \ INSTALL_CMD_EXEC="install -p -m 755" \ - INSTALL_CMD_DATA="install -p -m 644" - -make -f Makefile.python install \ - PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python3_sitearch} + INSTALL_CMD_DATA="install -p -m 644" \ -# fixups -find doc/examples -type f -exec chmod -x {} \; -mv doc/examples/python doc/python2-examples -cp -a doc/{examples,python2-examples,license.txt} \ - %{buildroot}%{_pkgdocdir} -cp -a %{SOURCE1} %{buildroot}%{_pkgdocdir} -rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo} +%clean +rm -rf %{buildroot} -%ldconfig_post +%post -p /sbin/ldconfig -%ldconfig_postun +%postun -p /sbin/ldconfig %files -%dir %{_pkgdocdir} -%{_pkgdocdir}/readme.txt -%{_pkgdocdir}/README.fedora -%if 0%{?_licensedir:1} -%exclude %{_pkgdocdir}/license.txt -%license doc/license.txt -%else -%{_pkgdocdir}/license.txt -%endif # licensedir -%{_libdir}/libbotan-%{major_version}.so.* +%{_libdir}/libbotan*-*.so +%doc _doc/readme.txt _doc/log.txt _doc/thanks.txt _doc/credits.txt +%doc _doc/license.txt _doc/fips140.tex _doc/pgpkeys.asc +%doc README.fedora %files devel -%{_pkgdocdir}/examples -%{_bindir}/botan-config-%{major_version} +%doc doc/examples +%doc _doc/api* _doc/tutorial* +%{_bindir}/botan-config %{_includedir}/* -%exclude %{_libdir}/libbotan-%{major_version}.a -%{_libdir}/libbotan-%{major_version}.so -%{_libdir}/pkgconfig/botan-%{major_version}.pc - - -%files doc -%dir %{_pkgdocdir} -%{_pkgdocdir}/manual -# next files duplicated on purpose, because -doc doesn't depend on the -# main package -%{_pkgdocdir}/readme.txt -%{_pkgdocdir}/README.fedora -%if 0%{?_licensedir:1} -%exclude %{_pkgdocdir}/license.txt -%license doc/license.txt -%else -%{_pkgdocdir}/license.txt -%endif # licensedir -%{_pkgdocdir}/python2-examples - - -%files -n python3-%{name} -%{python3_sitearch}/%{name} +%exclude %{_libdir}/libbotan.a +%{_libdir}/libbotan.so +%{_libdir}/pkgconfig/botan-1.8.pc %check -make CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check +make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check # these checks would fail mv checks/validate.dat{,.orig} -awk '/\[.*\]/{f=0} /\[(RC5.*|RC6)\]/{f=1} (f && !/^#/){sub(/^/,"#")} {print}' \ +awk '/\[.*\]/{f=0} /\[(RC5.*|RC6|IDEA)\]/{f=1} (f && !/^#/){sub(/^/,"#")} {print}' \ checks/validate.dat.orig > checks/validate.dat LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog -* Mon Jan 12 2026 Jonathan Wakely - 1.10.17-51 -- Rebuilt for Boost 1.90 +* Tue Oct 3 2017 Thomas Moschny - 1.8.15-2 +- Patch to fix X509 DN comparisons. -* Fri Sep 19 2025 Python Maint - 1.10.17-50 -- Rebuilt for Python 3.14.0rc3 bytecode +* Sat Feb 13 2016 Thomas Moschny - 1.8.15-1 +- Update to 1.8.15. +- Remove patch applied upstream. +- Remove %%defattr directives. -* Fri Aug 15 2025 Python Maint - 1.10.17-49 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Wed Jul 23 2025 Fedora Release Engineering - 1.10.17-48 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 03 2025 Python Maint - 1.10.17-47 -- Rebuilt for Python 3.14 - -* Thu Jan 16 2025 Fedora Release Engineering - 1.10.17-46 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Aug 28 2024 Miroslav Suchý - 1.10.17-45 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 1.10.17-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jun 08 2024 Python Maint - 1.10.17-43 -- Rebuilt for Python 3.13 - -* Sat Feb 24 2024 David Abdurachmanov - 1.10.17-42 -- Add support for riscv64 - -* Tue Jan 23 2024 Fedora Release Engineering - 1.10.17-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.10.17-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jan 17 2024 Jonathan Wakely - 1.10.17-39 -- Rebuilt for Boost 1.83 - -* Wed Jul 19 2023 Fedora Release Engineering - 1.10.17-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jun 14 2023 Python Maint - 1.10.17-37 -- Rebuilt for Python 3.12 - -* Mon Feb 20 2023 Jonathan Wakely - 1.10.17-36 -- Rebuilt for Boost 1.81 - -* Sun Jan 22 2023 Thomas Moschny - 1.10.17-35 -- Add patch to fix FTBFS. - -* Wed Jan 18 2023 Fedora Release Engineering - 1.10.17-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.10.17-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jun 24 2022 Jonathan Wakely - .17-32 -- Replace obsolete boost-python3-devel build dependency (#2100748) - -* Mon Jun 13 2022 Python Maint - 1.10.17-31 -- Rebuilt for Python 3.11 - -* Wed May 04 2022 Thomas Rodgers - 1.10.17-30 -- Rebuilt for Boost 1.78 - -* Wed Jan 19 2022 Fedora Release Engineering - 1.10.17-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Sep 11 2021 Thomas Moschny - 1.10.17-28 -- Fix FTBFS on F35 and later. - -* Fri Aug 06 2021 Jonathan Wakely - 1.10.17-27 -- Rebuilt for Boost 1.76 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.10.17-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 1.10.17-25 -- Rebuilt for Python 3.10 - -* Tue Jan 26 2021 Fedora Release Engineering - 1.10.17-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 22 2021 Jonathan Wakely - 1.10.17-23 -- Rebuilt for Boost 1.75 - -* Thu Oct 01 2020 Jeff Law - 1.10.17-22 -- Re-enable LTO - -* Mon Aug 10 2020 Jeff Law - 1.10.17-21 -- Disable LTO on armv7hl for now. - -* Mon Jul 27 2020 Fedora Release Engineering - 1.10.17-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri May 29 2020 Jonathan Wakely - 1.10.17-19 -- Rebuilt for Boost 1.73 - -* Tue May 26 2020 Miro Hrončok - 1.10.17-18 -- Rebuilt for Python 3.9 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.10.17-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 1.10.17-16 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 1.10.17-15 -- Rebuilt for Python 3.8 - -* Wed Aug 14 2019 Thomas Moschny - 1.10.17-14 -- Remove dependency on OpenSSL (for F31+). - -* Wed Jul 24 2019 Fedora Release Engineering - 1.10.17-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.10.17-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 30 2019 Jonathan Wakely - 1.10.17-11 -- Use %%{python3_version_nodots} for Boost.Python library name - -* Tue Jan 29 2019 Jonathan Wakely - 1.10.17-11 -- Use boost_python37 for library name - -* Thu Jan 24 2019 Jonathan Wakely - 1.10.17-11 -- Rebuilt for Boost 1.69 - -* Tue Sep 18 2018 Miro Hrončok - 1.10.17-10 -- Remove Python 2 subpackage (#1627321) - -* Thu Jul 12 2018 Fedora Release Engineering - 1.10.17-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 02 2018 Miro Hrončok - 1.10.17-8 -- Rebuilt for Python 3.7 - -* Fri Jun 29 2018 Thomas Moschny - 1.10.17-7 -- Use ldconfig scriptlet macros. - -* Fri Jun 29 2018 Miro Hrončok - 1.10.17-6 -- Rebuilt for Python 3.7 - -* Thu Jun 28 2018 David Abdurachmanov - 1.10.17-5 -- Switch BR boost-python-devel to boost-python2-devel - -* Tue Jun 19 2018 Miro Hrončok - 1.10.17-4 -- Rebuilt for Python 3.7 - -* Wed Feb 07 2018 Fedora Release Engineering - 1.10.17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Jonathan Wakely - 1.10.17-2 -- Rebuilt for Boost 1.66 - -* Mon Oct 2 2017 Thomas Moschny - 1.10.17-1 -- Update to 1.10.17. -- Remove obsolete patches. - -* Fri Sep 08 2017 Troy Dawson - 1.10.16-2 -- Cleanup spec file conditionals - -* Sun Aug 13 2017 Thomas Moschny - 1.10.16-1 -- Update to 1.10.16. - -* Wed Aug 02 2017 Fedora Release Engineering - 1.10.14-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.10.14-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 03 2017 Jonathan Wakely - 1.10.14-8 -- Rebuilt for Boost 1.64 - -* Mon May 15 2017 Fedora Release Engineering - 1.10.14-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.10.14-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 1.10.14-5 -- Rebuilt for Boost 1.63 - -* Mon Dec 19 2016 Miro Hrončok - 1.10.14-4 -- Rebuild for Python 3.6 - -* Sat Dec 10 2016 Thomas Moschny - 1.10.14-3 -- Add -std=c++11 to the compilerflags (needed on EPEL7). - -* Fri Dec 9 2016 Thomas Moschny - 1.10.14-2 -- Update to 1.10.14. -- Depend on OpenSSL 1.0 compat package for F26+. - -* Tue Jul 19 2016 Fedora Release Engineering - 1.10.13-4 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Sun Jul 3 2016 Thomas Moschny - 1.10.13-3 -- Fix typo. - -* Sun Jul 3 2016 Thomas Moschny - 1.10.13-2 -- Provide python2- and python3- subpackages (rhbz#1313786). -- Move python examples to -doc subpackage. - -* Fri Apr 29 2016 Thomas Moschny - 1.10.13-1 -- Update to 1.10.13. - -* Mon Feb 8 2016 Thomas Moschny - 1.10.12-1 -- Update to 1.10.12. -- Mark license.txt with %%license. -- Change %%define -> %%global. - -* Wed Feb 03 2016 Fedora Release Engineering - 1.10.9-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jan 14 2016 Jonathan Wakely - 1.10.9-9 -- Rebuilt for Boost 1.60 - -* Thu Aug 27 2015 Jonathan Wakely - 1.10.9-8 -- Rebuilt for Boost 1.59 - -* Fri Jul 24 2015 David Tardon - 1.10.9-7 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 1.10.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Apr 23 2015 Thomas Moschny - 1.10.9-5 -- Rebuild for gcc5. - -* Fri Feb 6 2015 Thomas Moschny - 1.10.9-4 -- Re-enable cleared ECC. Patch by Tom Callaway . - -* Thu Feb 5 2015 Thomas Moschny - 1.10.9-3 -- Disable gmp engine (see bug 1116406). -- Use _pkgdocdir. - -* Thu Feb 5 2015 Thomas Moschny - 1.10.9-2 -- Remove workaround for bug 1186014. - -* Sat Jan 31 2015 Thomas Moschny - 1.10.9-1 -- Update to 1.10.9. - -* Fri Aug 15 2014 Fedora Release Engineering - 1.10.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.10.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat May 31 2014 Björn Esser - 1.10.8-5 -- rebuild for boost 1.55.0 (libboost_python.so.1.55.0) - -* Sun May 25 2014 Brent Baude - 1.10.8-4 -- Added ppc64le arch support - -* Fri May 23 2014 David Tardon - 1.10.8-3 -- rebuild for boost 1.55.0 - -* Mon May 12 2014 Marcin Juszkiewicz - 1.10.8-2 -- Added AArch64 architecture support - -* Sat May 10 2014 Thomas Moschny - 1.10.8-1 -- Update to 1.10.8. - -* Tue Sep 3 2013 Thomas Moschny - 1.10.5-4 -- Re-enable IDEA (rhbz#1003052) and SRP-6. - -* Sat Jul 27 2013 Petr Machata - 1.10.5-3 -- Rebuild for boost 1.54.0 - -* Fri Jul 26 2013 Thomas Moschny - 1.10.5-2 -- Rename the subpackage for the Python binding. - -* Fri Jul 26 2013 Thomas Moschny - 1.10.5-1 -- Update to 1.10.5. -- Modernize spec file. -- New -doc subpackage containing HTML documentation. -- Package Python binding. - -* Wed Feb 13 2013 Fedora Release Engineering - 1.8.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild +* Sat May 10 2014 Thomas Moschny - 1.8.14-2 +- Add patch to fix prime testing. * Sat Aug 25 2012 Thomas Moschny - 1.8.14-1 - Update to 1.8.14. diff --git a/repack.sh b/repack.sh index 05356a2..475c8b7 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -name=Botan-1.10.17 +name=Botan-1.8.15 src=${name}.tgz dst=${name}.stripped.tar.gz @@ -10,11 +10,14 @@ cp -av ${src} ${dst} gzip -d ${dst} tar --delete --file=${dst%.gz} \ + ${name}/src/block/idea \ ${name}/src/block/rc6 \ ${name}/src/block/rc5 \ - ${name}/src/pubkey/gost_3410 - + ${name}/src/math/gfpmath \ + ${name}/src/pubkey/ec_dompar \ + ${name}/src/pubkey/ecc_key \ + ${name}/src/pubkey/ecdsa \ + ${name}/src/pubkey/eckaeg touch -m -r ${src} ${dst%.gz} gzip ${dst%.gz} - diff --git a/sources b/sources index 236fef4..cdf2878 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Botan-1.10.17.stripped.tar.gz) = 9fc356ae042af56667ceb8430006658fe8a0c8ef2d00eb1961645bf3082e41c6850a781cc0e0672d68da1e9094532018a51465e5b2e84115c9f0af75910a9eac +9206a5cb467cd9c8f81be72a52a2d4f8 Botan-1.8.15.stripped.tar.gz