summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoug <>2015-06-20 01:21:51 +0000
committerdoug <>2015-06-20 01:21:51 +0000
commit7e40cd02570f741c84e7beaf1489fbc7826363c7 (patch)
tree377afc8e2864572180858cead9a54431c08dcaea
parent77fe6381e201dc07dd375c797c511d77613a9336 (diff)
downloadopenbsd-7e40cd02570f741c84e7beaf1489fbc7826363c7.tar.gz
openbsd-7e40cd02570f741c84e7beaf1489fbc7826363c7.tar.bz2
openbsd-7e40cd02570f741c84e7beaf1489fbc7826363c7.zip
Replace internal call to CRYPTO_memcmp with timingsafe_memcmp.
Suggested by jsing@. ok jsing@ miod@
-rw-r--r--src/lib/libssl/bs_cbs.c4
-rw-r--r--src/lib/libssl/src/ssl/bs_cbs.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/bs_cbs.c b/src/lib/libssl/bs_cbs.c
index 8173177249..ea31cfc530 100644
--- a/src/lib/libssl/bs_cbs.c
+++ b/src/lib/libssl/bs_cbs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bs_cbs.c,v 1.14 2015/06/19 00:23:36 doug Exp $ */ 1/* $OpenBSD: bs_cbs.c,v 1.15 2015/06/20 01:21:51 doug Exp $ */
2/* 2/*
3 * Copyright (c) 2014, Google Inc. 3 * Copyright (c) 2014, Google Inc.
4 * 4 *
@@ -127,7 +127,7 @@ CBS_mem_equal(const CBS *cbs, const uint8_t *data, size_t len)
127 if (len != cbs->len) 127 if (len != cbs->len)
128 return 0; 128 return 0;
129 129
130 return CRYPTO_memcmp(cbs->data, data, len) == 0; 130 return timingsafe_memcmp(cbs->data, data, len) == 0;
131} 131}
132 132
133static int 133static int
diff --git a/src/lib/libssl/src/ssl/bs_cbs.c b/src/lib/libssl/src/ssl/bs_cbs.c
index 8173177249..ea31cfc530 100644
--- a/src/lib/libssl/src/ssl/bs_cbs.c
+++ b/src/lib/libssl/src/ssl/bs_cbs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bs_cbs.c,v 1.14 2015/06/19 00:23:36 doug Exp $ */ 1/* $OpenBSD: bs_cbs.c,v 1.15 2015/06/20 01:21:51 doug Exp $ */
2/* 2/*
3 * Copyright (c) 2014, Google Inc. 3 * Copyright (c) 2014, Google Inc.
4 * 4 *
@@ -127,7 +127,7 @@ CBS_mem_equal(const CBS *cbs, const uint8_t *data, size_t len)
127 if (len != cbs->len) 127 if (len != cbs->len)
128 return 0; 128 return 0;
129 129
130 return CRYPTO_memcmp(cbs->data, data, len) == 0; 130 return timingsafe_memcmp(cbs->data, data, len) == 0;
131} 131}
132 132
133static int 133static int