diff options
Diffstat (limited to 'doc/manual')
-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 |
5 files changed, 9 insertions, 9 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 |