diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-20 11:51:06 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-03-22 21:57:26 -0400 |
commit | b9b6a7e5dc01bb95fad9008e33e5b7455a48b217 (patch) | |
tree | 2d53836a2b53174629e9e47b711fcccc1631fc17 /doc/ssl | |
parent | 88a9614ba30e2d1f5b1b14df5814b824190d46f8 (diff) |
Correct another batch of typos
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'doc/ssl')
-rw-r--r-- | doc/ssl/SSL_CTX_dane_enable.pod | 2 | ||||
-rw-r--r-- | doc/ssl/SSL_CTX_free.pod | 3 | ||||
-rw-r--r-- | doc/ssl/SSL_CTX_set_cipher_list.pod | 2 | ||||
-rw-r--r-- | doc/ssl/SSL_CTX_set_psk_client_callback.pod | 2 | ||||
-rw-r--r-- | doc/ssl/SSL_CTX_set_security_level.pod | 2 | ||||
-rw-r--r-- | doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod | 2 | ||||
-rw-r--r-- | doc/ssl/ssl.pod | 2 |
7 files changed, 7 insertions, 8 deletions
diff --git a/doc/ssl/SSL_CTX_dane_enable.pod b/doc/ssl/SSL_CTX_dane_enable.pod index 36e969950b..f2cb99ed42 100644 --- a/doc/ssl/SSL_CTX_dane_enable.pod +++ b/doc/ssl/SSL_CTX_dane_enable.pod @@ -36,7 +36,7 @@ applications that override L<X509_verify_cert(3)> via L<SSL_CTX_set_cert_verify_callback(3)> are responsible to authenticate the peer chain in whatever manner they see fit. -SSL_CTX_dane_mtype_set() may then be called zero or more times to to adjust the +SSL_CTX_dane_mtype_set() may then be called zero or more times to adjust the supported digest algorithms. This must be done before any SSL handles are created for the context. diff --git a/doc/ssl/SSL_CTX_free.pod b/doc/ssl/SSL_CTX_free.pod index 22ce5505dc..70a63142a0 100644 --- a/doc/ssl/SSL_CTX_free.pod +++ b/doc/ssl/SSL_CTX_free.pod @@ -13,8 +13,7 @@ SSL_CTX_free - free an allocated SSL_CTX object =head1 DESCRIPTION SSL_CTX_free() decrements the reference count of B<ctx>, and removes the -SSL_CTX object pointed to by B<ctx> and frees up the allocated memory if the -the reference count has reached 0. +SSL_CTX object pointed to by B<ctx> and frees up the allocated memory if the reference count has reached 0. It also calls the free()ing procedures for indirectly affected items, if applicable: the session cache, the list of ciphers, the list of Client CAs, diff --git a/doc/ssl/SSL_CTX_set_cipher_list.pod b/doc/ssl/SSL_CTX_set_cipher_list.pod index 338323290e..512ca81747 100644 --- a/doc/ssl/SSL_CTX_set_cipher_list.pod +++ b/doc/ssl/SSL_CTX_set_cipher_list.pod @@ -45,7 +45,7 @@ DSA ciphers always use DH key exchange and therefore need DH-parameters (see L<SSL_CTX_set_tmp_dh_callback(3)>). When these conditions are not met for any cipher in the list (e.g. a -client only supports export RSA ciphers with a asymmetric key length +client only supports export RSA ciphers with an asymmetric key length of 512 bits and the server is not configured to use temporary RSA keys), the "no shared cipher" (SSL_R_NO_SHARED_CIPHER) error is generated and the handshake will fail. diff --git a/doc/ssl/SSL_CTX_set_psk_client_callback.pod b/doc/ssl/SSL_CTX_set_psk_client_callback.pod index 573f89a922..b7f574bddf 100644 --- a/doc/ssl/SSL_CTX_set_psk_client_callback.pod +++ b/doc/ssl/SSL_CTX_set_psk_client_callback.pod @@ -59,7 +59,7 @@ The callback is set using functions SSL_CTX_set_psk_client_callback() or SSL_set_psk_client_callback(). The callback function is given the connection in parameter B<ssl>, a B<NULL>-terminated PSK identity hint sent by the server in parameter B<hint>, a buffer B<identity> of -length B<max_identity_len> bytes where the the resulting +length B<max_identity_len> bytes where the resulting B<NULL>-terminated identity is to be stored, and a buffer B<psk> of length B<max_psk_len> bytes where the resulting pre-shared key is to be stored. diff --git a/doc/ssl/SSL_CTX_set_security_level.pod b/doc/ssl/SSL_CTX_set_security_level.pod index fd50614b7d..2b56472457 100644 --- a/doc/ssl/SSL_CTX_set_security_level.pod +++ b/doc/ssl/SSL_CTX_set_security_level.pod @@ -54,7 +54,7 @@ application specific value. =head1 DEFAULT CALLBACK BEHAVIOUR -If an application doesn't set it's own security callback the default +If an application doesn't set its own security callback the default callback is used. It is intended to provide sane defaults. The meaning of each level is described below. diff --git a/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod b/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod index b660b21a9a..3502c1cd29 100644 --- a/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod +++ b/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod @@ -90,7 +90,7 @@ continue on those parameters. =item Z<>0 This indicates that it was not possible to set/retrieve a session ticket and -the SSL/TLS session will continue by by negotiating a set of cryptographic +the SSL/TLS session will continue by negotiating a set of cryptographic parameters or using the alternate SSL/TLS resumption mechanism, session ids. If called with enc equal to 0 the library will call the I<cb> again to get diff --git a/doc/ssl/ssl.pod b/doc/ssl/ssl.pod index b6d3334f5f..c875163248 100644 --- a/doc/ssl/ssl.pod +++ b/doc/ssl/ssl.pod @@ -76,7 +76,7 @@ links to mostly all other structures. =head1 HEADER FILES Currently the OpenSSL B<ssl> library provides the following C header files -containing the prototypes for the data structures and and functions: +containing the prototypes for the data structures and functions: =over 4 |