diff options
author | schwarze <> | 2016-12-04 12:22:48 +0000 |
---|---|---|
committer | schwarze <> | 2016-12-04 12:22:48 +0000 |
commit | dd63e85551e83a9ed851b02c3211a5f366e4b82b (patch) | |
tree | d1ed636b2e32419d27204a2257be70ae9dc1058a | |
parent | c4ad8710aea7dfa40b25bb7a737f03239b8774b6 (diff) | |
download | openbsd-dd63e85551e83a9ed851b02c3211a5f366e4b82b.tar.gz openbsd-dd63e85551e83a9ed851b02c3211a5f366e4b82b.tar.bz2 openbsd-dd63e85551e83a9ed851b02c3211a5f366e4b82b.zip |
Add Copyright and license.
Stop talking about SSLv2 and SSLv3.
-rw-r--r-- | src/lib/libssl/man/SSL_new.3 | 53 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_shutdown.3 | 57 |
2 files changed, 101 insertions, 9 deletions
diff --git a/src/lib/libssl/man/SSL_new.3 b/src/lib/libssl/man/SSL_new.3 index 14883f46ad..cfe8b3368e 100644 --- a/src/lib/libssl/man/SSL_new.3 +++ b/src/lib/libssl/man/SSL_new.3 | |||
@@ -1,7 +1,54 @@ | |||
1 | .\" $OpenBSD: SSL_new.3,v 1.2 2016/12/04 12:22:48 schwarze Exp $ | ||
2 | .\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400 | ||
1 | .\" | 3 | .\" |
2 | .\" $OpenBSD: SSL_new.3,v 1.1 2016/11/05 15:32:20 schwarze Exp $ | 4 | .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. |
5 | .\" Copyright (c) 2000, 2001 The OpenSSL Project. All rights reserved. | ||
3 | .\" | 6 | .\" |
4 | .Dd $Mdocdate: November 5 2016 $ | 7 | .\" Redistribution and use in source and binary forms, with or without |
8 | .\" modification, are permitted provided that the following conditions | ||
9 | .\" are met: | ||
10 | .\" | ||
11 | .\" 1. Redistributions of source code must retain the above copyright | ||
12 | .\" notice, this list of conditions and the following disclaimer. | ||
13 | .\" | ||
14 | .\" 2. Redistributions in binary form must reproduce the above copyright | ||
15 | .\" notice, this list of conditions and the following disclaimer in | ||
16 | .\" the documentation and/or other materials provided with the | ||
17 | .\" distribution. | ||
18 | .\" | ||
19 | .\" 3. All advertising materials mentioning features or use of this | ||
20 | .\" software must display the following acknowledgment: | ||
21 | .\" "This product includes software developed by the OpenSSL Project | ||
22 | .\" for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
23 | .\" | ||
24 | .\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
25 | .\" endorse or promote products derived from this software without | ||
26 | .\" prior written permission. For written permission, please contact | ||
27 | .\" openssl-core@openssl.org. | ||
28 | .\" | ||
29 | .\" 5. Products derived from this software may not be called "OpenSSL" | ||
30 | .\" nor may "OpenSSL" appear in their names without prior written | ||
31 | .\" permission of the OpenSSL Project. | ||
32 | .\" | ||
33 | .\" 6. Redistributions of any form whatsoever must retain the following | ||
34 | .\" acknowledgment: | ||
35 | .\" "This product includes software developed by the OpenSSL Project | ||
36 | .\" for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
37 | .\" | ||
38 | .\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
39 | .\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
40 | .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
41 | .\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
42 | .\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
43 | .\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
44 | .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
45 | .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
46 | .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
47 | .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | ||
50 | .\" | ||
51 | .Dd $Mdocdate: December 4 2016 $ | ||
5 | .Dt SSL_NEW 3 | 52 | .Dt SSL_NEW 3 |
6 | .Os | 53 | .Os |
7 | .Sh NAME | 54 | .Sh NAME |
@@ -18,7 +65,7 @@ creates a new | |||
18 | structure which is needed to hold the data for a TLS/SSL connection. | 65 | structure which is needed to hold the data for a TLS/SSL connection. |
19 | The new structure inherits the settings of the underlying context | 66 | The new structure inherits the settings of the underlying context |
20 | .Fa ctx : | 67 | .Fa ctx : |
21 | connection method (SSLv2/v3/TLSv1), options, verification settings, | 68 | connection method, options, verification settings, |
22 | timeout settings. | 69 | timeout settings. |
23 | .Sh RETURN VALUES | 70 | .Sh RETURN VALUES |
24 | The following return values can occur: | 71 | The following return values can occur: |
diff --git a/src/lib/libssl/man/SSL_shutdown.3 b/src/lib/libssl/man/SSL_shutdown.3 index 1dfcb54bfe..d7746e44c5 100644 --- a/src/lib/libssl/man/SSL_shutdown.3 +++ b/src/lib/libssl/man/SSL_shutdown.3 | |||
@@ -1,7 +1,55 @@ | |||
1 | .\" $OpenBSD: SSL_shutdown.3,v 1.2 2016/12/04 12:22:48 schwarze Exp $ | ||
2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 | ||
1 | .\" | 3 | .\" |
2 | .\" $OpenBSD: SSL_shutdown.3,v 1.1 2016/11/05 15:32:20 schwarze Exp $ | 4 | .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. |
5 | .\" Copyright (c) 2000, 2001, 2004, 2014 The OpenSSL Project. | ||
6 | .\" All rights reserved. | ||
3 | .\" | 7 | .\" |
4 | .Dd $Mdocdate: November 5 2016 $ | 8 | .\" Redistribution and use in source and binary forms, with or without |
9 | .\" modification, are permitted provided that the following conditions | ||
10 | .\" are met: | ||
11 | .\" | ||
12 | .\" 1. Redistributions of source code must retain the above copyright | ||
13 | .\" notice, this list of conditions and the following disclaimer. | ||
14 | .\" | ||
15 | .\" 2. Redistributions in binary form must reproduce the above copyright | ||
16 | .\" notice, this list of conditions and the following disclaimer in | ||
17 | .\" the documentation and/or other materials provided with the | ||
18 | .\" distribution. | ||
19 | .\" | ||
20 | .\" 3. All advertising materials mentioning features or use of this | ||
21 | .\" software must display the following acknowledgment: | ||
22 | .\" "This product includes software developed by the OpenSSL Project | ||
23 | .\" for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
24 | .\" | ||
25 | .\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
26 | .\" endorse or promote products derived from this software without | ||
27 | .\" prior written permission. For written permission, please contact | ||
28 | .\" openssl-core@openssl.org. | ||
29 | .\" | ||
30 | .\" 5. Products derived from this software may not be called "OpenSSL" | ||
31 | .\" nor may "OpenSSL" appear in their names without prior written | ||
32 | .\" permission of the OpenSSL Project. | ||
33 | .\" | ||
34 | .\" 6. Redistributions of any form whatsoever must retain the following | ||
35 | .\" acknowledgment: | ||
36 | .\" "This product includes software developed by the OpenSSL Project | ||
37 | .\" for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
38 | .\" | ||
39 | .\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
40 | .\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
41 | .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
42 | .\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
43 | .\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
44 | .\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
45 | .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
46 | .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
47 | .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
48 | .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
49 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
50 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | ||
51 | .\" | ||
52 | .Dd $Mdocdate: December 4 2016 $ | ||
5 | .Dt SSL_SHUTDOWN 3 | 53 | .Dt SSL_SHUTDOWN 3 |
6 | .Os | 54 | .Os |
7 | .Sh NAME | 55 | .Sh NAME |
@@ -17,7 +65,7 @@ shuts down an active TLS/SSL connection. | |||
17 | It sends the | 65 | It sends the |
18 | .Dq close notify | 66 | .Dq close notify |
19 | shutdown alert to the peer. | 67 | shutdown alert to the peer. |
20 | .Sh NOTES | 68 | .Pp |
21 | .Fn SSL_shutdown | 69 | .Fn SSL_shutdown |
22 | tries to send the | 70 | tries to send the |
23 | .Dq close notify | 71 | .Dq close notify |
@@ -96,9 +144,6 @@ and call | |||
96 | .Fn SSL_shutdown | 144 | .Fn SSL_shutdown |
97 | again, if the bidirectional shutdown is not yet complete (return value of the | 145 | again, if the bidirectional shutdown is not yet complete (return value of the |
98 | first call is 0). | 146 | first call is 0). |
99 | As the shutdown is not specially handled in the SSLv2 protocol, | ||
100 | .Fn SSL_shutdown | ||
101 | will succeed on the first call. | ||
102 | .Pp | 147 | .Pp |
103 | The behaviour of | 148 | The behaviour of |
104 | .Fn SSL_shutdown | 149 | .Fn SSL_shutdown |