Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							6458e3b743 
							
						 
					 
					
						
						
							
							Some more refactoring/tuning.  
						
						
						
						
					 
					
						2015-01-08 14:16:56 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							846ba473af 
							
						 
					 
					
						
						
							
							Minor refactoring  
						
						
						
						
					 
					
						2015-01-08 13:54:38 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							d94232389e 
							
						 
					 
					
						
						
							
							Skip signature_algorithms ext if PSK only  
						
						
						
						
					 
					
						2014-12-02 11:57:29 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							eaecbd3ba8 
							
						 
					 
					
						
						
							
							Fix warning in reduced configs  
						
						
						
						
					 
					
						2014-12-02 10:40:55 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							615e677c0b 
							
						 
					 
					
						
						
							
							Make renegotiation a compile-time option  
						
						
						
						
					 
					
						2014-12-02 10:40:54 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							f9d778d635 
							
						 
					 
					
						
						
							
							Merge branch 'etm' into dtls  
						
						... 
						
						
						
						* etm:
  Fix warning in reduced config
  Update Changelog for EtM
  Keep EtM state across renegotiations
  Adjust minimum length for EtM
  Don't send back EtM extension if not using CBC
  Fix for the RFC erratum
  Implement EtM
  Preparation for EtM
  Implement initial negotiation of EtM
Conflicts:
	include/polarssl/check_config.h 
						
						
					 
					
						2014-11-06 01:36:32 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							56d985d0a6 
							
						 
					 
					
						
						
							
							Merge branch 'session-hash' into dtls  
						
						... 
						
						
						
						* session-hash:
  Update Changelog for session-hash
  Make session-hash depend on TLS versions
  Forbid extended master secret with SSLv3
  compat.sh: allow git version of gnutls
  compat.sh: make options a bit more robust
  Implement extended master secret
  Add negotiation of Extended Master Secret
Conflicts:
	include/polarssl/check_config.h
	programs/ssl/ssl_server2.c 
						
						
					 
					
						2014-11-06 01:25:09 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							fedba98ede 
							
						 
					 
					
						
						
							
							Merge branch 'fb-scsv' into dtls  
						
						... 
						
						
						
						* fb-scsv:
  Update Changelog for FALLBACK_SCSV
  Implement FALLBACK_SCSV server-side
  Implement FALLBACK_SCSV client-side 
						
						
					 
					
						2014-11-05 16:12:09 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							b575b54cb9 
							
						 
					 
					
						
						
							
							Forbid extended master secret with SSLv3  
						
						
						
						
					 
					
						2014-11-05 16:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							78e745fc0a 
							
						 
					 
					
						
						
							
							Don't send back EtM extension if not using CBC  
						
						
						
						
					 
					
						2014-11-05 16:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							699cafaea2 
							
						 
					 
					
						
						
							
							Implement initial negotiation of EtM  
						
						... 
						
						
						
						Not implemented yet:
- actually using EtM
- conditions on renegotiation 
						
						
					 
					
						2014-11-05 16:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							01b2699198 
							
						 
					 
					
						
						
							
							Implement FALLBACK_SCSV server-side  
						
						
						
						
					 
					
						2014-11-05 16:00:49 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							367381fddd 
							
						 
					 
					
						
						
							
							Add negotiation of Extended Master Secret  
						
						... 
						
						
						
						(But not the actual thing yet.) 
						
						
					 
					
						2014-11-05 16:00:49 +01:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							8a7cf2543a 
							
						 
					 
					
						
						
							
							Add a few #ifdefs  
						
						
						
						
					 
					
						2014-10-21 16:32:51 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							579950c2bb 
							
						 
					 
					
						
						
							
							Fix bug with non-blocking I/O and cookies  
						
						
						
						
					 
					
						2014-10-21 16:32:42 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							7de3c9eecb 
							
						 
					 
					
						
						
							
							Count timeout per flight, not per message  
						
						
						
						
					 
					
						2014-10-21 16:32:41 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							f03c7aa469 
							
						 
					 
					
						
						
							
							Add replay detection in parse_client_hello()  
						
						
						
						
					 
					
						2014-10-21 16:32:35 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							5d8ba53ace 
							
						 
					 
					
						
						
							
							Expand and fix resend infrastructure  
						
						
						
						
					 
					
						2014-10-21 16:32:28 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							5ee96546de 
							
						 
					 
					
						
						
							
							Add length checks in parse_certificate_verify()  
						
						
						
						
					 
					
						2014-10-21 16:30:32 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							72226214b1 
							
						 
					 
					
						
						
							
							Merge checks in ssl_parse_certificate_verify()  
						
						
						
						
					 
					
						2014-10-21 16:30:32 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							4528f3f5c0 
							
						 
					 
					
						
						
							
							No memmove: parse_certificate_verify()  
						
						
						
						
					 
					
						2014-10-21 16:30:30 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							2114d724dc 
							
						 
					 
					
						
						
							
							No memmove: ssl_parse_client_key_exchange()  
						
						
						
						
					 
					
						2014-10-21 16:30:29 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							f899583f94 
							
						 
					 
					
						
						
							
							Prepare moving away from memmove() on incoming HS  
						
						
						
						
					 
					
						2014-10-21 16:30:29 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							19d438f4ff 
							
						 
					 
					
						
						
							
							Get rid of memmove for DTLS in parse_client_hello()  
						
						
						
						
					 
					
						2014-10-21 16:30:28 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							1aa586e41d 
							
						 
					 
					
						
						
							
							Check handshake message_seq field  
						
						
						
						
					 
					
						2014-10-21 16:30:24 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							d9ba0d96b6 
							
						 
					 
					
						
						
							
							Prepare for checking incoming handshake seqnum  
						
						
						
						
					 
					
						2014-10-21 16:30:23 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							30d16eb429 
							
						 
					 
					
						
						
							
							Fix client-initiated renegotiation with DTLS  
						
						
						
						
					 
					
						2014-10-21 16:30:20 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							b35fe5638a 
							
						 
					 
					
						
						
							
							Fix HelloVerifyRequest version handling  
						
						
						
						
					 
					
						2014-10-21 16:30:20 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							7d38d215b1 
							
						 
					 
					
						
						
							
							Allow disabling HelloVerifyRequest  
						
						
						
						
					 
					
						2014-10-21 16:30:18 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							232edd46be 
							
						 
					 
					
						
						
							
							Move cookie callbacks implementation to own module  
						
						
						
						
					 
					
						2014-10-21 16:30:17 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							d485d194f9 
							
						 
					 
					
						
						
							
							Move to a callback interface for DTLS cookies  
						
						
						
						
					 
					
						2014-10-21 16:30:17 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							d7f9bc5091 
							
						 
					 
					
						
						
							
							Refactor cookie to prepare for external callbacks  
						
						... 
						
						
						
						Also adds flexibility to the verification process. 
						
						
					 
					
						2014-10-21 16:30:16 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							82202f0a9c 
							
						 
					 
					
						
						
							
							Make DTLS_HELLO_VERIFY a compile option  
						
						
						
						
					 
					
						2014-10-21 16:30:16 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							98545f128a 
							
						 
					 
					
						
						
							
							Generate random key for HelloVerifyRequest  
						
						
						
						
					 
					
						2014-10-21 16:30:16 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							dd3cdb0fbc 
							
						 
					 
					
						
						
							
							Start using client IP in HelloVerifyRequest  
						
						... 
						
						
						
						Dummy fixed key for now. 
						
						
					 
					
						2014-10-21 16:30:15 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							43c021874d 
							
						 
					 
					
						
						
							
							Add ssl_set_client_transport_id()  
						
						
						
						
					 
					
						2014-10-21 16:30:15 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							2c9ee81f6e 
							
						 
					 
					
						
						
							
							Start adding srv support for hello verify request  
						
						... 
						
						
						
						Dummy fixed content for now.
Also, seems to be a race condition in the way the socket is closed and
reopened, leading to a few "random" failures in compat.sh. A fix is planned
for later. 
						
						
					 
					
						2014-10-21 16:30:13 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							a0e1632b79 
							
						 
					 
					
						
						
							
							Do not use compression with DTLS  
						
						
						
						
					 
					
						2014-10-21 16:30:13 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							5d53cbef3a 
							
						 
					 
					
						
						
							
							Fix length check in ssl_write_ticket()  
						
						
						
						
					 
					
						2014-10-21 16:30:13 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							b2f3be8757 
							
						 
					 
					
						
						
							
							Support multiple records in one datagram  
						
						
						
						
					 
					
						2014-10-21 16:30:10 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							d6b721c7ee 
							
						 
					 
					
						
						
							
							More ssl_parse_client_hello() adjustments  
						
						
						
						
					 
					
						2014-10-21 16:30:08 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							4128aa71ee 
							
						 
					 
					
						
						
							
							Add the 'cookie' field of DTLS ClientHello  
						
						
						
						
					 
					
						2014-10-21 16:30:08 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							8933a65d5c 
							
						 
					 
					
						
						
							
							Rework ssl_parse_client_hello() a bit  
						
						... 
						
						
						
						- make it more linear
- check lengths better
- prepare for optional "cookie" field 
						
						
					 
					
						2014-10-21 16:30:08 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							e89bcf05da 
							
						 
					 
					
						
						
							
							Write new DTLS handshake fields correctly  
						
						
						
						
					 
					
						2014-10-21 16:30:07 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							ce441b3442 
							
						 
					 
					
						
						
							
							Add space for new DTLS fields in handshake  
						
						
						
						
					 
					
						2014-10-21 16:30:07 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							0619348288 
							
						 
					 
					
						
						
							
							Add explicit counter in DTLS record header  
						
						
						
						
					 
					
						2014-10-21 16:30:06 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							507e1e410a 
							
						 
					 
					
						
						
							
							Prep: allow {in,out}_len != {in,out}_hdr + 3  
						
						
						
						
					 
					
						2014-10-21 16:30:06 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							abc7e3b4ba 
							
						 
					 
					
						
						
							
							Handle DTLS version encoding and fix some checks  
						
						
						
						
					 
					
						2014-10-21 16:30:05 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							d66645130c 
							
						 
					 
					
						
						
							
							Add a ciphersuite NODTLS flag  
						
						
						
						
					 
					
						2014-10-21 16:30:03 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Pégourié-Gonnard 
							
						 
					 
					
						
						
						
						
							
						
						
							43c3b28ca6 
							
						 
					 
					
						
						
							
							Fix memory leak with crafted ClientHello  
						
						
						
						
					 
					
						2014-10-17 12:42:11 +02:00