diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual/pubkey.rst | 10 | ||||
| -rw-r--r-- | doc/manual/python.rst | 2 | ||||
| -rw-r--r-- | doc/manual/secmem.rst | 2 | ||||
| -rw-r--r-- | doc/manual/tls.rst | 2 | ||||
| -rw-r--r-- | doc/manual/x509.rst | 2 | ||||
| -rw-r--r-- | doc/news.rst | 26 |
6 files changed, 22 insertions, 22 deletions
diff --git a/doc/manual/pubkey.rst b/doc/manual/pubkey.rst index efeea692c..1b3ed305a 100644 --- a/doc/manual/pubkey.rst +++ b/doc/manual/pubkey.rst @@ -66,7 +66,7 @@ Nyberg-Rueppel key pairs with .. cpp:function:: ElGamal_PrivateKey::ElGamal_PrivateKey(RandomNumberGenerator& rng, \ const DL_Group& group, const BigInt& x = 0) - The optional *x* parameter to each of these contructors is a private key + The optional *x* parameter to each of these constructors is a private key value. This allows you to create keys where the private key is formed by some special technique; for instance you can use the hash of a password (see :ref:`pbkdf` for how to do that) as a private key value. Normally, you would @@ -162,7 +162,7 @@ decrypt, if necessary) a PKCS #8 private key: These functions will return an object allocated key object based on the data from whatever source it is using (assuming, of course, the source is in fact storing a representation of a private key, and the decryption was -sucessful). The encoding used (PEM or BER) need not be specified; the format +successful). The encoding used (PEM or BER) need not be specified; the format will be detected automatically. The key is allocated with ``new``, and should be released with ``delete`` when you are done with it. The first takes a generic ``DataSource`` that you have to create - the other is a simple wrapper @@ -286,7 +286,7 @@ where *format* is any of * ``ANSI_X9_42`` (or ``DH_PARAMETERS``) for modp groups * ``ANSI_X9_57`` (or ``DSA_PARAMETERS``) for DSA-style groups * ``PKCS_3`` is an older format for modp groups; it should only - be used for backwards compatability. + be used for backwards compatibility. You can reload a serialized group using @@ -366,7 +366,7 @@ these use the EME class: method to use is specified in *eme*. The recommended values for *eme* is "EME1(SHA-1)" or "EME1(SHA-256)". If - you need compatability with protocols using the PKCS #1 v1.5 standard, + you need compatibility with protocols using the PKCS #1 v1.5 standard, you can also use "EME-PKCS1-v1_5". .. cpp:class:: DLIES_Encryptor @@ -409,7 +409,7 @@ Signature generation is performed using fail. Raw is not useful except in very specialized applications. Examples are "EMSA1(SHA-1)" and "EMSA4(SHA-256)". - For RSA, use EMSA4 (also called PSS) unless you need compatability with + For RSA, use EMSA4 (also called PSS) unless you need compatibility with software that uses the older PKCS #1 v1.5 standard, in which case use EMSA3 (also called "EMSA-PKCS1-v1_5"). For DSA, ECDSA, GOST 34.10-2001, and Nyberg-Rueppel, you should use EMSA1. diff --git a/doc/manual/python.rst b/doc/manual/python.rst index eb625f24a..a00aabd5e 100644 --- a/doc/manual/python.rst +++ b/doc/manual/python.rst @@ -190,7 +190,7 @@ Public Key .. py:class:: private_key(algo, param, rng) - Constructor creates a new private key. The paramater type/value + Constructor creates a new private key. The parameter type/value depends on the algorithm. For "rsa" is is the size of the key in bits. For "ecdsa" and "ecdh" it is a group name (for instance "secp256r1"). For "ecdh" there is also a special case for group diff --git a/doc/manual/secmem.rst b/doc/manual/secmem.rst index 76751bb40..ce5ff205b 100644 --- a/doc/manual/secmem.rst +++ b/doc/manual/secmem.rst @@ -14,7 +14,7 @@ allocator, it has an identical API to the ``std::vector`` you know and love. Some operating systems offer the ability to lock memory into RAM, -preventing swapping from occuring. Typically this operation is +preventing swapping from occurring. Typically this operation is restricted to privledged users (root or admin), however some OSes including Linux and FreeBSD allow normal users to lock a small amount of memory. On these systems, allocations first attempt to allocate out diff --git a/doc/manual/tls.rst b/doc/manual/tls.rst index 26ac6a801..554846c25 100644 --- a/doc/manual/tls.rst +++ b/doc/manual/tls.rst @@ -497,7 +497,7 @@ TLS Policies ``TLS::Policy`` is how an application can control details of what will be negotiated during a handshake. The base class acts as the default policy. There is also a ``Strict_Policy`` (which forces only secure -options, reducing compatability) and ``Text_Policy`` which reads +options, reducing compatibility) and ``Text_Policy`` which reads policy settings from a file. .. cpp:class:: TLS::Policy diff --git a/doc/manual/x509.rst b/doc/manual/x509.rst index 211ccbaf9..d4500d692 100644 --- a/doc/manual/x509.rst +++ b/doc/manual/x509.rst @@ -276,7 +276,7 @@ The result of the validation is returned as a class: .. cpp:function:: Certificate_Status_Code result() const - Returns the 'worst' error that occured during validation. For + Returns the 'worst' error that occurred during validation. For instance, we do not want an expired certificate with an invalid signature to be reported to the user as being simply expired (a relativly innocuous and common error) when the signature isn't diff --git a/doc/news.rst b/doc/news.rst index 41277760a..144641913 100644 --- a/doc/news.rst +++ b/doc/news.rst @@ -27,7 +27,7 @@ Version 1.11.18, 2015-07-05 analysis tools. From Simon Warta and Daniel Seither. GH #125 * Several incorrect or missing module dependencies have been fixed. These - often prevented a succesful build of a minimized amalgamation when + often prevented a successful build of a minimized amalgamation when only a small set of algorithms were specified. GH #71 From Simon Warta. @@ -370,7 +370,7 @@ Version 1.11.10, 2014-12-10 willing to accept. * PKCS #8 private keys can now be encrypted using GCM mode instead of - unauthenticated CBC. The default remains CBC for compatability. + unauthenticated CBC. The default remains CBC for compatibility. * The default PKCS #8 encryption scheme has changed to use PBKDF2 with SHA-256 instead of SHA-1 @@ -491,7 +491,7 @@ Version 1.11.8, 2014-02-13 * A bug in CFB encryption caused a few bytes past the end of the final block to be read. The actual output was not affected. -* Fix compilation errors in the tests that occured with minimized +* Fix compilation errors in the tests that occurred with minimized builds. Contributed by Markus Wanner. * Add a new ``--destdir`` option to ``configure.py`` which controls @@ -568,13 +568,13 @@ Version 1.10.6, 2013-11-10 * The device reading entropy source now attempts to read from all available devices. Previously it would break out early if a partial - read from a blocking source occured, not continuing to read from a + read from a blocking source occurred, not continuing to read from a non-blocking device. This would cause the library to fall back on slower and less reliable techniques for collecting PRNG seed material. Reported by Rickard Bellgrim. * HMAC_RNG (the default PRNG implementation) now automatically reseeds - itself periodically. Previously reseeds only occured on explicit + itself periodically. Previously reseeds only occurred on explicit application request. * Fix an encoding error in EC_Group when encoding using EC_DOMPAR_ENC_OID. @@ -746,7 +746,7 @@ Version 1.10.5, 2013-03-02 * Use correct flags for creating a shared library on OS X under Clang. -* Fix a compile time incompatability with Visual C++ 2012. +* Fix a compile time incompatibility with Visual C++ 2012. Version 1.11.2, 2013-03-02 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -930,7 +930,7 @@ of OpenSSL use these fields. Now these fields are decoded properly, and if the public key value is included it is used, as otherwise the public key needs to be rederived from the private key. However the library does not include these fields on encoding keys for -compatability with software that does not expect them (including older +compatibility with software that does not expect them (including older versions of botan). Version 1.8.14, 2012-07-18 @@ -1020,7 +1020,7 @@ A bug in configure.py would cause it to interpret ``--cpu=s390x`` as searches for an exact match, and only if no exact match is found will it search for substring matches. -An incompatability in configure.py with the subprocess module included +An incompatibility in configure.py with the subprocess module included in Python 3.1 has been fixed (Bugzilla 157). The exception catching syntax of configure.py has been changed to the @@ -1218,7 +1218,7 @@ Version 1.9.16, 2011-04-11 expanded. * The class ``EC_Domain_Params`` has been renamed ``EC_Group``, with a - typedef for backwards compatability. + typedef for backwards compatibility. * The ``EC_Group`` string constructor didn't understand the standard names like "secp160r1", forcing use of the OIDs. @@ -1242,7 +1242,7 @@ Version 1.9.16, 2011-04-11 conventions. Instead of ``libbotan-X.Y.Z.so``, the shared lib is named ``libbotan-X.Y.so.Z``; this allows the runtime linker to do its runtime linky magic. It can be safely presumed that any change - in the major or minor version indicates ABI incompatability. + in the major or minor version indicates ABI incompatibility. * Remove the socket wrapper code; it was not actually used by anything in the library, only in the examples, and you can use whatever kind @@ -1340,7 +1340,7 @@ Version 1.9.11, 2010-11-29 it to a client or server object. Please remember that the TLS interface/API is currently unstable and will very likely change further before TLS is included in a stable release. A handshake - failure that occured when RC4 was negotiated has also been fixed. + failure that occurred when RC4 was negotiated has also been fixed. * Some possible timing channels in the implementations of Montgomery reduction and the IDEA key schedule were removed. The table-based @@ -1381,7 +1381,7 @@ Version 1.8.11, 2010-11-02 * Fix a number of CRL encoding and decoding bugs * When building a debug library under VC++, use the debug runtime * Fix compilation under Sun Studio on Linux and Solaris -* Add several functions for compatability with 1.9 +* Add several functions for compatibility with 1.9 * In the examples, read most input files as binary * The Perl build script has been removed in this release @@ -1391,7 +1391,7 @@ Version 1.8.10, 2010-08-31 * Switch default PKCS #8 encryption algorithm from 3DES to AES-256 * Increase default hash iterations from 2048 to 10000 in PBES1 and PBES2 * Use small tables in the first round of AES -* Add PBKDF typedef and get_pbkdf for better compatability with 1.9 +* Add PBKDF typedef and get_pbkdf for better compatibility with 1.9 * Add version of S2K::derive_key taking salt and iteration count * Enable the /proc-walking entropy source on NetBSD * Fix the doxygen makefile target |