summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDoug Hogan <doug@cvs.openbsd.org>2015-04-29 01:31:40 +0000
committerDoug Hogan <doug@cvs.openbsd.org>2015-04-29 01:31:40 +0000
commit1a96ac813b27bd488eeea5da2b39538f1c0c6632 (patch)
tree66478807bf221cf7ececab930abbda1217e81310 /lib
parentb6dfc402a0b69575b15d42b8c789b75e2615d4c7 (diff)
Call CBS_mem_equal() rather than reimplementing it.
ok jsing@
Diffstat (limited to 'lib')
-rw-r--r--lib/libssl/src/ssl/bs_ber.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libssl/src/ssl/bs_ber.c b/lib/libssl/src/ssl/bs_ber.c
index cfc9475f9a2..1dde38264e3 100644
--- a/lib/libssl/src/ssl/bs_ber.c
+++ b/lib/libssl/src/ssl/bs_ber.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bs_ber.c,v 1.2 2015/02/06 22:22:33 doug Exp $ */
+/* $OpenBSD: bs_ber.c,v 1.3 2015/04/29 01:31:39 doug Exp $ */
/*
* Copyright (c) 2014, Google Inc.
*
@@ -89,8 +89,7 @@ is_primitive_type(unsigned tag)
static char
is_eoc(size_t header_len, CBS *contents)
{
- return header_len == 2 && CBS_len(contents) == 2 &&
- memcmp(CBS_data(contents), "\x00\x00", 2) == 0;
+ return header_len == 2 && CBS_mem_equal(contents, "\x00\x00", 2);
}
/*