diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-07-30 05:04:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-07-30 15:06:27 +1000 |
commit | 49fa065a1bfaeb88a59abdfa4432d3b9c35b0655 (patch) | |
tree | 380c68f0d410d4733aa2924fa43ef309fe47d896 /sshbuf.h | |
parent | 7adf6c430d6fc17901e167bc0789d31638f5c2f8 (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
Diffstat (limited to 'sshbuf.h')
-rw-r--r-- | sshbuf.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshbuf.h,v 1.16 2019/07/16 13:18:39 djm Exp $ */ | 1 | /* $OpenBSD: sshbuf.h,v 1.17 2019/07/30 05:04:49 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2011 Damien Miller | 3 | * Copyright (c) 2011 Damien Miller |
4 | * | 4 | * |
@@ -270,7 +270,7 @@ int sshbuf_b64tod(struct sshbuf *buf, const char *b64); | |||
270 | * all. | 270 | * all. |
271 | */ | 271 | */ |
272 | int sshbuf_cmp(const struct sshbuf *b, size_t offset, | 272 | int sshbuf_cmp(const struct sshbuf *b, size_t offset, |
273 | const u_char *s, size_t len); | 273 | const void *s, size_t len); |
274 | 274 | ||
275 | /* | 275 | /* |
276 | * Searches the buffer for the specified string. Returns 0 on success | 276 | * 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, | |||
282 | */ | 282 | */ |
283 | int | 283 | int |
284 | sshbuf_find(const struct sshbuf *b, size_t start_offset, | 284 | sshbuf_find(const struct sshbuf *b, size_t start_offset, |
285 | const u_char *s, size_t len, size_t *offsetp); | 285 | const void *s, size_t len, size_t *offsetp); |
286 | 286 | ||
287 | /* | 287 | /* |
288 | * Duplicate the contents of a buffer to a string (caller to free). | 288 | * Duplicate the contents of a buffer to a string (caller to free). |