Change spelling back to "behaviour" and "flavour" instead of the
American variants.
This commit is contained in:
parent
c1629c9ea2
commit
acb5b34328
@ -694,7 +694,7 @@ There should be options to explicitly set such things as start and end
|
|||||||
dates rather than an offset from the current time.
|
dates rather than an offset from the current time.
|
||||||
|
|
||||||
The code to implement the verify behaviour described in the B<TRUST SETTINGS>
|
The code to implement the verify behaviour described in the B<TRUST SETTINGS>
|
||||||
is currently being developed. It thus describes the intended behavior rather
|
is currently being developed. It thus describes the intended behaviour rather
|
||||||
than the current behaviour. It is hoped that it will represent reality in
|
than the current behaviour. It is hoped that it will represent reality in
|
||||||
OpenSSL 0.9.5 and later.
|
OpenSSL 0.9.5 and later.
|
||||||
|
|
||||||
|
@ -127,7 +127,7 @@ outputs them. This could be used with the examples above.
|
|||||||
|
|
||||||
=head1 BUGS
|
=head1 BUGS
|
||||||
|
|
||||||
The lack of support for BIO_puts() and the non standard behavior of
|
The lack of support for BIO_puts() and the non standard behaviour of
|
||||||
BIO_gets() could be regarded as anomalous. It could be argued that BIO_gets()
|
BIO_gets() could be regarded as anomalous. It could be argued that BIO_gets()
|
||||||
and BIO_puts() should be passed to the next BIO in the chain and digest
|
and BIO_puts() should be passed to the next BIO in the chain and digest
|
||||||
the data passed through and that digests should be retrieved using a
|
the data passed through and that digests should be retrieved using a
|
||||||
|
@ -33,7 +33,7 @@ BIO_ssl_shutdown - SSL BIO
|
|||||||
=head1 DESCRIPTION
|
=head1 DESCRIPTION
|
||||||
|
|
||||||
BIO_f_ssl() returns the SSL BIO method. This is a filter BIO which
|
BIO_f_ssl() returns the SSL BIO method. This is a filter BIO which
|
||||||
is a wrapper round the OpenSSL SSL routines adding a BIO "flavor" to
|
is a wrapper round the OpenSSL SSL routines adding a BIO "flavour" to
|
||||||
SSL I/O.
|
SSL I/O.
|
||||||
|
|
||||||
I/O performed on an SSL BIO communicates using the SSL protocol with
|
I/O performed on an SSL BIO communicates using the SSL protocol with
|
||||||
@ -100,7 +100,7 @@ renegotiation takes place during a BIO_read() operation, one
|
|||||||
case where this happens is when SGC or step up occurs.
|
case where this happens is when SGC or step up occurs.
|
||||||
|
|
||||||
In OpenSSL 0.9.6 and later the SSL flag SSL_AUTO_RETRY can be
|
In OpenSSL 0.9.6 and later the SSL flag SSL_AUTO_RETRY can be
|
||||||
set to disable this behavior. That is when this flag is set
|
set to disable this behaviour. That is when this flag is set
|
||||||
an SSL BIO using a blocking transport will never request a
|
an SSL BIO using a blocking transport will never request a
|
||||||
retry.
|
retry.
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ BIO_new_fd() returns a file descriptor BIO using B<fd> and B<close_flag>.
|
|||||||
|
|
||||||
=head1 NOTES
|
=head1 NOTES
|
||||||
|
|
||||||
The behavior of BIO_read() and BIO_write() depends on the behavior of the
|
The behaviour of BIO_read() and BIO_write() depends on the behavior of the
|
||||||
platforms read() and write() calls on the descriptor. If the underlying
|
platforms read() and write() calls on the descriptor. If the underlying
|
||||||
file descriptor is in a non blocking mode then the BIO will behave in the
|
file descriptor is in a non blocking mode then the BIO will behave in the
|
||||||
manner described in the L<BIO_read(3)|BIO_read(3)> and L<BIO_should_retry(3)|BIO_should_retry(3)>
|
manner described in the L<BIO_read(3)|BIO_read(3)> and L<BIO_should_retry(3)|BIO_should_retry(3)>
|
||||||
@ -56,7 +56,7 @@ BIO_s_fd() returns the file descriptor BIO method.
|
|||||||
BIO_reset() returns zero for success and -1 if an error occurred.
|
BIO_reset() returns zero for success and -1 if an error occurred.
|
||||||
BIO_seek() and BIO_tell() return the current file position or -1
|
BIO_seek() and BIO_tell() return the current file position or -1
|
||||||
is an error occurred. These values reflect the underlying lseek()
|
is an error occurred. These values reflect the underlying lseek()
|
||||||
behavior.
|
behaviour.
|
||||||
|
|
||||||
BIO_set_fd() always returns 1.
|
BIO_set_fd() always returns 1.
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ When wrapping stdout, stdin or stderr the underlying stream should not
|
|||||||
normally be closed so the BIO_NOCLOSE flag should be set.
|
normally be closed so the BIO_NOCLOSE flag should be set.
|
||||||
|
|
||||||
Because the file BIO calls the underlying stdio functions any quirks
|
Because the file BIO calls the underlying stdio functions any quirks
|
||||||
in stdio behavior will be mirrored by the corresponding BIO.
|
in stdio behaviour will be mirrored by the corresponding BIO.
|
||||||
|
|
||||||
=head1 EXAMPLES
|
=head1 EXAMPLES
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ BIO_eof() is true if no data is in the BIO.
|
|||||||
|
|
||||||
BIO_ctrl_pending() returns the number of bytes currently stored.
|
BIO_ctrl_pending() returns the number of bytes currently stored.
|
||||||
|
|
||||||
BIO_set_mem_eof_return() sets the behavior of memory BIO B<b> when it is
|
BIO_set_mem_eof_return() sets the behaviour of memory BIO B<b> when it is
|
||||||
empty. If the B<v> is zero then an empty memory BIO will return EOF (that is
|
empty. If the B<v> is zero then an empty memory BIO will return EOF (that is
|
||||||
it will return zero and BIO_should_retry(b) will be false. If B<v> is non
|
it will return zero and BIO_should_retry(b) will be false. If B<v> is non
|
||||||
zero then it will return B<v> when it is empty and it will set the read retry
|
zero then it will return B<v> when it is empty and it will set the read retry
|
||||||
|
@ -97,7 +97,7 @@ the performance may be poor if SSL BIOs are present because long delays
|
|||||||
can occur during the initial handshake process.
|
can occur during the initial handshake process.
|
||||||
|
|
||||||
It is possible for a BIO to block indefinitely if the underlying I/O
|
It is possible for a BIO to block indefinitely if the underlying I/O
|
||||||
structure cannot process or return any data. This depends on the behavior of
|
structure cannot process or return any data. This depends on the behaviour of
|
||||||
the platforms I/O functions. This is often not desirable: one solution
|
the platforms I/O functions. This is often not desirable: one solution
|
||||||
is to use non blocking I/O and use a timeout on the select() (or
|
is to use non blocking I/O and use a timeout on the select() (or
|
||||||
equivalent) call.
|
equivalent) call.
|
||||||
|
@ -106,7 +106,7 @@ CRYPTO_lock() is used to lock and unlock the locks. mode is a bitfield
|
|||||||
describing what should be done with the lock. n is the number of the
|
describing what should be done with the lock. n is the number of the
|
||||||
lock as returned from CRYPTO_get_new_dynlockid(). mode can be combined
|
lock as returned from CRYPTO_get_new_dynlockid(). mode can be combined
|
||||||
from the following values. These values are pairwise exclusive, with
|
from the following values. These values are pairwise exclusive, with
|
||||||
undefined behavior if misused (for example, CRYPTO_READ and CRYPTO_WRITE
|
undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE
|
||||||
should not be used together):
|
should not be used together):
|
||||||
|
|
||||||
CRYPTO_LOCK 0x01
|
CRYPTO_LOCK 0x01
|
||||||
|
@ -14,7 +14,7 @@ SSL_accept - wait for a TLS/SSL client to initiate a TLS/SSL handshake
|
|||||||
|
|
||||||
SSL_accept() waits for a TLS/SSL client to initiate the TLS/SSL handshake.
|
SSL_accept() waits for a TLS/SSL client to initiate the TLS/SSL handshake.
|
||||||
The communication channel must already have been set and assigned to the
|
The communication channel must already have been set and assigned to the
|
||||||
B<ssl> by setting an underlying B<BIO>. The behavior of SSL_accept() depends
|
B<ssl> by setting an underlying B<BIO>. The behaviour of SSL_accept() depends
|
||||||
on the underlying BIO.
|
on the underlying BIO.
|
||||||
|
|
||||||
If the underlying BIO is B<blocking>, SSL_accept() will only return once the
|
If the underlying BIO is B<blocking>, SSL_accept() will only return once the
|
||||||
|
@ -14,7 +14,7 @@ SSL_connect - initiate the TLS/SSL handshake with an TLS/SSL server
|
|||||||
|
|
||||||
SSL_connect() initiates the TLS handshake with a server. The communication
|
SSL_connect() initiates the TLS handshake with a server. The communication
|
||||||
channel must already have been set and assigned to the B<ssl> by setting an
|
channel must already have been set and assigned to the B<ssl> by setting an
|
||||||
underlying B<BIO>. The behavior of SSL_connect() depends on the underlying
|
underlying B<BIO>. The behaviour of SSL_connect() depends on the underlying
|
||||||
BIO.
|
BIO.
|
||||||
|
|
||||||
If the underlying BIO is B<blocking>, SSL_connect() will only return once the
|
If the underlying BIO is B<blocking>, SSL_connect() will only return once the
|
||||||
|
@ -16,7 +16,7 @@ SSL_read() tries to read B<num> bytes from the specified B<ssl> into the
|
|||||||
buffer B<buf>. If necessary, SSL_read() will negotiate a TLS/SSL session, if
|
buffer B<buf>. If necessary, SSL_read() will negotiate a TLS/SSL session, if
|
||||||
not already explicitly performed by SSL_connect() or SSL_accept(). If the
|
not already explicitly performed by SSL_connect() or SSL_accept(). If the
|
||||||
peer requests a re-negotiation, it will be performed transparently during
|
peer requests a re-negotiation, it will be performed transparently during
|
||||||
the SSL_read() operation. The behavior of SSL_read() depends on the
|
the SSL_read() operation. The behaviour of SSL_read() depends on the
|
||||||
underlying BIO.
|
underlying BIO.
|
||||||
|
|
||||||
If the underlying BIO is B<blocking>, SSL_read() will only return, once the
|
If the underlying BIO is B<blocking>, SSL_read() will only return, once the
|
||||||
|
@ -15,8 +15,8 @@ SSL_set_bio - connect the SSL object with a BIO
|
|||||||
SSL_set_bio() connects the BIOs B<rbio> and B<wbio> for the read and write
|
SSL_set_bio() connects the BIOs B<rbio> and B<wbio> for the read and write
|
||||||
operations of the TLS/SSL (encrypted) side of B<ssl>.
|
operations of the TLS/SSL (encrypted) side of B<ssl>.
|
||||||
|
|
||||||
The SSL engine inherits the behavior of B<rbio> and B<wbio>, respectively.
|
The SSL engine inherits the behaviour of B<rbio> and B<wbio>, respectively.
|
||||||
If a BIO is non-blocking, the B<ssl> will also have non-blocking behavior.
|
If a BIO is non-blocking, the B<ssl> will also have non-blocking behaviour.
|
||||||
|
|
||||||
If there was already a BIO connected to B<ssl>, BIO_free() will be called
|
If there was already a BIO connected to B<ssl>, BIO_free() will be called
|
||||||
(for both the reading and writing side, if different).
|
(for both the reading and writing side, if different).
|
||||||
|
@ -20,8 +20,8 @@ socket file descriptor of a network connection.
|
|||||||
|
|
||||||
When performing the operation, a B<socket BIO> is automatically created to
|
When performing the operation, a B<socket BIO> is automatically created to
|
||||||
interface between the B<ssl> and B<fd>. The BIO and hence the SSL engine
|
interface between the B<ssl> and B<fd>. The BIO and hence the SSL engine
|
||||||
inherit the behavior of B<fd>. If B<fd> is non-blocking, the B<ssl> will
|
inherit the behaviour of B<fd>. If B<fd> is non-blocking, the B<ssl> will
|
||||||
also have non-blocking behavior.
|
also have non-blocking behaviour.
|
||||||
|
|
||||||
If there was already a BIO connected to B<ssl>, BIO_free() will be called
|
If there was already a BIO connected to B<ssl>, BIO_free() will be called
|
||||||
(for both the reading and writing side, if different).
|
(for both the reading and writing side, if different).
|
||||||
|
@ -13,7 +13,7 @@ SSL_shutdown - shut down a TLS/SSL connection
|
|||||||
=head1 DESCRIPTION
|
=head1 DESCRIPTION
|
||||||
|
|
||||||
SSL_shutdown() shuts down an active TLS/SSL connection. It sends the shutdown
|
SSL_shutdown() shuts down an active TLS/SSL connection. It sends the shutdown
|
||||||
alert to the peer. The behavior of SSL_shutdown() depends on the underlying
|
alert to the peer. The behaviour of SSL_shutdown() depends on the underlying
|
||||||
BIO.
|
BIO.
|
||||||
|
|
||||||
If the underlying BIO is B<blocking>, SSL_shutdown() will only return once the
|
If the underlying BIO is B<blocking>, SSL_shutdown() will only return once the
|
||||||
|
@ -16,7 +16,7 @@ SSL_write() writes B<num> bytes from the buffer B<buf> into the specified
|
|||||||
B<ssl>. If necessary, SSL_write() will negotiate a TLS/SSL session, if
|
B<ssl>. If necessary, SSL_write() will negotiate a TLS/SSL session, if
|
||||||
not already explicitly performed by SSL_connect() or SSL_accept(). If the
|
not already explicitly performed by SSL_connect() or SSL_accept(). If the
|
||||||
peer requests a re-negotiation, it will be performed transparently during
|
peer requests a re-negotiation, it will be performed transparently during
|
||||||
the SSL_write() operation. The behavior of SSL_write() depends on the
|
the SSL_write() operation. The behaviour of SSL_write() depends on the
|
||||||
underlying BIO.
|
underlying BIO.
|
||||||
|
|
||||||
If the underlying BIO is B<blocking>, SSL_write() will only return, once the
|
If the underlying BIO is B<blocking>, SSL_write() will only return, once the
|
||||||
|
Loading…
x
Reference in New Issue
Block a user