| d1_pkt.c (246772) | d1_pkt.c (261037) |
|---|---|
| 1/* ssl/d1_pkt.c */ 2/* 3 * DTLS implementation written by Nagendra Modadugu 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 5 */ 6/* ==================================================================== 7 * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. 8 * --- 833 unchanged lines hidden (view full) --- 842 /* anything other than a timeout is an error */ 843 if (ret <= 0) 844 return(ret); 845 else 846 goto start; 847 } 848 } 849 | 1/* ssl/d1_pkt.c */ 2/* 3 * DTLS implementation written by Nagendra Modadugu 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 5 */ 6/* ==================================================================== 7 * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. 8 * --- 833 unchanged lines hidden (view full) --- 842 /* anything other than a timeout is an error */ 843 if (ret <= 0) 844 return(ret); 845 else 846 goto start; 847 } 848 } 849 |
| 850 if (s->d1->listen && rr->type != SSL3_RT_HANDSHAKE) 851 { 852 rr->length = 0; 853 goto start; 854 } 855 |
|
| 850 /* we now have a packet which can be read and processed */ 851 852 if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec, 853 * reset by ssl3_get_finished */ 854 && (rr->type != SSL3_RT_HANDSHAKE)) 855 { 856 /* We now have application data between CCS and Finished. 857 * Most likely the packets were reordered on their way, so --- 188 unchanged lines hidden (view full) --- 1046 if (s->msg_callback) 1047 s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, 1048 s->d1->handshake_fragment, 4, s, s->msg_callback_arg); 1049 1050 if (SSL_is_init_finished(s) && 1051 !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) && 1052 !s->s3->renegotiate) 1053 { | 856 /* we now have a packet which can be read and processed */ 857 858 if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec, 859 * reset by ssl3_get_finished */ 860 && (rr->type != SSL3_RT_HANDSHAKE)) 861 { 862 /* We now have application data between CCS and Finished. 863 * Most likely the packets were reordered on their way, so --- 188 unchanged lines hidden (view full) --- 1052 if (s->msg_callback) 1053 s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, 1054 s->d1->handshake_fragment, 4, s, s->msg_callback_arg); 1055 1056 if (SSL_is_init_finished(s) && 1057 !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) && 1058 !s->s3->renegotiate) 1059 { |
| 1060 s->d1->handshake_read_seq++; |
|
| 1054 s->new_session = 1; 1055 ssl3_renegotiate(s); 1056 if (ssl3_renegotiate_check(s)) 1057 { 1058 i=s->handshake_func(s); 1059 if (i < 0) return(i); 1060 if (i == 0) 1061 { --- 832 unchanged lines hidden --- | 1061 s->new_session = 1; 1062 ssl3_renegotiate(s); 1063 if (ssl3_renegotiate_check(s)) 1064 { 1065 i=s->handshake_func(s); 1066 if (i < 0) return(i); 1067 if (i == 0) 1068 { --- 832 unchanged lines hidden --- |