adulau/ssldump
1
0
Fork 0
mirror of https://github.com/adulau/ssldump.git synced 2024-09-18 08:46:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13 from alperakcan/master

Browse source 
fix ssl record queue data read
This commit is contained in:
Alexandre Dulaunoy 2017-06-12 14:05:19 +02:00 committed by GitHub
commit f7585c4bee
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ssl/ssl_analyze.c
View file

@ -347,7 +347,9 @@ static int read_ssl_record(obj,q,seg,offset,lastp,offsetp)
switch(q->state){ switch(q->state){
case SSL_READ_NONE: case SSL_READ_NONE:
q->read_left=SSL_HEADER_SIZE; if (SSL_HEADER_SIZE<q->len)
ABORT(-1);
q->read_left=SSL_HEADER_SIZE-q->len;
if(r=read_data(q,seg,offset,&last,&offset)) if(r=read_data(q,seg,offset,&last,&offset))
ABORT(r); ABORT(r);
@ -374,9 +376,9 @@ static int read_ssl_record(obj,q,seg,offset,lastp,offsetp)
if(!(q->data=realloc(q->data,rec_len+5))) if(!(q->data=realloc(q->data,rec_len+5)))
ABORT(R_NO_MEMORY); ABORT(R_NO_MEMORY);
q->_allocated=rec_len+SSL_HEADER_SIZE; q->_allocated=rec_len+SSL_HEADER_SIZE;
q->ptr=q->data+SSL_HEADER_SIZE;
}; };
q->ptr=q->data+SSL_HEADER_SIZE;
q->read_left=rec_len; q->read_left=rec_len;
case SSL_READ_HEADER: case SSL_READ_HEADER: