Mercurial > mxe-octave

comparison src/openssl-1-fixes.patch @ 4570:ddd228f155af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
openssl: update to v1.0.2m * src/openssl-1-fixes.patch: update from mxe.cc * src/openssl.mk: update version, checksum * src/mingw-openssl-3-libdeps.patch: removed file * dist-files.mk: remove ref to mingw-openssl-3-libdeps.patch
author John D
date Tue, 05 Dec 2017 07:53:05 -0500
parents 09ad2f46e0b7
children
comparison
equal deleted inserted replaced
4569:32c1fd6aef7f 4570:ddd228f155af
1 This file is part of MXE. 1 This file is part of MXE. See LICENSE.md for licensing information.
2 See index.html for further information. 2
3 3 Contains ad hoc patches for cross building.
4 From 27c7c56780a801db21ba49139239ecafd0e8fb88 Mon Sep 17 00:00:00 2001 4
5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
5 From: Mark Brand <mabrand@mabrand.nl> 6 From: Mark Brand <mabrand@mabrand.nl>
6 Date: Wed, 8 Jan 2014 02:19:10 +0100 7 Date: Wed, 8 Jan 2014 02:19:10 +0100
7 Subject: [PATCH 1/2] winsock2 8 Subject: [PATCH 1/2] winsock2
8 9
9 -This patch has been taken from: 10 -This patch has been taken from:
10 -http://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest 11 -http://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest
11 12
12 diff --git a/e_os.h b/e_os.h
13 index 6a0aad1..4928713 100644
14 --- a/e_os.h
15 +++ b/e_os.h
16 @@ -499,7 +499,7 @@ static unsigned int _strlen31(const char *str)
17 # endif
18 # if !defined(IPPROTO_IP)
19 /* winsock[2].h was included already? */
20 -# include <winsock.h>
21 +# include <winsock2.h>
22 # endif
23 # ifdef getservbyname
24 # undef getservbyname
25 diff --git a/ssl/dtls1.h b/ssl/dtls1.h 13 diff --git a/ssl/dtls1.h b/ssl/dtls1.h
26 index e65d501..7762089 100644 14 index 1111111..2222222 100644
27 --- a/ssl/dtls1.h 15 --- a/ssl/dtls1.h
28 +++ b/ssl/dtls1.h 16 +++ b/ssl/dtls1.h
29 @@ -68,7 +68,7 @@ 17 @@ -68,7 +68,7 @@
30 #endif 18 # endif
31 #ifdef OPENSSL_SYS_WIN32 19 # ifdef OPENSSL_SYS_WIN32
32 /* Needed for struct timeval */ 20 /* Needed for struct timeval */
33 -#include <winsock.h> 21 -# include <winsock.h>
34 +#include <winsock2.h> 22 +# include <winsock2.h>
35 #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_) 23 # elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
36 #include <sys/timeval.h> 24 # include <sys/timeval.h>
37 #else 25 # else
38 diff --git a/ssl/ssltest.c b/ssl/ssltest.c 26 diff --git a/ssl/ssltest.c b/ssl/ssltest.c
39 index 4f80be8..af5f1be 100644 27 index 1111111..2222222 100644
40 --- a/ssl/ssltest.c 28 --- a/ssl/ssltest.c
41 +++ b/ssl/ssltest.c 29 +++ b/ssl/ssltest.c
42 @@ -193,7 +193,7 @@ 30 @@ -198,7 +198,7 @@
43 */ 31 #define _XOPEN_SOURCE_EXTENDED 1
44 32
45 #ifdef OPENSSL_SYS_WINDOWS 33 #ifdef OPENSSL_SYS_WINDOWS
46 -#include <winsock.h> 34 -# include <winsock.h>
47 +#include <winsock2.h> 35 +# include <winsock2.h>
48 #else 36 #else
49 #include OPENSSL_UNISTD 37 # include OPENSSL_UNISTD
50 #endif 38 #endif
51 -- 39
52 1.8.4.5 40 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
53
54
55 From 8f930a5f4b18990cf24383fde0e493afbb240c8b Mon Sep 17 00:00:00 2001
56 From: Tom Molesworth <tom@entitymodel.com> 41 From: Tom Molesworth <tom@entitymodel.com>
57 Date: Wed, 8 Jan 2014 02:20:21 +0100 42 Date: Wed, 8 Jan 2014 02:20:21 +0100
58 Subject: [PATCH 2/2] Patch OpenSSL POD docs for perl-5.16+ 43 Subject: [PATCH 2/2] Patch OpenSSL POD docs for perl-5.16+
59 44
60 Stricter validation in recent Perl versions means the install 45 Stricter validation in recent Perl versions means the install
61 stage fails without these applied. 46 stage fails without these applied.
62 47
63 Should be harmless for earlier versions of perl. 48 Should be harmless for earlier versions of perl.
64 49
65 diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod 50 diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod
66 index a76b3e0..9a05fa4 100644 51 index 1111111..2222222 100644
67 --- a/doc/apps/cms.pod 52 --- a/doc/apps/cms.pod
68 +++ b/doc/apps/cms.pod 53 +++ b/doc/apps/cms.pod
69 @@ -465,28 +465,28 @@ with caution. For a fuller description see L<CMS_decrypt(3)|CMS_decrypt(3)>). 54 @@ -483,28 +483,28 @@ with caution. For a fuller description see L<CMS_decrypt(3)|CMS_decrypt(3)>).
70 55
71 =over 4 56 =over 4
72 57
73 -=item Z<>0 58 -=item Z<>0
74 +=item * Z<>0 59 +=item * Z<>0
100 +=item * Z<>5 85 +=item * Z<>5
101 86
102 the message was verified correctly but an error occurred writing out 87 the message was verified correctly but an error occurred writing out
103 the signers certificates. 88 the signers certificates.
104 diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod 89 diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod
105 index d39a59a..1a5cfa6 100644 90 index 1111111..2222222 100644
106 --- a/doc/apps/smime.pod 91 --- a/doc/apps/smime.pod
107 +++ b/doc/apps/smime.pod 92 +++ b/doc/apps/smime.pod
108 @@ -308,28 +308,28 @@ remains DER. 93 @@ -313,28 +313,28 @@ remains DER.
109 94
110 =over 4 95 =over 4
111 96
112 -=item Z<>0 97 -=item Z<>0
113 +=item * Z<>0 98 +=item * Z<>0
139 +=item * Z<>5 124 +=item * Z<>5
140 125
141 the message was verified correctly but an error occurred writing out 126 the message was verified correctly but an error occurred writing out
142 the signers certificates. 127 the signers certificates.
143 diff --git a/doc/crypto/rand.pod b/doc/crypto/rand.pod 128 diff --git a/doc/crypto/rand.pod b/doc/crypto/rand.pod
144 index 1c068c8..8477fda 100644 129 index 1111111..2222222 100644
145 --- a/doc/crypto/rand.pod 130 --- a/doc/crypto/rand.pod
146 +++ b/doc/crypto/rand.pod 131 +++ b/doc/crypto/rand.pod
147 @@ -74,16 +74,16 @@ First up I will state the things I believe I need for a good RNG. 132 @@ -74,16 +74,16 @@ First up I will state the things I believe I need for a good RNG.
148 133
149 =over 4 134 =over 4
194 +=item * 7 179 +=item * 7
195 180
196 Given the random number output stream, it should not be possible to determine 181 Given the random number output stream, it should not be possible to determine
197 the RNG state or the next random number. 182 the RNG state or the next random number.
198 diff --git a/doc/ssl/SSL_COMP_add_compression_method.pod b/doc/ssl/SSL_COMP_add_compression_method.pod 183 diff --git a/doc/ssl/SSL_COMP_add_compression_method.pod b/doc/ssl/SSL_COMP_add_compression_method.pod
199 index f4d191c..5f2a3f1 100644 184 index 1111111..2222222 100644
200 --- a/doc/ssl/SSL_COMP_add_compression_method.pod 185 --- a/doc/ssl/SSL_COMP_add_compression_method.pod
201 +++ b/doc/ssl/SSL_COMP_add_compression_method.pod 186 +++ b/doc/ssl/SSL_COMP_add_compression_method.pod
202 @@ -53,11 +53,11 @@ SSL_COMP_add_compression_method() may return the following values: 187 @@ -59,11 +59,11 @@ SSL_COMP_add_compression_method() may return the following values:
203 188
204 =over 4 189 =over 4
205 190
206 -=item Z<>0 191 -=item Z<>0
207 +=item * Z<>0 192 +=item * Z<>0
212 +=item * Z<>1 197 +=item * Z<>1
213 198
214 The operation failed. Check the error queue to find out the reason. 199 The operation failed. Check the error queue to find out the reason.
215 200
216 diff --git a/doc/ssl/SSL_CTX_add_session.pod b/doc/ssl/SSL_CTX_add_session.pod 201 diff --git a/doc/ssl/SSL_CTX_add_session.pod b/doc/ssl/SSL_CTX_add_session.pod
217 index 8e0abd3..f5a487c 100644 202 index 1111111..2222222 100644
218 --- a/doc/ssl/SSL_CTX_add_session.pod 203 --- a/doc/ssl/SSL_CTX_add_session.pod
219 +++ b/doc/ssl/SSL_CTX_add_session.pod 204 +++ b/doc/ssl/SSL_CTX_add_session.pod
220 @@ -52,13 +52,13 @@ The following values are returned by all functions: 205 @@ -52,13 +52,13 @@ The following values are returned by all functions:
221 206
222 =over 4 207 =over 4
232 +=item * Z<>1 217 +=item * Z<>1
233 218
234 The operation succeeded. 219 The operation succeeded.
235 220
236 diff --git a/doc/ssl/SSL_CTX_load_verify_locations.pod b/doc/ssl/SSL_CTX_load_verify_locations.pod 221 diff --git a/doc/ssl/SSL_CTX_load_verify_locations.pod b/doc/ssl/SSL_CTX_load_verify_locations.pod
237 index d1d8977..449c8c9 100644 222 index 1111111..2222222 100644
238 --- a/doc/ssl/SSL_CTX_load_verify_locations.pod 223 --- a/doc/ssl/SSL_CTX_load_verify_locations.pod
239 +++ b/doc/ssl/SSL_CTX_load_verify_locations.pod 224 +++ b/doc/ssl/SSL_CTX_load_verify_locations.pod
240 @@ -100,13 +100,13 @@ The following return values can occur: 225 @@ -100,13 +100,13 @@ The following return values can occur:
241 226
242 =over 4 227 =over 4
252 +=item * Z<>1 237 +=item * Z<>1
253 238
254 The operation succeeded. 239 The operation succeeded.
255 240
256 diff --git a/doc/ssl/SSL_CTX_set_client_CA_list.pod b/doc/ssl/SSL_CTX_set_client_CA_list.pod 241 diff --git a/doc/ssl/SSL_CTX_set_client_CA_list.pod b/doc/ssl/SSL_CTX_set_client_CA_list.pod
257 index 5e97392..6b04440 100644 242 index 1111111..2222222 100644
258 --- a/doc/ssl/SSL_CTX_set_client_CA_list.pod 243 --- a/doc/ssl/SSL_CTX_set_client_CA_list.pod
259 +++ b/doc/ssl/SSL_CTX_set_client_CA_list.pod 244 +++ b/doc/ssl/SSL_CTX_set_client_CA_list.pod
260 @@ -66,13 +66,13 @@ values: 245 @@ -66,13 +66,13 @@ values:
261 246
262 =over 4 247 =over 4
272 +=item * Z<>1 257 +=item * Z<>1
273 258
274 The operation succeeded. 259 The operation succeeded.
275 260
276 diff --git a/doc/ssl/SSL_CTX_set_session_id_context.pod b/doc/ssl/SSL_CTX_set_session_id_context.pod 261 diff --git a/doc/ssl/SSL_CTX_set_session_id_context.pod b/doc/ssl/SSL_CTX_set_session_id_context.pod
277 index 7c9e515..ea36746 100644 262 index 1111111..2222222 100644
278 --- a/doc/ssl/SSL_CTX_set_session_id_context.pod 263 --- a/doc/ssl/SSL_CTX_set_session_id_context.pod
279 +++ b/doc/ssl/SSL_CTX_set_session_id_context.pod 264 +++ b/doc/ssl/SSL_CTX_set_session_id_context.pod
280 @@ -64,13 +64,13 @@ return the following values: 265 @@ -64,13 +64,13 @@ return the following values:
281 266
282 =over 4 267 =over 4
292 +=item * Z<>1 277 +=item * Z<>1
293 278
294 The operation succeeded. 279 The operation succeeded.
295 280
296 diff --git a/doc/ssl/SSL_CTX_set_ssl_version.pod b/doc/ssl/SSL_CTX_set_ssl_version.pod 281 diff --git a/doc/ssl/SSL_CTX_set_ssl_version.pod b/doc/ssl/SSL_CTX_set_ssl_version.pod
297 index e254f96..c15f86e 100644 282 index 1111111..2222222 100644
298 --- a/doc/ssl/SSL_CTX_set_ssl_version.pod 283 --- a/doc/ssl/SSL_CTX_set_ssl_version.pod
299 +++ b/doc/ssl/SSL_CTX_set_ssl_version.pod 284 +++ b/doc/ssl/SSL_CTX_set_ssl_version.pod
300 @@ -42,11 +42,11 @@ and SSL_set_ssl_method(): 285 @@ -42,11 +42,11 @@ and SSL_set_ssl_method():
301 286
302 =over 4 287 =over 4
310 +=item * Z<>1 295 +=item * Z<>1
311 296
312 The operation succeeded. 297 The operation succeeded.
313 298
314 diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 299 diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
315 index 9da7201..a60d041 100644 300 index 1111111..2222222 100644
316 --- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 301 --- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
317 +++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 302 +++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
318 @@ -83,7 +83,7 @@ Return values from the server callback are interpreted as follows: 303 @@ -83,7 +83,7 @@ Return values from the server callback are interpreted as follows:
319 304
320 =over 4 305 =over 4
321 306
322 -=item > 0
323 +=item * > 0
324
325 PSK identity was found and the server callback has provided the PSK
326 successfully in parameter B<psk>. Return value is the length of
327 @@ -96,7 +96,7 @@ data to B<psk> and return the length of the random data, so the
328 connection will fail with decryption_error before it will be finished
329 completely.
330
331 -=item Z<>0 307 -=item Z<>0
332 +=item * Z<>0 308 +=item * Z<>0
333 309
334 PSK identity was not found. An "unknown_psk_identity" alert message 310 PSK identity was not found. An "unknown_psk_identity" alert message
335 will be sent and the connection setup fails. 311 will be sent and the connection setup fails.
336 diff --git a/doc/ssl/SSL_accept.pod b/doc/ssl/SSL_accept.pod 312 diff --git a/doc/ssl/SSL_accept.pod b/doc/ssl/SSL_accept.pod
337 index 2239444..5e032e6 100644 313 index 1111111..2222222 100644
338 --- a/doc/ssl/SSL_accept.pod 314 --- a/doc/ssl/SSL_accept.pod
339 +++ b/doc/ssl/SSL_accept.pod 315 +++ b/doc/ssl/SSL_accept.pod
340 @@ -44,18 +44,18 @@ The following return values can occur: 316 @@ -41,18 +41,18 @@ The following return values can occur:
341 317
342 =over 4 318 =over 4
343 319
344 -=item Z<>0 320 -=item Z<>0
345 +=item * Z<>0 321 +=item * Z<>0
358 +=item * E<lt>0 334 +=item * E<lt>0
359 335
360 The TLS/SSL handshake was not successful because a fatal error occurred either 336 The TLS/SSL handshake was not successful because a fatal error occurred either
361 at the protocol level or a connection failure occurred. The shutdown was 337 at the protocol level or a connection failure occurred. The shutdown was
362 diff --git a/doc/ssl/SSL_clear.pod b/doc/ssl/SSL_clear.pod 338 diff --git a/doc/ssl/SSL_clear.pod b/doc/ssl/SSL_clear.pod
363 index ba192bd..479f97f 100644 339 index 1111111..2222222 100644
364 --- a/doc/ssl/SSL_clear.pod 340 --- a/doc/ssl/SSL_clear.pod
365 +++ b/doc/ssl/SSL_clear.pod 341 +++ b/doc/ssl/SSL_clear.pod
366 @@ -56,12 +56,12 @@ The following return values can occur: 342 @@ -56,12 +56,12 @@ The following return values can occur:
367 343
368 =over 4 344 =over 4
377 +=item * Z<>1 353 +=item * Z<>1
378 354
379 The SSL_clear() operation was successful. 355 The SSL_clear() operation was successful.
380 356
381 diff --git a/doc/ssl/SSL_connect.pod b/doc/ssl/SSL_connect.pod 357 diff --git a/doc/ssl/SSL_connect.pod b/doc/ssl/SSL_connect.pod
382 index 68e2b82..52c4aa9 100644 358 index 1111111..2222222 100644
383 --- a/doc/ssl/SSL_connect.pod 359 --- a/doc/ssl/SSL_connect.pod
384 +++ b/doc/ssl/SSL_connect.pod 360 +++ b/doc/ssl/SSL_connect.pod
385 @@ -41,18 +41,18 @@ The following return values can occur: 361 @@ -41,18 +41,18 @@ The following return values can occur:
386 362
387 =over 4 363 =over 4
403 +=item * E<lt>0 379 +=item * E<lt>0
404 380
405 The TLS/SSL handshake was not successful, because a fatal error occurred either 381 The TLS/SSL handshake was not successful, because a fatal error occurred either
406 at the protocol level or a connection failure occurred. The shutdown was 382 at the protocol level or a connection failure occurred. The shutdown was
407 diff --git a/doc/ssl/SSL_do_handshake.pod b/doc/ssl/SSL_do_handshake.pod 383 diff --git a/doc/ssl/SSL_do_handshake.pod b/doc/ssl/SSL_do_handshake.pod
408 index b35ddf5..871f15c 100644 384 index 1111111..2222222 100644
409 --- a/doc/ssl/SSL_do_handshake.pod 385 --- a/doc/ssl/SSL_do_handshake.pod
410 +++ b/doc/ssl/SSL_do_handshake.pod 386 +++ b/doc/ssl/SSL_do_handshake.pod
411 @@ -45,18 +45,18 @@ The following return values can occur: 387 @@ -42,18 +42,18 @@ The following return values can occur:
412 388
413 =over 4 389 =over 4
414 390
415 -=item Z<>0 391 -=item Z<>0
416 +=item * Z<>0 392 +=item * Z<>0
429 +=item * E<lt>0 405 +=item * E<lt>0
430 406
431 The TLS/SSL handshake was not successful because a fatal error occurred either 407 The TLS/SSL handshake was not successful because a fatal error occurred either
432 at the protocol level or a connection failure occurred. The shutdown was 408 at the protocol level or a connection failure occurred. The shutdown was
433 diff --git a/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod b/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod 409 diff --git a/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod b/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
434 index 165c6a5..073e99c 100644 410 index 1111111..2222222 100644
435 --- a/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod 411 --- a/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
436 +++ b/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod 412 +++ b/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
437 @@ -36,11 +36,11 @@ before the SSL index is created. 413 @@ -36,11 +36,11 @@ before the SSL index is created.
438 414
439 =over 4 415 =over 4
447 +=item * E<lt>0 423 +=item * E<lt>0
448 424
449 An error occurred, check the error stack for a detailed error message. 425 An error occurred, check the error stack for a detailed error message.
450 426
451 diff --git a/doc/ssl/SSL_get_fd.pod b/doc/ssl/SSL_get_fd.pod 427 diff --git a/doc/ssl/SSL_get_fd.pod b/doc/ssl/SSL_get_fd.pod
452 index 89260b5..1207658 100644 428 index 1111111..2222222 100644
453 --- a/doc/ssl/SSL_get_fd.pod 429 --- a/doc/ssl/SSL_get_fd.pod
454 +++ b/doc/ssl/SSL_get_fd.pod 430 +++ b/doc/ssl/SSL_get_fd.pod
455 @@ -26,12 +26,12 @@ The following return values can occur: 431 @@ -26,12 +26,12 @@ The following return values can occur:
456 432
457 =over 4 433 =over 4
466 +=item * E<gt>=0 442 +=item * E<gt>=0
467 443
468 The file descriptor linked to B<ssl>. 444 The file descriptor linked to B<ssl>.
469 445
470 diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod 446 diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod
471 index 8ca0ce5..14c472f 100644 447 index 1111111..2222222 100644
472 --- a/doc/ssl/SSL_read.pod 448 --- a/doc/ssl/SSL_read.pod
473 +++ b/doc/ssl/SSL_read.pod 449 +++ b/doc/ssl/SSL_read.pod
474 @@ -81,12 +81,12 @@ The following return values can occur: 450 @@ -81,16 +81,16 @@ The following return values can occur:
475 451
476 =over 4 452 =over 4
477 453
478 -=item E<gt>0 454 -=item E<gt> 0
479 +=item * E<gt>0 455 +=item * E<gt> 0
480 456
481 The read operation was successful; the return value is the number of 457 The read operation was successful.
482 bytes actually read from the TLS/SSL connection. 458 The return value is the number of bytes actually read from the TLS/SSL
483 459 connection.
484 -=item Z<>0 460
485 +=item * Z<>0 461 -=item Z<><= 0
486 462 +=item * Z<><= 0
487 The read operation was not successful. The reason may either be a clean 463
488 shutdown due to a "close notify" alert sent by the peer (in which case
489 @@ -103,7 +103,7 @@ only be detected, whether the underlying connection was closed. It cannot
490 be checked, whether the closure was initiated by the peer or by something
491 else.
492 464
493 -=item E<lt>0 465 -=item E<lt>0
494 +=item * E<lt>0 466 +=item * E<lt>0
495 467
496 The read operation was not successful, because either an error occurred 468 The read operation was not successful, because either the connection was closed,
497 or action must be taken by the calling process. Call SSL_get_error() with the 469 an error occurred or action must be taken by the calling process.
498 diff --git a/doc/ssl/SSL_session_reused.pod b/doc/ssl/SSL_session_reused.pod 470 diff --git a/doc/ssl/SSL_session_reused.pod b/doc/ssl/SSL_session_reused.pod
499 index b09d8a7..7f49da1 100644 471 index 1111111..2222222 100644
500 --- a/doc/ssl/SSL_session_reused.pod 472 --- a/doc/ssl/SSL_session_reused.pod
501 +++ b/doc/ssl/SSL_session_reused.pod 473 +++ b/doc/ssl/SSL_session_reused.pod
502 @@ -27,11 +27,11 @@ The following return values can occur: 474 @@ -27,11 +27,11 @@ The following return values can occur:
503 475
504 =over 4 476 =over 4
512 +=item * Z<>1 484 +=item * Z<>1
513 485
514 A session was reused. 486 A session was reused.
515 487
516 diff --git a/doc/ssl/SSL_set_fd.pod b/doc/ssl/SSL_set_fd.pod 488 diff --git a/doc/ssl/SSL_set_fd.pod b/doc/ssl/SSL_set_fd.pod
517 index 1480871..bfc39ed 100644 489 index 1111111..2222222 100644
518 --- a/doc/ssl/SSL_set_fd.pod 490 --- a/doc/ssl/SSL_set_fd.pod
519 +++ b/doc/ssl/SSL_set_fd.pod 491 +++ b/doc/ssl/SSL_set_fd.pod
520 @@ -35,11 +35,11 @@ The following return values can occur: 492 @@ -35,11 +35,11 @@ The following return values can occur:
521 493
522 =over 4 494 =over 4
530 +=item * Z<>1 502 +=item * Z<>1
531 503
532 The operation succeeded. 504 The operation succeeded.
533 505
534 diff --git a/doc/ssl/SSL_set_session.pod b/doc/ssl/SSL_set_session.pod 506 diff --git a/doc/ssl/SSL_set_session.pod b/doc/ssl/SSL_set_session.pod
535 index 197b521..fbdee4c 100644 507 index 1111111..2222222 100644
536 --- a/doc/ssl/SSL_set_session.pod 508 --- a/doc/ssl/SSL_set_session.pod
537 +++ b/doc/ssl/SSL_set_session.pod 509 +++ b/doc/ssl/SSL_set_session.pod
538 @@ -37,11 +37,11 @@ The following return values can occur: 510 @@ -37,11 +37,11 @@ The following return values can occur:
539 511
540 =over 4 512 =over 4
548 +=item * Z<>1 520 +=item * Z<>1
549 521
550 The operation succeeded. 522 The operation succeeded.
551 523
552 diff --git a/doc/ssl/SSL_set_shutdown.pod b/doc/ssl/SSL_set_shutdown.pod 524 diff --git a/doc/ssl/SSL_set_shutdown.pod b/doc/ssl/SSL_set_shutdown.pod
553 index fe01308..879a33a 100644 525 index 1111111..2222222 100644
554 --- a/doc/ssl/SSL_set_shutdown.pod 526 --- a/doc/ssl/SSL_set_shutdown.pod
555 +++ b/doc/ssl/SSL_set_shutdown.pod 527 +++ b/doc/ssl/SSL_set_shutdown.pod
556 @@ -24,16 +24,16 @@ The shutdown state of an ssl connection is a bitmask of: 528 @@ -24,16 +24,16 @@ The shutdown state of an ssl connection is a bitmask of:
557 529
558 =over 4 530 =over 4
572 +=item * SSL_RECEIVED_SHUTDOWN 544 +=item * SSL_RECEIVED_SHUTDOWN
573 545
574 A shutdown alert was received form the peer, either a normal "close notify" 546 A shutdown alert was received form the peer, either a normal "close notify"
575 or a fatal error. 547 or a fatal error.
576 diff --git a/doc/ssl/SSL_shutdown.pod b/doc/ssl/SSL_shutdown.pod 548 diff --git a/doc/ssl/SSL_shutdown.pod b/doc/ssl/SSL_shutdown.pod
577 index 85d4a64..9fe029b 100644 549 index 1111111..2222222 100644
578 --- a/doc/ssl/SSL_shutdown.pod 550 --- a/doc/ssl/SSL_shutdown.pod
579 +++ b/doc/ssl/SSL_shutdown.pod 551 +++ b/doc/ssl/SSL_shutdown.pod
580 @@ -92,19 +92,19 @@ The following return values can occur: 552 @@ -92,19 +92,19 @@ The following return values can occur:
581 553
582 =over 4 554 =over 4
593 +=item * Z<>1 565 +=item * Z<>1
594 566
595 The shutdown was successfully completed. The "close notify" alert was sent 567 The shutdown was successfully completed. The "close notify" alert was sent
596 and the peer's "close notify" alert was received. 568 and the peer's "close notify" alert was received.
597 569
598 -=item -1 570 -=item E<lt>0
599 +=item * -1 571 +=item * E<lt>0
600 572
601 The shutdown was not successful because a fatal error occurred either 573 The shutdown was not successful because a fatal error occurred either
602 at the protocol level or a connection failure occurred. It can also occur if 574 at the protocol level or a connection failure occurred. It can also occur if
603 diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod 575 diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod
604 index a57617f..70c1630 100644 576 index 1111111..2222222 100644
605 --- a/doc/ssl/SSL_write.pod 577 --- a/doc/ssl/SSL_write.pod
606 +++ b/doc/ssl/SSL_write.pod 578 +++ b/doc/ssl/SSL_write.pod
607 @@ -74,12 +74,12 @@ The following return values can occur: 579 @@ -74,12 +74,12 @@ The following return values can occur:
608 580
609 =over 4 581 =over 4
610 582
611 -=item E<gt>0 583 -=item E<gt> 0
612 +=item * E<gt>0 584 +=item * E<gt> 0
613 585
614 The write operation was successful, the return value is the number of 586 The write operation was successful, the return value is the number of
615 bytes actually written to the TLS/SSL connection. 587 bytes actually written to the TLS/SSL connection.
616 588
617 -=item Z<>0 589 -=item Z<><= 0
618 +=item * Z<>0 590 +=item * Z<><= 0
619 591
620 The write operation was not successful. Probably the underlying connection 592 The write operation was not successful, because either the connection was
621 was closed. Call SSL_get_error() with the return value B<ret> to find out, 593 closed, an error occurred or action must be taken by the calling process.
622 @@ -90,7 +90,7 @@ SSLv2 (deprecated) does not support a shutdown alert protocol, so it can
623 only be detected, whether the underlying connection was closed. It cannot
624 be checked, why the closure happened.
625
626 -=item E<lt>0
627 +=item * E<lt>0
628
629 The write operation was not successful, because either an error occurred
630 or action must be taken by the calling process. Call SSL_get_error() with the
631 --
632 1.8.4.5
633