summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-07-30 05:04:49 +0000
committerDamien Miller <djm@mindrot.org>2019-07-30 15:06:27 +1000
commit49fa065a1bfaeb88a59abdfa4432d3b9c35b0655 (patch)
tree380c68f0d410d4733aa2924fa43ef309fe47d896
parent7adf6c430d6fc17901e167bc0789d31638f5c2f8 (diff)
upstream: let sshbuf_find/cmp take a void* for the
search/comparison argument, instead of a u_char*. Saves callers needing to cast. OpenBSD-Commit-ID: d63b69b7c5dd570963e682f758f5a47b825605ed
-rw-r--r--sshbuf-misc.c7
-rw-r--r--sshbuf.h6
2 files changed, 6 insertions, 7 deletions
diff --git a/sshbuf-misc.c b/sshbuf-misc.c
index 417ab593..65987e25 100644
--- a/sshbuf-misc.c
+++ b/sshbuf-misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshbuf-misc.c,v 1.10 2019/07/18 13:26:00 djm Exp $ */
+/* $OpenBSD: sshbuf-misc.c,v 1.11 2019/07/30 05:04:49 djm Exp $ */
/*
* Copyright (c) 2011 Damien Miller
*
@@ -195,7 +195,7 @@ sshbuf_dup_string(struct sshbuf *buf)
int
sshbuf_cmp(const struct sshbuf *b, size_t offset,
- const u_char *s, size_t len)
+ const void *s, size_t len)
{
if (sshbuf_ptr(b) == NULL)
return SSH_ERR_INTERNAL_ERROR;
@@ -210,13 +210,12 @@ sshbuf_cmp(const struct sshbuf *b, size_t offset,
int
sshbuf_find(const struct sshbuf *b, size_t start_offset,
- const u_char *s, size_t len, size_t *offsetp)
+ const void *s, size_t len, size_t *offsetp)
{
void *p;
if (offsetp != NULL)
*offsetp = 0;
-
if (sshbuf_ptr(b) == NULL)
return SSH_ERR_INTERNAL_ERROR;
if (start_offset > SSHBUF_SIZE_MAX || len > SSHBUF_SIZE_MAX || len == 0)
diff --git a/sshbuf.h b/sshbuf.h
index ea40e167..033feb07 100644
--- a/sshbuf.h
+++ b/sshbuf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshbuf.h,v 1.16 2019/07/16 13:18:39 djm Exp $ */
+/* $OpenBSD: sshbuf.h,v 1.17 2019/07/30 05:04:49 djm Exp $ */
/*
* Copyright (c) 2011 Damien Miller
*
@@ -270,7 +270,7 @@ int sshbuf_b64tod(struct sshbuf *buf, const char *b64);
* all.
*/
int sshbuf_cmp(const struct sshbuf *b, size_t offset,
- const u_char *s, size_t len);
+ const void *s, size_t len);
/*
* Searches the buffer for the specified string. Returns 0 on success
@@ -282,7 +282,7 @@ int sshbuf_cmp(const struct sshbuf *b, size_t offset,
*/
int
sshbuf_find(const struct sshbuf *b, size_t start_offset,
- const u_char *s, size_t len, size_t *offsetp);
+ const void *s, size_t len, size_t *offsetp);
/*
* Duplicate the contents of a buffer to a string (caller to free).