diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-06-01 06:51:58 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-06-01 06:55:23 +0200 |
| commit | 4b2e2d3fd9dccff357e1e26ce9a5f2e103837a36 (patch) | |
| tree | d5f88eb4c2ab8adf3dd14314d045e0c94abc3e06 | |
| parent | upstream commit (diff) | |
| download | openssh-4b2e2d3fd9dccff357e1e26ce9a5f2e103837a36.tar.xz openssh-4b2e2d3fd9dccff357e1e26ce9a5f2e103837a36.zip | |
upstream commit
fix casts re constness
Upstream-ID: e38f2bac162b37dbaf784d349c8327a6626fa266
| -rw-r--r-- | bitmap.c | 2 | ||||
| -rw-r--r-- | sshbuf-getput-basic.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -189,7 +189,7 @@ bitmap_from_string(struct bitmap *b, const void *p, size_t l) { int r; size_t i, offset, shift; - u_char *s = (u_char *)p; + const u_char *s = (const u_char *)p; if (l > BITMAP_MAX / 8) return -1; diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c index 74c49be7c..50648258f 100644 --- a/sshbuf-getput-basic.c +++ b/sshbuf-getput-basic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshbuf-getput-basic.c,v 1.6 2016/06/16 11:00:17 dtucker Exp $ */ +/* $OpenBSD: sshbuf-getput-basic.c,v 1.7 2017/06/01 04:51:58 djm Exp $ */ /* * Copyright (c) 2011 Damien Miller * @@ -365,7 +365,7 @@ sshbuf_put_string(struct sshbuf *buf, const void *v, size_t len) int sshbuf_put_cstring(struct sshbuf *buf, const char *v) { - return sshbuf_put_string(buf, (u_char *)v, v == NULL ? 0 : strlen(v)); + return sshbuf_put_string(buf, v, v == NULL ? 0 : strlen(v)); } int |