generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove PACKET_back

Browse Source 
It's unused, and the same functionality can be achieved with saving a
copy of the struct.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Emilia Kasper 2015-09-17 18:55:19 +02:00
parent 020d8fc83f
commit 88f84eb257
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ssl/packet_locl.h
View File

@ -399,17 +399,6 @@ __owur static inline int PACKET_strndup(const PACKET *pkt, char **data)
return (*data != NULL); return (*data != NULL);
} }
/* Move the current reading position back |len| bytes */
__owur static inline int PACKET_back(PACKET *pkt, size_t len)
{
if (len > (size_t)(pkt->curr - pkt->start))
return 0;
pkt->curr -= len;
return 1;
}
/* Move the current reading position forward |len| bytes */ /* Move the current reading position forward |len| bytes */
__owur static inline int PACKET_forward(PACKET *pkt, size_t len) __owur static inline int PACKET_forward(PACKET *pkt, size_t len)
{ {

17
test/packettest.c
View File

@ -253,11 +253,7 @@ static int test_PACKET_memdup(unsigned char buf[BUF_LEN])
|| !PACKET_forward(&pkt, 10) || !PACKET_forward(&pkt, 10)
|| !PACKET_memdup(&pkt, &data, &len) || !PACKET_memdup(&pkt, &data, &len)
|| len != BUF_LEN - 10 || len != BUF_LEN - 10
|| memcmp(data, PACKET_data(&pkt), len) || memcmp(data, PACKET_data(&pkt), len)) {
|| !PACKET_back(&pkt, 1)
|| !PACKET_memdup(&pkt, &data, &len)
|| len != BUF_LEN - 9
|| memcmp(data, PACKET_data(&pkt), len)) {
fprintf(stderr, "test_PACKET_memdup() failed\n"); fprintf(stderr, "test_PACKET_memdup() failed\n");
OPENSSL_free(data); OPENSSL_free(data);
return 0; return 0;
@ -294,22 +290,19 @@ static int test_PACKET_strndup()
return 1; return 1;
} }
static int test_PACKET_move_funcs(unsigned char buf[BUF_LEN]) static int test_PACKET_forward(unsigned char buf[BUF_LEN])
{ {
unsigned char *byte; unsigned char *byte;
PACKET pkt; PACKET pkt;
if ( !PACKET_buf_init(&pkt, buf, BUF_LEN) if ( !PACKET_buf_init(&pkt, buf, BUF_LEN)
|| PACKET_back(&pkt, 1)
|| !PACKET_forward(&pkt, 1) || !PACKET_forward(&pkt, 1)
|| !PACKET_get_bytes(&pkt, &byte, 1) || !PACKET_get_bytes(&pkt, &byte, 1)
|| byte[0] != 4 || byte[0] != 4
|| !PACKET_forward(&pkt, BUF_LEN - 2) || !PACKET_forward(&pkt, BUF_LEN - 3)
|| PACKET_forward(&pkt, 1)
|| !PACKET_back(&pkt, 1)
|| !PACKET_get_bytes(&pkt, &byte, 1) || !PACKET_get_bytes(&pkt, &byte, 1)
|| byte[0] != 0xfe) { || byte[0] != 0xfe) {
fprintf(stderr, "test_PACKET_move_funcs() failed\n"); fprintf(stderr, "test_PACKET_forward() failed\n");
return 0; return 0;
} }
@ -442,7 +435,7 @@ int main(int argc, char **argv)
|| !test_PACKET_copy_bytes(buf) || !test_PACKET_copy_bytes(buf)
|| !test_PACKET_memdup(buf) || !test_PACKET_memdup(buf)
|| !test_PACKET_strndup() || !test_PACKET_strndup()
|| !test_PACKET_move_funcs(buf) || !test_PACKET_forward(buf)
|| !test_PACKET_get_length_prefixed_1() || !test_PACKET_get_length_prefixed_1()
|| !test_PACKET_get_length_prefixed_2() || !test_PACKET_get_length_prefixed_2()
|| !test_PACKET_get_length_prefixed_3()) { || !test_PACKET_get_length_prefixed_3()) {