When the underlying BIO_write() fails to send a datagram, we leave the
offending record queued as 'pending'. The DTLS code doesn't expect this, and we end up hitting an OPENSSL_assert() in do_dtls1_write(). The simple fix is just _not_ to leave it queued. In DTLS, dropping packets is perfectly acceptable -- and even preferable. If we wanted a service with retries and guaranteed delivery, we'd be using TCP. PR: #1703 Submitted by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
		@@ -753,8 +753,15 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
 | 
			
		||||
			s->rwstate=SSL_NOTHING;
 | 
			
		||||
			return(s->s3->wpend_ret);
 | 
			
		||||
			}
 | 
			
		||||
		else if (i <= 0)
 | 
			
		||||
		else if (i <= 0) {
 | 
			
		||||
			if (s->version == DTLS1_VERSION ||
 | 
			
		||||
			    s->version == DTLS1_BAD_VER) {
 | 
			
		||||
				/* For DTLS, just drop it. That's kind of the whole
 | 
			
		||||
				   point in using a datagram service */
 | 
			
		||||
				s->s3->wbuf.left = 0;
 | 
			
		||||
			}
 | 
			
		||||
			return(i);
 | 
			
		||||
		}
 | 
			
		||||
		s->s3->wbuf.offset+=i;
 | 
			
		||||
		s->s3->wbuf.left-=i;
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user