The unified diff between revisions [75daca8d..] and [08eaf28d..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'def_alg.cpp'

#
#
# patch "def_alg.cpp"
#  from [a8ebcb2f7ba526363417c2cebe88eee6db32b0e0]
#    to [20b41dbd1ebe04bc807d3bfce084934ee98149d4]
#
============================================================
--- def_alg.cpp	a8ebcb2f7ba526363417c2cebe88eee6db32b0e0
+++ def_alg.cpp	20b41dbd1ebe04bc807d3bfce084934ee98149d4
@@ -8,56 +8,17 @@
 #include <botan/parsing.h>

 #include <botan/aes.h>
-#include <botan/blowfish.h>
-#include <botan/cast128.h>
-#include <botan/cast256.h>
 #include <botan/des.h>
-#include <botan/gost.h>
-#include <botan/idea.h>
-#include <botan/kasumi.h>
-#include <botan/lion.h>
-#include <botan/lubyrack.h>
-#include <botan/mars.h>
-#include <botan/misty1.h>
-#include <botan/rc2.h>
-#include <botan/rc5.h>
-#include <botan/rc6.h>
-#include <botan/safer_sk.h>
-#include <botan/seed.h>
-#include <botan/serpent.h>
-#include <botan/skipjack.h>
-#include <botan/square.h>
-#include <botan/tea.h>
-#include <botan/twofish.h>
-#include <botan/xtea.h>

 #include <botan/arc4.h>
-#include <botan/turing.h>
-#include <botan/wid_wake.h>

-#include <botan/adler32.h>
-#include <botan/crc24.h>
 #include <botan/crc32.h>
-#include <botan/fork256.h>
-#include <botan/has160.h>
-#include <botan/md2.h>
-#include <botan/md4.h>
-#include <botan/md5.h>
-#include <botan/rmd128.h>
-#include <botan/rmd160.h>
 #include <botan/sha160.h>
 #include <botan/sha256.h>
-#include <botan/sha_64.h>
-#include <botan/tiger.h>
-#include <botan/whrlpool.h>
-#include <botan/par_hash.h>

-#include <botan/cmac.h>
 #include <botan/hmac.h>
-#include <botan/x919_mac.h>

 #include <botan/mode_pad.h>
-#include <botan/pgp_s2k.h>
 #include <botan/pkcs5.h>

 namespace Botan {
@@ -118,36 +79,10 @@ Default_Engine::find_block_cipher(const
    HANDLE_TYPE_NO_ARGS("AES-128", AES_128);
    HANDLE_TYPE_NO_ARGS("AES-192", AES_192);
    HANDLE_TYPE_NO_ARGS("AES-256", AES_256);
-   HANDLE_TYPE_NO_ARGS("Blowfish", Blowfish);
-   HANDLE_TYPE_NO_ARGS("CAST-128", CAST_128);
-   HANDLE_TYPE_NO_ARGS("CAST-256", CAST_256);
    HANDLE_TYPE_NO_ARGS("DES", DES);
    HANDLE_TYPE_NO_ARGS("DESX", DESX);
    HANDLE_TYPE_NO_ARGS("TripleDES", TripleDES);
-   HANDLE_TYPE_NO_ARGS("GOST", GOST);
-   HANDLE_TYPE_NO_ARGS("IDEA", IDEA);
-   HANDLE_TYPE_NO_ARGS("KASUMI", KASUMI);
-   HANDLE_TYPE_ONE_STRING("Luby-Rackoff", LubyRackoff);
-   HANDLE_TYPE_NO_ARGS("MARS", MARS);
-   HANDLE_TYPE_ONE_U32BIT("MISTY1", MISTY1, 8);
-   HANDLE_TYPE_NO_ARGS("RC2", RC2);
-   HANDLE_TYPE_ONE_U32BIT("RC5", RC5, 12);
-   HANDLE_TYPE_NO_ARGS("RC6", RC6);
-   HANDLE_TYPE_ONE_U32BIT("SAFER-SK", SAFER_SK, 10);
-   HANDLE_TYPE_NO_ARGS("SEED", SEED);
-   HANDLE_TYPE_NO_ARGS("Serpent", Serpent);
-   HANDLE_TYPE_NO_ARGS("Skipjack", Skipjack);
-   HANDLE_TYPE_NO_ARGS("Square", Square);
-   HANDLE_TYPE_NO_ARGS("TEA", TEA);
-   HANDLE_TYPE_NO_ARGS("Twofish", Twofish);
-   HANDLE_TYPE_NO_ARGS("XTEA", XTEA);

-   if(algo_name == "Lion")
-      {
-      if(name.size() != 4)
-         throw Invalid_Algorithm_Name(algo_spec);
-      return new Lion(name[1], name[2], to_u32bit(name[3]));
-      }
    return 0;
    }

@@ -164,8 +99,6 @@ Default_Engine::find_stream_cipher(const

    HANDLE_TYPE_ONE_U32BIT("ARC4", ARC4, 0);
    HANDLE_TYPE_ONE_U32BIT("RC4_drop", ARC4, 768);
-   HANDLE_TYPE_NO_ARGS("Turing", Turing);
-   HANDLE_TYPE_NO_ARGS("WiderWake4+1-BE", WiderWake_41_BE);

    return 0;
    }
@@ -181,30 +114,9 @@ Default_Engine::find_hash(const std::str
       return 0;
    const std::string algo_name = deref_alias(name[0]);

-   HANDLE_TYPE_NO_ARGS("Adler32", Adler32);
-   HANDLE_TYPE_NO_ARGS("CRC24", CRC24);
    HANDLE_TYPE_NO_ARGS("CRC32", CRC32);
-   HANDLE_TYPE_NO_ARGS("FORK-256", FORK_256);
-   HANDLE_TYPE_NO_ARGS("HAS-160", HAS_160);
-   HANDLE_TYPE_NO_ARGS("MD2", MD2);
-   HANDLE_TYPE_NO_ARGS("MD4", MD4);
-   HANDLE_TYPE_NO_ARGS("MD5", MD5);
-   HANDLE_TYPE_NO_ARGS("RIPEMD-128", RIPEMD_128);
-   HANDLE_TYPE_NO_ARGS("RIPEMD-160", RIPEMD_160);
    HANDLE_TYPE_NO_ARGS("SHA-160", SHA_160);
    HANDLE_TYPE_NO_ARGS("SHA-256", SHA_256);
-   HANDLE_TYPE_NO_ARGS("SHA-384", SHA_384);
-   HANDLE_TYPE_NO_ARGS("SHA-512", SHA_512);
-   HANDLE_TYPE_TWO_U32BIT("Tiger", Tiger, 24);
-   HANDLE_TYPE_NO_ARGS("Whirlpool", Whirlpool);
-
-   if(algo_name == "Parallel")
-      {
-      if(name.size() < 2)
-         throw Invalid_Algorithm_Name(algo_spec);
-      name.erase(name.begin());
-      return new Parallel(name);
-      }
    return 0;
    }

@@ -219,9 +131,7 @@ Default_Engine::find_mac(const std::stri
       return 0;
    const std::string algo_name = deref_alias(name[0]);

-   HANDLE_TYPE_ONE_STRING("CMAC", CMAC);
    HANDLE_TYPE_ONE_STRING("HMAC", HMAC);
-   HANDLE_TYPE_NO_ARGS("X9.19-MAC", ANSI_X919_MAC);

    return 0;
    }
@@ -239,7 +149,6 @@ S2K* Default_Engine::find_s2k(const std:

    HANDLE_TYPE_ONE_STRING("PBKDF1", PKCS5_PBKDF1);
    HANDLE_TYPE_ONE_STRING("PBKDF2", PKCS5_PBKDF2);
-   HANDLE_TYPE_ONE_STRING("OpenPGP-S2K", OpenPGP_S2K);

    return 0;
    }