summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjim <>2014-05-04 21:08:16 +0000
committerjim <>2014-05-04 21:08:16 +0000
commite8801f3f365431a170f57db622a9de49fcc59e24 (patch)
tree9c08d504e67eddb5214e83ef60b6e566cbdf4826 /src/lib
parent61df790e430460904e1b4c6e993ebab89c737ad8 (diff)
downloadopenbsd-e8801f3f365431a170f57db622a9de49fcc59e24.tar.gz
openbsd-e8801f3f365431a170f57db622a9de49fcc59e24.tar.bz2
openbsd-e8801f3f365431a170f57db622a9de49fcc59e24.zip
Remove trailing whitespace.
ok jmc@
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/src/doc/ssl/BIO_f_ssl.pod12
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_add_session.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_flush_sessions.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_verify_callback.pod4
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_CA_list.pod4
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_set_mode.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_set_options.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_cache_mode.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_set_verify.pod4
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.pod8
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_accept.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_alert_type_string.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_connect.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_get_client_CA_list.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_get_current_cipher.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_library_init.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_load_client_CA_file.pod2
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_read.pod4
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_shutdown.pod4
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_write.pod4
22 files changed, 36 insertions, 36 deletions
diff --git a/src/lib/libssl/src/doc/ssl/BIO_f_ssl.pod b/src/lib/libssl/src/doc/ssl/BIO_f_ssl.pod
index bc5861ab34..9b5ed719b4 100644
--- a/src/lib/libssl/src/doc/ssl/BIO_f_ssl.pod
+++ b/src/lib/libssl/src/doc/ssl/BIO_f_ssl.pod
@@ -36,7 +36,7 @@ BIO_ssl_shutdown - SSL BIO
36 36
37BIO_f_ssl() returns the SSL BIO method. This is a filter BIO which 37BIO_f_ssl() returns the SSL BIO method. This is a filter BIO which
38is a wrapper round the OpenSSL SSL routines adding a BIO "flavour" to 38is a wrapper round the OpenSSL SSL routines adding a BIO "flavour" to
39SSL I/O. 39SSL I/O.
40 40
41I/O performed on an SSL BIO communicates using the SSL protocol with 41I/O performed on an SSL BIO communicates using the SSL protocol with
42the SSLs read and write BIOs. If an SSL connection is not established 42the SSLs read and write BIOs. If an SSL connection is not established
@@ -63,7 +63,7 @@ BIO_set_ssl_mode() sets the SSL BIO mode to B<client>. If B<client>
63is 1 client mode is set. If B<client> is 0 server mode is set. 63is 1 client mode is set. If B<client> is 0 server mode is set.
64 64
65BIO_set_ssl_renegotiate_bytes() sets the renegotiate byte count 65BIO_set_ssl_renegotiate_bytes() sets the renegotiate byte count
66to B<num>. When set after every B<num> bytes of I/O (read and write) 66to B<num>. When set after every B<num> bytes of I/O (read and write)
67the SSL session is automatically renegotiated. B<num> must be at 67the SSL session is automatically renegotiated. B<num> must be at
68least 512 bytes. 68least 512 bytes.
69 69
@@ -84,7 +84,7 @@ BIO_new_buffer_ssl_connect() creates a new BIO chain consisting
84of a buffering BIO, an SSL BIO (using B<ctx>) and a connect 84of a buffering BIO, an SSL BIO (using B<ctx>) and a connect
85BIO. 85BIO.
86 86
87BIO_ssl_copy_session_id() copies an SSL session id between 87BIO_ssl_copy_session_id() copies an SSL session id between
88BIO chains B<from> and B<to>. It does this by locating the 88BIO chains B<from> and B<to>. It does this by locating the
89SSL BIOs in each chain and calling SSL_copy_session_id() on 89SSL BIOs in each chain and calling SSL_copy_session_id() on
90the internal SSL pointer. 90the internal SSL pointer.
@@ -187,7 +187,7 @@ unencrypted example in L<BIO_s_connect(3)|BIO_s_connect(3)>.
187 /* Could examine ssl here to get connection info */ 187 /* Could examine ssl here to get connection info */
188 188
189 BIO_puts(sbio, "GET / HTTP/1.0\n\n"); 189 BIO_puts(sbio, "GET / HTTP/1.0\n\n");
190 for(;;) { 190 for(;;) {
191 len = BIO_read(sbio, tmpbuf, 1024); 191 len = BIO_read(sbio, tmpbuf, 1024);
192 if(len <= 0) break; 192 if(len <= 0) break;
193 BIO_write(out, tmpbuf, len); 193 BIO_write(out, tmpbuf, len);
@@ -252,9 +252,9 @@ a client and also echoes the request to standard output.
252 /* By doing this when a new connection is established 252 /* By doing this when a new connection is established
253 * we automatically have sbio inserted into it. The 253 * we automatically have sbio inserted into it. The
254 * BIO chain is now 'swallowed' by the accept BIO and 254 * BIO chain is now 'swallowed' by the accept BIO and
255 * will be freed when the accept BIO is freed. 255 * will be freed when the accept BIO is freed.
256 */ 256 */
257 257
258 BIO_set_accept_bios(acpt,sbio); 258 BIO_set_accept_bios(acpt,sbio);
259 259
260 out = BIO_new_fp(stdout, BIO_NOCLOSE); 260 out = BIO_new_fp(stdout, BIO_NOCLOSE);
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_add_session.pod b/src/lib/libssl/src/doc/ssl/SSL_CTX_add_session.pod
index fd927f8d7d..03d03ec9d2 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_add_session.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_add_session.pod
@@ -59,7 +59,7 @@ The following values are returned by all functions:
59 session was not found in the cache. 59 session was not found in the cache.
60 60
61=item C<1> 61=item C<1>
62 62
63 The operation succeeded. 63 The operation succeeded.
64 64
65=back 65=back
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_flush_sessions.pod b/src/lib/libssl/src/doc/ssl/SSL_CTX_flush_sessions.pod
index 148c36c871..833a3af14d 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_flush_sessions.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_flush_sessions.pod
@@ -26,7 +26,7 @@ As sessions will not be reused ones they are expired, they should be
26removed from the cache to save resources. This can either be done 26removed from the cache to save resources. This can either be done
27 automatically whenever 255 new sessions were established (see 27 automatically whenever 255 new sessions were established (see
28L<SSL_CTX_set_session_cache_mode(3)|SSL_CTX_set_session_cache_mode(3)>) 28L<SSL_CTX_set_session_cache_mode(3)|SSL_CTX_set_session_cache_mode(3)>)
29or manually by calling SSL_CTX_flush_sessions(). 29or manually by calling SSL_CTX_flush_sessions().
30 30
31The parameter B<tm> specifies the time which should be used for the 31The parameter B<tm> specifies the time which should be used for the
32expiration test, in most cases the actual time given by time(0) 32expiration test, in most cases the actual time given by time(0)
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_verify_callback.pod b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_verify_callback.pod
index c0f4f85708..29a4a7c375 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_verify_callback.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_verify_callback.pod
@@ -26,7 +26,7 @@ SSL_CTX_set_cert_verify_callback(), the supplied callback function is called
26instead. By setting I<callback> to NULL, the default behaviour is restored. 26instead. By setting I<callback> to NULL, the default behaviour is restored.
27 27
28When the verification must be performed, I<callback> will be called with 28When the verification must be performed, I<callback> will be called with
29the arguments callback(X509_STORE_CTX *x509_store_ctx, void *arg). The 29the arguments callback(X509_STORE_CTX *x509_store_ctx, void *arg). The
30argument I<arg> is specified by the application when setting I<callback>. 30argument I<arg> is specified by the application when setting I<callback>.
31 31
32I<callback> should return 1 to indicate verification success and 0 to 32I<callback> should return 1 to indicate verification success and 0 to
@@ -35,7 +35,7 @@ returns 0, the handshake will fail. As the verification procedure may
35allow to continue the connection in case of failure (by always returning 1) 35allow to continue the connection in case of failure (by always returning 1)
36the verification result must be set in any case using the B<error> 36the verification result must be set in any case using the B<error>
37member of I<x509_store_ctx> so that the calling application will be informed 37member of I<x509_store_ctx> so that the calling application will be informed
38about the detailed result of the verification procedure! 38about the detailed result of the verification procedure!
39 39
40Within I<x509_store_ctx>, I<callback> has access to the I<verify_callback> 40Within I<x509_store_ctx>, I<callback> has access to the I<verify_callback>
41function set using L<SSL_CTX_set_verify(3)|SSL_CTX_set_verify(3)>. 41function set using L<SSL_CTX_set_verify(3)|SSL_CTX_set_verify(3)>.
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_CA_list.pod b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_CA_list.pod
index bcf35dc85b..a68fbd09ee 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_CA_list.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_CA_list.pod
@@ -9,7 +9,7 @@ client certificate
9=head1 SYNOPSIS 9=head1 SYNOPSIS
10 10
11 #include <openssl/ssl.h> 11 #include <openssl/ssl.h>
12 12
13 void SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *list); 13 void SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *list);
14 void SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *list); 14 void SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *list);
15 int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *cacert); 15 int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *cacert);
@@ -42,7 +42,7 @@ This list must explicitly be set using SSL_CTX_set_client_CA_list() for
42B<ctx> and SSL_set_client_CA_list() for the specific B<ssl>. The list 42B<ctx> and SSL_set_client_CA_list() for the specific B<ssl>. The list
43specified overrides the previous setting. The CAs listed do not become 43specified overrides the previous setting. The CAs listed do not become
44trusted (B<list> only contains the names, not the complete certificates); use 44trusted (B<list> only contains the names, not the complete certificates); use
45L<SSL_CTX_load_verify_locations(3)|SSL_CTX_load_verify_locations(3)> 45L<SSL_CTX_load_verify_locations(3)|SSL_CTX_load_verify_locations(3)>
46to additionally load them for verification. 46to additionally load them for verification.
47 47
48If the list of acceptable CAs is compiled in a file, the 48If the list of acceptable CAs is compiled in a file, the
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_mode.pod b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_mode.pod
index 8cb669daeb..0191a846a7 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_mode.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_mode.pod
@@ -66,7 +66,7 @@ return after the handshake and successful completion.
66When we no longer need a read buffer or a write buffer for a given SSL, 66When we no longer need a read buffer or a write buffer for a given SSL,
67then release the memory we were using to hold it. Released memory is 67then release the memory we were using to hold it. Released memory is
68either appended to a list of unused RAM chunks on the SSL_CTX, or simply 68either appended to a list of unused RAM chunks on the SSL_CTX, or simply
69freed if the list of unused chunks would become longer than 69freed if the list of unused chunks would become longer than
70SSL_CTX->freelist_max_len, which defaults to 32. Using this flag can 70SSL_CTX->freelist_max_len, which defaults to 32. Using this flag can
71save around 34k per idle SSL connection. 71save around 34k per idle SSL connection.
72This flag has no effect on SSL v2 connections, or on DTLS connections. 72This flag has no effect on SSL v2 connections, or on DTLS connections.
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_options.pod b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_options.pod
index 935c9cd09b..434b452c57 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_options.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_options.pod
@@ -174,7 +174,7 @@ will send its list of preferences to the client and the client chooses.
174 174
175If we accept a netscape connection, demand a client cert, have a 175If we accept a netscape connection, demand a client cert, have a
176non-self-signed CA which does not have its CA in netscape, and the 176non-self-signed CA which does not have its CA in netscape, and the
177browser has a cert, it will crash/hang. Works for 3.x and 4.xbeta 177browser has a cert, it will crash/hang. Works for 3.x and 4.xbeta
178 178
179=item SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 179=item SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG
180 180
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_cache_mode.pod b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_cache_mode.pod
index c5d2f43dff..4c5d52ba4e 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_cache_mode.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_cache_mode.pod
@@ -26,7 +26,7 @@ SSL_CTX object is being maintained, the sessions are unique for each SSL_CTX
26object. 26object.
27 27
28In order to reuse a session, a client must send the session's id to the 28In order to reuse a session, a client must send the session's id to the
29server. It can only send exactly one id. The server then either 29server. It can only send exactly one id. The server then either
30agrees to reuse the session or it starts a full handshake (to create a new 30agrees to reuse the session or it starts a full handshake (to create a new
31session). 31session).
32 32
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
index 29d1f8a6fb..974f1e1829 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
@@ -141,7 +141,7 @@ partly left out.)
141 dh_tmp = dh_512; 141 dh_tmp = dh_512;
142 break; 142 break;
143 case 1024: 143 case 1024:
144 if (!dh_1024) 144 if (!dh_1024)
145 dh_1024 = get_dh1024(); 145 dh_1024 = get_dh1024();
146 dh_tmp = dh_1024; 146 dh_tmp = dh_1024;
147 break; 147 break;
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_verify.pod b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_verify.pod
index 6fd6c03215..177c59f484 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_verify.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_verify.pod
@@ -221,7 +221,7 @@ L<SSL_get_ex_data_X509_STORE_CTX_idx(3)|SSL_get_ex_data_X509_STORE_CTX_idx(3)>).
221 preverify_ok = 0; 221 preverify_ok = 0;
222 err = X509_V_ERR_CERT_CHAIN_TOO_LONG; 222 err = X509_V_ERR_CERT_CHAIN_TOO_LONG;
223 X509_STORE_CTX_set_error(ctx, err); 223 X509_STORE_CTX_set_error(ctx, err);
224 } 224 }
225 if (!preverify_ok) { 225 if (!preverify_ok) {
226 printf("verify error:num=%d:%s:depth=%d:%s\n", err, 226 printf("verify error:num=%d:%s:depth=%d:%s\n", err,
227 X509_verify_cert_error_string(err), depth, buf); 227 X509_verify_cert_error_string(err), depth, buf);
@@ -269,7 +269,7 @@ L<SSL_get_ex_data_X509_STORE_CTX_idx(3)|SSL_get_ex_data_X509_STORE_CTX_idx(3)>).
269 */ 269 */
270 mydata.verify_depth = verify_depth; ... 270 mydata.verify_depth = verify_depth; ...
271 SSL_set_ex_data(ssl, mydata_index, &mydata); 271 SSL_set_ex_data(ssl, mydata_index, &mydata);
272 272
273 ... 273 ...
274 SSL_accept(ssl); /* check of success left out for clarity */ 274 SSL_accept(ssl); /* check of success left out for clarity */
275 if (peer = SSL_get_peer_certificate(ssl)) 275 if (peer = SSL_get_peer_certificate(ssl))
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.pod b/src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.pod
index 10be95fdb1..a3b2cf1eb5 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.pod
@@ -66,7 +66,7 @@ SSL_use_certificate_file() loads the certificate from B<file> into B<ssl>.
66See the NOTES section on why SSL_CTX_use_certificate_chain_file() 66See the NOTES section on why SSL_CTX_use_certificate_chain_file()
67should be preferred. 67should be preferred.
68 68
69SSL_CTX_use_certificate_chain_file() loads a certificate chain from 69SSL_CTX_use_certificate_chain_file() loads a certificate chain from
70B<file> into B<ctx>. The certificates must be in PEM format and must 70B<file> into B<ctx>. The certificates must be in PEM format and must
71be sorted starting with the subject's certificate (actual client or server 71be sorted starting with the subject's certificate (actual client or server
72certificate), followed by intermediate CA certificates if applicable, and 72certificate), followed by intermediate CA certificates if applicable, and
@@ -81,7 +81,7 @@ If a certificate has already been set and the private does not belong
81to the certificate an error is returned. To change a certificate, private 81to the certificate an error is returned. To change a certificate, private
82key pair the new certificate needs to be set with SSL_use_certificate() 82key pair the new certificate needs to be set with SSL_use_certificate()
83or SSL_CTX_use_certificate() before setting the private key with 83or SSL_CTX_use_certificate() before setting the private key with
84SSL_CTX_use_PrivateKey() or SSL_use_PrivateKey(). 84SSL_CTX_use_PrivateKey() or SSL_use_PrivateKey().
85 85
86 86
87SSL_CTX_use_PrivateKey_ASN1() adds the private key of type B<pk> 87SSL_CTX_use_PrivateKey_ASN1() adds the private key of type B<pk>
@@ -108,7 +108,7 @@ the same check for B<ssl>. If no key/certificate was explicitly added for
108this B<ssl>, the last item added into B<ctx> will be checked. 108this B<ssl>, the last item added into B<ctx> will be checked.
109 109
110=head1 NOTES 110=head1 NOTES
111 111
112The internal certificate store of OpenSSL can hold two private key/certificate 112The internal certificate store of OpenSSL can hold two private key/certificate
113pairs at a time: one key/certificate of type RSA and one key/certificate 113pairs at a time: one key/certificate of type RSA and one key/certificate
114of type DSA. The certificate used depends on the cipher select, see 114of type DSA. The certificate used depends on the cipher select, see
@@ -116,7 +116,7 @@ also L<SSL_CTX_set_cipher_list(3)|SSL_CTX_set_cipher_list(3)>.
116 116
117When reading certificates and private keys from file, files of type 117When reading certificates and private keys from file, files of type
118SSL_FILETYPE_ASN1 (also known as B<DER>, binary encoding) can only contain 118SSL_FILETYPE_ASN1 (also known as B<DER>, binary encoding) can only contain
119one certificate or private key, consequently 119one certificate or private key, consequently
120SSL_CTX_use_certificate_chain_file() is only applicable to PEM formatting. 120SSL_CTX_use_certificate_chain_file() is only applicable to PEM formatting.
121Files of type SSL_FILETYPE_PEM can contain more than one item. 121Files of type SSL_FILETYPE_PEM can contain more than one item.
122 122
diff --git a/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.pod b/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.pod
index 490337a32f..450a0127b9 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.pod
@@ -52,7 +52,7 @@ valid values.
52 52
53SSL_SESSION_set_time() and SSL_SESSION_set_timeout() return 1 on success. 53SSL_SESSION_set_time() and SSL_SESSION_set_timeout() return 1 on success.
54 54
55If any of the function is passed the NULL pointer for the session B<s>, 55If any of the function is passed the NULL pointer for the session B<s>,
560 is returned. 560 is returned.
57 57
58=head1 SEE ALSO 58=head1 SEE ALSO
diff --git a/src/lib/libssl/src/doc/ssl/SSL_accept.pod b/src/lib/libssl/src/doc/ssl/SSL_accept.pod
index 288203f8af..42a539d354 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_accept.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_accept.pod
@@ -18,7 +18,7 @@ B<ssl> by setting an underlying B<BIO>.
18 18
19=head1 NOTES 19=head1 NOTES
20 20
21The behaviour of SSL_accept() depends on the underlying BIO. 21The behaviour of SSL_accept() depends on the underlying BIO.
22 22
23If the underlying BIO is B<blocking>, SSL_accept() will only return once the 23If the underlying BIO is B<blocking>, SSL_accept() will only return once the
24handshake has been finished or an error occurred, except for SGC (Server 24handshake has been finished or an error occurred, except for SGC (Server
diff --git a/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.pod b/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.pod
index 0329c34869..8e071e6119 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.pod
@@ -217,7 +217,7 @@ point. This message is always a warning.
217=item "UP"/"unknown PSK identity" 217=item "UP"/"unknown PSK identity"
218 218
219Sent by the server to indicate that it does not recognize a PSK 219Sent by the server to indicate that it does not recognize a PSK
220identity or an SRP identity. 220identity or an SRP identity.
221 221
222=item "UK"/"unknown" 222=item "UK"/"unknown"
223 223
diff --git a/src/lib/libssl/src/doc/ssl/SSL_connect.pod b/src/lib/libssl/src/doc/ssl/SSL_connect.pod
index 0087f6b3e1..5b21119a91 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_connect.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_connect.pod
@@ -18,7 +18,7 @@ underlying B<BIO>.
18 18
19=head1 NOTES 19=head1 NOTES
20 20
21The behaviour of SSL_connect() depends on the underlying BIO. 21The behaviour of SSL_connect() depends on the underlying BIO.
22 22
23If the underlying BIO is B<blocking>, SSL_connect() will only return once the 23If the underlying BIO is B<blocking>, SSL_connect() will only return once the
24handshake has been finished or an error occurred. 24handshake has been finished or an error occurred.
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_client_CA_list.pod b/src/lib/libssl/src/doc/ssl/SSL_get_client_CA_list.pod
index 68181b2407..8b5ac0df2c 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_client_CA_list.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_client_CA_list.pod
@@ -9,7 +9,7 @@ SSL_get_client_CA_list, SSL_CTX_get_client_CA_list - get list of client CAs
9 #include <openssl/ssl.h> 9 #include <openssl/ssl.h>
10 10
11 STACK_OF(X509_NAME) *SSL_get_client_CA_list(const SSL *s); 11 STACK_OF(X509_NAME) *SSL_get_client_CA_list(const SSL *s);
12 STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *ctx); 12 STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *ctx);
13 13
14=head1 DESCRIPTION 14=head1 DESCRIPTION
15 15
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_current_cipher.pod b/src/lib/libssl/src/doc/ssl/SSL_get_current_cipher.pod
index e5ab12491e..2f69109a7a 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_current_cipher.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_current_cipher.pod
@@ -27,7 +27,7 @@ the B<ssl> object.
27 27
28SSL_get_cipher() and SSL_get_cipher_name() are identical macros to obtain the 28SSL_get_cipher() and SSL_get_cipher_name() are identical macros to obtain the
29name of the currently used cipher. SSL_get_cipher_bits() is a 29name of the currently used cipher. SSL_get_cipher_bits() is a
30macro to obtain the number of secret/algorithm bits used and 30macro to obtain the number of secret/algorithm bits used and
31SSL_get_cipher_version() returns the protocol name. 31SSL_get_cipher_version() returns the protocol name.
32See L<SSL_CIPHER_get_name(3)|SSL_CIPHER_get_name(3)> for more details. 32See L<SSL_CIPHER_get_name(3)|SSL_CIPHER_get_name(3)> for more details.
33 33
diff --git a/src/lib/libssl/src/doc/ssl/SSL_library_init.pod b/src/lib/libssl/src/doc/ssl/SSL_library_init.pod
index 8766776fea..4767c0ba8b 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_library_init.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_library_init.pod
@@ -23,7 +23,7 @@ for SSL_library_init().
23=head1 NOTES 23=head1 NOTES
24 24
25SSL_library_init() must be called before any other action takes place. 25SSL_library_init() must be called before any other action takes place.
26SSL_library_init() is not reentrant. 26SSL_library_init() is not reentrant.
27 27
28=head1 WARNING 28=head1 WARNING
29 29
diff --git a/src/lib/libssl/src/doc/ssl/SSL_load_client_CA_file.pod b/src/lib/libssl/src/doc/ssl/SSL_load_client_CA_file.pod
index 02527dc2ed..5aa2b73447 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_load_client_CA_file.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_load_client_CA_file.pod
@@ -30,7 +30,7 @@ Load names of CAs from file and use it as a client CA list:
30 SSL_CTX *ctx; 30 SSL_CTX *ctx;
31 STACK_OF(X509_NAME) *cert_names; 31 STACK_OF(X509_NAME) *cert_names;
32 32
33 ... 33 ...
34 cert_names = SSL_load_client_CA_file("/path/to/CAfile.pem"); 34 cert_names = SSL_load_client_CA_file("/path/to/CAfile.pem");
35 if (cert_names != NULL) 35 if (cert_names != NULL)
36 SSL_CTX_set_client_CA_list(ctx, cert_names); 36 SSL_CTX_set_client_CA_list(ctx, cert_names);
diff --git a/src/lib/libssl/src/doc/ssl/SSL_read.pod b/src/lib/libssl/src/doc/ssl/SSL_read.pod
index 5f03ec3559..57dfbdfc28 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_read.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_read.pod
@@ -22,7 +22,7 @@ not already explicitly performed by L<SSL_connect(3)|SSL_connect(3)> or
22L<SSL_accept(3)|SSL_accept(3)>. If the 22L<SSL_accept(3)|SSL_accept(3)>. If the
23peer requests a re-negotiation, it will be performed transparently during 23peer requests a re-negotiation, it will be performed transparently during
24the SSL_read() operation. The behaviour of SSL_read() depends on the 24the SSL_read() operation. The behaviour of SSL_read() depends on the
25underlying BIO. 25underlying BIO.
26 26
27For the transparent negotiation to succeed, the B<ssl> must have been 27For the transparent negotiation to succeed, the B<ssl> must have been
28initialized to client or server mode. This is being done by calling 28initialized to client or server mode. This is being done by calling
@@ -47,7 +47,7 @@ record is complete and SSL_read() can succeed.
47 47
48If the underlying BIO is B<blocking>, SSL_read() will only return, once the 48If the underlying BIO is B<blocking>, SSL_read() will only return, once the
49read operation has been finished or an error occurred, except when a 49read operation has been finished or an error occurred, except when a
50renegotiation take place, in which case a SSL_ERROR_WANT_READ may occur. 50renegotiation take place, in which case a SSL_ERROR_WANT_READ may occur.
51This behaviour can be controlled with the SSL_MODE_AUTO_RETRY flag of the 51This behaviour can be controlled with the SSL_MODE_AUTO_RETRY flag of the
52L<SSL_CTX_set_mode(3)|SSL_CTX_set_mode(3)> call. 52L<SSL_CTX_set_mode(3)|SSL_CTX_set_mode(3)> call.
53 53
diff --git a/src/lib/libssl/src/doc/ssl/SSL_shutdown.pod b/src/lib/libssl/src/doc/ssl/SSL_shutdown.pod
index d86ac7cb13..50f47c20d7 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_shutdown.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_shutdown.pod
@@ -12,7 +12,7 @@ SSL_shutdown - shut down a TLS/SSL connection
12 12
13=head1 DESCRIPTION 13=head1 DESCRIPTION
14 14
15SSL_shutdown() shuts down an active TLS/SSL connection. It sends the 15SSL_shutdown() shuts down an active TLS/SSL connection. It sends the
16"close notify" shutdown alert to the peer. 16"close notify" shutdown alert to the peer.
17 17
18=head1 NOTES 18=head1 NOTES
@@ -64,7 +64,7 @@ complete (return value of the first call is 0). As the shutdown is not
64specially handled in the SSLv2 protocol, SSL_shutdown() will succeed on 64specially handled in the SSLv2 protocol, SSL_shutdown() will succeed on
65the first call. 65the first call.
66 66
67The behaviour of SSL_shutdown() additionally depends on the underlying BIO. 67The behaviour of SSL_shutdown() additionally depends on the underlying BIO.
68 68
69If the underlying BIO is B<blocking>, SSL_shutdown() will only return once the 69If the underlying BIO is B<blocking>, SSL_shutdown() will only return once the
70handshake step has been finished or an error occurred. 70handshake step has been finished or an error occurred.
diff --git a/src/lib/libssl/src/doc/ssl/SSL_write.pod b/src/lib/libssl/src/doc/ssl/SSL_write.pod
index b0f73ae520..f248f7d740 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_write.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_write.pod
@@ -22,7 +22,7 @@ not already explicitly performed by L<SSL_connect(3)|SSL_connect(3)> or
22L<SSL_accept(3)|SSL_accept(3)>. If the 22L<SSL_accept(3)|SSL_accept(3)>. If the
23peer requests a re-negotiation, it will be performed transparently during 23peer requests a re-negotiation, it will be performed transparently during
24the SSL_write() operation. The behaviour of SSL_write() depends on the 24the SSL_write() operation. The behaviour of SSL_write() depends on the
25underlying BIO. 25underlying BIO.
26 26
27For the transparent negotiation to succeed, the B<ssl> must have been 27For the transparent negotiation to succeed, the B<ssl> must have been
28initialized to client or server mode. This is being done by calling 28initialized to client or server mode. This is being done by calling
@@ -31,7 +31,7 @@ before the first call to an L<SSL_read(3)|SSL_read(3)> or SSL_write() function.
31 31
32If the underlying BIO is B<blocking>, SSL_write() will only return, once the 32If the underlying BIO is B<blocking>, SSL_write() will only return, once the
33write operation has been finished or an error occurred, except when a 33write operation has been finished or an error occurred, except when a
34renegotiation take place, in which case a SSL_ERROR_WANT_READ may occur. 34renegotiation take place, in which case a SSL_ERROR_WANT_READ may occur.
35This behaviour can be controlled with the SSL_MODE_AUTO_RETRY flag of the 35This behaviour can be controlled with the SSL_MODE_AUTO_RETRY flag of the
36L<SSL_CTX_set_mode(3)|SSL_CTX_set_mode(3)> call. 36L<SSL_CTX_set_mode(3)|SSL_CTX_set_mode(3)> call.
37 37