Consolidate the useful stuff from doc/info.txt into readme.txt

3 files changed, 34 insertions, 72 deletions

diff --git a/configure.pl b/configure.pl
index 31ad83859..d15115004 100755
--- a/configure.pl
+++ b/configure.pl
@@ -25,7 +25,7 @@ my (%CPU, %OPERATING_SYSTEM, %COMPILER, %MODULES);
 my @DOCS = (
    'api.pdf', 'tutorial.pdf', 'fips140.pdf',
    'api.tex', 'tutorial.tex', 'fips140.tex',
-   'credits.txt', 'info.txt', 'license.txt', 'log.txt',
+   'credits.txt', 'license.txt', 'log.txt',
    'thanks.txt', 'todo.txt', 'pgpkeys.asc');
 
 my $TRACING = 0;
diff --git a/doc/info.txt b/doc/info.txt
deleted file mode 100644
index 8d37a0f2d..000000000
--- a/doc/info.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-
-Botan is a C++ class library for performing a wide variety of
-cryptographic operations. It includes support for the following
-algorithms and formats:
-
-Public Key Algorithms
-  * Encryption algorithms RSA, ElGamal, DLIES
-       (padding schemes OAEP, PKCS #1 v1.5)
-  * Signature algorithms RSA, DSA, ECDSA, Nyberg-Rueppel, Rabin-Williams
-       (padding schemes PSS, PKCS #1 v1.5, X9.31)
-  * Key agreement techniques Diffie-Hellman and ECKAEG (ECDH)
-
-Ciphers
-  * Block cipher modes ECB, CBC, CBC/CTS, CFB, OFB, and CTR,
-       and authenticated cipher mode EAX
-  * AES (Rijndael) and AES candidates Serpent, Twofish, MARS, CAST-256, RC6
-  * DES, and variants 3DES and DESX
-  * Stream ciphers ARC4, Salsa20, Turing, and WiderWake4+1
-  * National/telecom block ciphers SEED, KASUMI, MISTY1, GOST, and Skipjack
-  * Other block ciphers including Blowfish, CAST-128, IDEA, Noekeon,
-       TEA, XTEA, RC2, RC5, SAFER-SK, and Square
-  * Block cipher constructions Luby-Rackoff and Lion
-
-Hash Functions and MACs
-  * Authentication codes HMAC, CMAC (aka OMAC1), CBC-MAC, ANSI X9.19 DES-MAC,
-       and the protocol-specific SSLv3 authentication code
-  * Secure hashes SHA-224, SHA-256, SHA-384, SHA-512, Whirlpool
-  * Transition hashes SHA-1, Tiger, RIPEMD-160, RIPEMD-128, HAS-160, FORK-256
-  * Obsolete/broken hashes MD2, MD4, MD5
-  * Checksums Adler32, CRC24, CRC32
-
-Certificates
-  * X.509 certificates (including generating new self-signed and CA certs)
-  * X.509 CRLs
-  * PKCS #10 certificate requests
-  * Card Verifiable Certificates (used in ePassports)
-
-PBKDFs, KDFs, and PRFs
-  * PBKDF1 from PKCS #5 v1.5
-  * PBKDF2 from PKCS #5 v2.0
-  * OpenPGP S2K (string to key) from RFC 2440
-  * KDF1 and KDF2 from IEEE 1363
-  * PRFs from ANSI X9.42, SSL v3.0, TLS v1.0
-
-For build instructions, read 'doc/building.pdf'. The license can be
-found in 'doc/license.txt', and the ChangeLog is in 'doc/log.txt'.
-
-Higher level protocols are implemented on top of Botan by:
-
-NetSieben SSH Library (SSHv2): http://www.netsieben.com/products/ssh/
-Ajisai (SSLv3/TLSv1): http://www.randombit.net/code/ajisai/
-
-Check http://botan.randombit.net/ for announcements and news. If
-you'll be developing code using Botan, consider joining the mailing
-lists; links to subscriptions forms and the archives can be found on
-the web page. Feel free to contact me with any questions or comments.
-
-Many people have contributed to Botan. They are listed in the files
-license.txt, credits.txt, and thanks.txt, all of which are included in
-the Botan source distribution.
-
-Regards,
-   Jack Lloyd ([email protected])
diff --git a/readme.txt b/readme.txt
index a8b06f389..d3cd3ff33 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,16 +1,41 @@
-Botan 1.7.24-pre ????-??-??
+Botan 1.7.24 2008-12-01
 http://botan.randombit.net/
 
-This is the third release candidate of Botan 1.8.0. We consider it the
+Botan is a C++ class library for performing a wide variety of
+cryptographic operations.
+
+This is the third release candidate for Botan 1.8.0. I consider it the
 best version of Botan available, and recommend all users upgrade from
 1.6 or earlier versions as soon as possible. Some APIs have changed
 incompatibly since the 1.6 release series, but most applications
 should work as-is or with only simple modifications.
 
-You can file bugs in Bugzilla (http://www.randombit.net/bugzilla) or
-by sending a report to the botan-devel mailing list
-(http://lists.randombit.net/mailman/listinfo/botan-devel)
+Botan is licensed under a BSD-like license, the terms of which are
+specified in 'doc/license.txt'. More information about the authors and
+contributors can be found in 'doc/credits.txt' and 'doc/thanks.txt'
+
+You can file bugs in Bugzilla, which can be accessed at
+  http://www.randombit.net/bugzilla/
+or by sending a report to the botan-devel mailing list
+  http://lists.randombit.net/mailman/listinfo/botan-devel/
+
+In the doc directory, there should be a set of PDFs, including
+
+building.pdf - Build instructions
+api.pdf - API reference manual
+tutorial.pdf - A set of simple examples and tutorials
+
+Other examples can be found in the doc/examples directory.
+
+Some higher level protocols are implemented on top of Botan by:
+
+NetSieben SSH Library (SSHv2): http://www.netsieben.com/products/ssh/
+Ajisai (SSLv3/TLSv1): http://www.randombit.net/code/ajisai/
+
+Check http://botan.randombit.net/ for announcements and new
+releases. If you'll be developing code using Botan, consider joining
+the mailing lists. And feel free to contact me with any questions or
+comments.
 
-For more information, see info.txt, the build instructions, the API
-reference manual, and the tutorial, all of which can be found in the
-doc/ directory.
+Regards,
+   Jack Lloyd ([email protected])