summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_pkt.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/d1_pkt.c')
-rw-r--r--src/lib/libssl/d1_pkt.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c
index 83b9bf1ce2..7bdf245e84 100644
--- a/src/lib/libssl/d1_pkt.c
+++ b/src/lib/libssl/d1_pkt.c
@@ -1,7 +1,7 @@
1/* $OpenBSD: d1_pkt.c,v 1.37 2014/11/16 14:12:47 jsing Exp $ */ 1/* $OpenBSD: d1_pkt.c,v 1.38 2014/12/14 15:30:50 jsing Exp $ */
2/* 2/*
3 * DTLS implementation written by Nagendra Modadugu 3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
5 */ 5 */
6/* ==================================================================== 6/* ====================================================================
7 * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. 7 * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
@@ -11,7 +11,7 @@
11 * are met: 11 * are met:
12 * 12 *
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 15 *
16 * 2. Redistributions in binary form must reproduce the above copyright 16 * 2. Redistributions in binary form must reproduce the above copyright
17 * notice, this list of conditions and the following disclaimer in 17 * notice, this list of conditions and the following disclaimer in
@@ -62,21 +62,21 @@
62 * This package is an SSL implementation written 62 * This package is an SSL implementation written
63 * by Eric Young (eay@cryptsoft.com). 63 * by Eric Young (eay@cryptsoft.com).
64 * The implementation was written so as to conform with Netscapes SSL. 64 * The implementation was written so as to conform with Netscapes SSL.
65 * 65 *
66 * This library is free for commercial and non-commercial use as long as 66 * This library is free for commercial and non-commercial use as long as
67 * the following conditions are aheared to. The following conditions 67 * the following conditions are aheared to. The following conditions
68 * apply to all code found in this distribution, be it the RC4, RSA, 68 * apply to all code found in this distribution, be it the RC4, RSA,
69 * lhash, DES, etc., code; not just the SSL code. The SSL documentation 69 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
70 * included with this distribution is covered by the same copyright terms 70 * included with this distribution is covered by the same copyright terms
71 * except that the holder is Tim Hudson (tjh@cryptsoft.com). 71 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
72 * 72 *
73 * Copyright remains Eric Young's, and as such any Copyright notices in 73 * Copyright remains Eric Young's, and as such any Copyright notices in
74 * the code are not to be removed. 74 * the code are not to be removed.
75 * If this package is used in a product, Eric Young should be given attribution 75 * If this package is used in a product, Eric Young should be given attribution
76 * as the author of the parts of the library used. 76 * as the author of the parts of the library used.
77 * This can be in the form of a textual message at program startup or 77 * This can be in the form of a textual message at program startup or
78 * in documentation (online or textual) provided with the package. 78 * in documentation (online or textual) provided with the package.
79 * 79 *
80 * Redistribution and use in source and binary forms, with or without 80 * Redistribution and use in source and binary forms, with or without
81 * modification, are permitted provided that the following conditions 81 * modification, are permitted provided that the following conditions
82 * are met: 82 * are met:
@@ -91,10 +91,10 @@
91 * Eric Young (eay@cryptsoft.com)" 91 * Eric Young (eay@cryptsoft.com)"
92 * The word 'cryptographic' can be left out if the rouines from the library 92 * The word 'cryptographic' can be left out if the rouines from the library
93 * being used are not cryptographic related :-). 93 * being used are not cryptographic related :-).
94 * 4. If you include any Windows specific code (or a derivative thereof) from 94 * 4. If you include any Windows specific code (or a derivative thereof) from
95 * the apps directory (application code) you must include an acknowledgement: 95 * the apps directory (application code) you must include an acknowledgement:
96 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" 96 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
97 * 97 *
98 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND 98 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
99 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 99 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
100 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 100 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -106,7 +106,7 @@
106 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 106 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
107 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 107 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
108 * SUCH DAMAGE. 108 * SUCH DAMAGE.
109 * 109 *
110 * The licence and distribution terms for any publically available version or 110 * The licence and distribution terms for any publically available version or
111 * derivative of this code cannot be changed. i.e. this code cannot simply be 111 * derivative of this code cannot be changed. i.e. this code cannot simply be
112 * copied and put under another distribution licence 112 * copied and put under another distribution licence
@@ -280,7 +280,7 @@ dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue)
280} 280}
281 281
282 282
283/* retrieve a buffered record that belongs to the new epoch, i.e., not processed 283/* retrieve a buffered record that belongs to the new epoch, i.e., not processed
284 * yet */ 284 * yet */
285#define dtls1_get_unprocessed_record(s) \ 285#define dtls1_get_unprocessed_record(s) \
286 dtls1_retrieve_buffered_record((s), \ 286 dtls1_retrieve_buffered_record((s), \
@@ -313,7 +313,7 @@ dtls1_process_buffered_records(SSL *s)
313 } 313 }
314 } 314 }
315 315
316 /* sync epoch numbers once all the unprocessed records 316 /* sync epoch numbers once all the unprocessed records
317 * have been processed */ 317 * have been processed */
318 s->d1->processed_rcds.epoch = s->d1->r_epoch; 318 s->d1->processed_rcds.epoch = s->d1->r_epoch;
319 s->d1->unprocessed_rcds.epoch = s->d1->r_epoch + 1; 319 s->d1->unprocessed_rcds.epoch = s->d1->r_epoch + 1;
@@ -344,7 +344,7 @@ dtls1_process_record(SSL *s)
344 * need to be copied into rr->data by either 344 * need to be copied into rr->data by either
345 * the decryption or by the decompression 345 * the decryption or by the decompression
346 * When the data is 'copied' into the rr->data buffer, 346 * When the data is 'copied' into the rr->data buffer,
347 * rr->input will be pointed at the new buffer */ 347 * rr->input will be pointed at the new buffer */
348 348
349 /* We now have - encrypted [ MAC [ compressed [ plain ] ] ] 349 /* We now have - encrypted [ MAC [ compressed [ plain ] ] ]
350 * rr->length bytes of encrypted compressed stuff. */ 350 * rr->length bytes of encrypted compressed stuff. */
@@ -834,7 +834,7 @@ start:
834 s->shutdown |= SSL_RECEIVED_SHUTDOWN; 834 s->shutdown |= SSL_RECEIVED_SHUTDOWN;
835 return (0); 835 return (0);
836 } 836 }
837#endif 837#endif
838 return (n); 838 return (n);
839 } 839 }
840 840
@@ -1234,7 +1234,7 @@ dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, int len)
1234} 1234}
1235 1235
1236 1236
1237 /* this only happens when a client hello is received and a handshake 1237 /* this only happens when a client hello is received and a handshake
1238 * is started. */ 1238 * is started. */
1239static int 1239static int
1240have_handshake_fragment(SSL *s, int type, unsigned char *buf, 1240have_handshake_fragment(SSL *s, int type, unsigned char *buf,