summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilia Kasper <emilia@openssl.org>2015-09-17 18:55:19 +0200
committerEmilia Kasper <emilia@openssl.org>2015-09-18 13:04:07 +0200
commit88f84eb25728a7b4c0b9f684198fd541be9eebe3 (patch)
tree2976b897a93bf384a54723dcc124839a58849c6e
parent020d8fc83fe1a94232db1ee1166309e2458a8a18 (diff)
Remove PACKET_back
It's unused, and the same functionality can be achieved with saving a copy of the struct. Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r--ssl/packet_locl.h11
-rw-r--r--test/packettest.c17
2 files changed, 5 insertions, 23 deletions
diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h
index 7a72f8e658..d44fdef7e1 100644
--- a/ssl/packet_locl.h
+++ b/ssl/packet_locl.h
@@ -399,17 +399,6 @@ __owur static inline int PACKET_strndup(const PACKET *pkt, char **data)
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 */
__owur static inline int PACKET_forward(PACKET *pkt, size_t len)
{
diff --git a/test/packettest.c b/test/packettest.c
index 19a7599353..fcae19fe6d 100644
--- a/test/packettest.c
+++ b/test/packettest.c
@@ -253,11 +253,7 @@ static int test_PACKET_memdup(unsigned char buf[BUF_LEN])
|| !PACKET_forward(&pkt, 10)
|| !PACKET_memdup(&pkt, &data, &len)
|| len != BUF_LEN - 10
- || 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)) {
+ || memcmp(data, PACKET_data(&pkt), len)) {
fprintf(stderr, "test_PACKET_memdup() failed\n");
OPENSSL_free(data);
return 0;
@@ -294,22 +290,19 @@ static int test_PACKET_strndup()
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;
PACKET pkt;
if ( !PACKET_buf_init(&pkt, buf, BUF_LEN)
- || PACKET_back(&pkt, 1)
|| !PACKET_forward(&pkt, 1)
|| !PACKET_get_bytes(&pkt, &byte, 1)
|| byte[0] != 4
- || !PACKET_forward(&pkt, BUF_LEN - 2)
- || PACKET_forward(&pkt, 1)
- || !PACKET_back(&pkt, 1)
+ || !PACKET_forward(&pkt, BUF_LEN - 3)
|| !PACKET_get_bytes(&pkt, &byte, 1)
|| byte[0] != 0xfe) {
- fprintf(stderr, "test_PACKET_move_funcs() failed\n");
+ fprintf(stderr, "test_PACKET_forward() failed\n");
return 0;
}
@@ -442,7 +435,7 @@ int main(int argc, char **argv)
|| !test_PACKET_copy_bytes(buf)
|| !test_PACKET_memdup(buf)
|| !test_PACKET_strndup()
- || !test_PACKET_move_funcs(buf)
+ || !test_PACKET_forward(buf)
|| !test_PACKET_get_length_prefixed_1()
|| !test_PACKET_get_length_prefixed_2()
|| !test_PACKET_get_length_prefixed_3()) {