summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s23_srvr.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/s23_srvr.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c
index 665907ee12..1f17c19c06 100644
--- a/src/lib/libssl/s23_srvr.c
+++ b/src/lib/libssl/s23_srvr.c
@@ -5,21 +5,21 @@
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA, 11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation 12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms 13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com). 14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 * 15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in 16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed. 17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution 18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used. 19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or 20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package. 21 * in documentation (online or textual) provided with the package.
22 * 22 *
23 * Redistribution and use in source and binary forms, with or without 23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions 24 * modification, are permitted provided that the following conditions
25 * are met: 25 * are met:
@@ -34,10 +34,10 @@
34 * Eric Young (eay@cryptsoft.com)" 34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library 35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-). 36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from 37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement: 38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" 39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 * 40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND 41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE. 51 * SUCH DAMAGE.
52 * 52 *
53 * The licence and distribution terms for any publically available version or 53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be 54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence 55 * copied and put under another distribution licence
@@ -63,7 +63,7 @@
63 * are met: 63 * are met:
64 * 64 *
65 * 1. Redistributions of source code must retain the above copyright 65 * 1. Redistributions of source code must retain the above copyright
66 * notice, this list of conditions and the following disclaimer. 66 * notice, this list of conditions and the following disclaimer.
67 * 67 *
68 * 2. Redistributions in binary form must reproduce the above copyright 68 * 2. Redistributions in binary form must reproduce the above copyright
69 * notice, this list of conditions and the following disclaimer in 69 * notice, this list of conditions and the following disclaimer in
@@ -307,8 +307,8 @@ ssl23_get_client_hello(SSL *s)
307 } else if ((p[0] == SSL3_RT_HANDSHAKE) && 307 } else if ((p[0] == SSL3_RT_HANDSHAKE) &&
308 (p[1] == SSL3_VERSION_MAJOR) && 308 (p[1] == SSL3_VERSION_MAJOR) &&
309 (p[5] == SSL3_MT_CLIENT_HELLO) && 309 (p[5] == SSL3_MT_CLIENT_HELLO) &&
310 ((p[3] == 0 && p[4] < 5 /* silly record length? */) 310 ((p[3] == 0 && p[4] < 5 /* silly record length? */) ||
311 || (p[9] >= p[1]))) { 311 (p[9] >= p[1]))) {
312 /* 312 /*
313 * SSLv3 or tls1 header 313 * SSLv3 or tls1 header
314 */ 314 */
@@ -397,7 +397,7 @@ ssl23_get_client_hello(SSL *s)
397 ssl3_finish_mac(s, s->packet + 2, s->packet_length - 2); 397 ssl3_finish_mac(s, s->packet + 2, s->packet_length - 2);
398 if (s->msg_callback) 398 if (s->msg_callback)
399 s->msg_callback(0, SSL2_VERSION, 0, s->packet + 2, 399 s->msg_callback(0, SSL2_VERSION, 0, s->packet + 2,
400 s->packet_length-2, s, s->msg_callback_arg); 400 s->packet_length - 2, s, s->msg_callback_arg);
401 401
402 p = s->packet; 402 p = s->packet;
403 p += 5; 403 p += 5;
@@ -405,8 +405,7 @@ ssl23_get_client_hello(SSL *s)
405 n2s(p, sil); 405 n2s(p, sil);
406 n2s(p, cl); 406 n2s(p, cl);
407 d = (unsigned char *)s->init_buf->data; 407 d = (unsigned char *)s->init_buf->data;
408 if ((csl + sil + cl + 11) != s->packet_length) 408 if ((csl + sil + cl + 11) != s->packet_length) {
409 {
410 /* 409 /*
411 * We can't have TLS extensions in SSL 2.0 format 410 * We can't have TLS extensions in SSL 2.0 format
412 * Client Hello, can we ? Error condition should be 411 * Client Hello, can we ? Error condition should be
@@ -482,7 +481,8 @@ ssl23_get_client_hello(SSL *s)
482 if ((type == 2) || (type == 3)) { 481 if ((type == 2) || (type == 3)) {
483 /* we have SSLv3/TLSv1 (type 2: SSL2 style, type 3: SSL3/TLS style) */ 482 /* we have SSLv3/TLSv1 (type 2: SSL2 style, type 3: SSL3/TLS style) */
484 483
485 if (!ssl_init_wbio_buffer(s, 1)) goto err; 484 if (!ssl_init_wbio_buffer(s, 1))
485 goto err;
486 486
487 /* we are in this state */ 487 /* we are in this state */
488 s->state = SSL3_ST_SR_CLNT_HELLO_A; 488 s->state = SSL3_ST_SR_CLNT_HELLO_A;