upstream commit
fix casts re constness
Upstream-ID: e38f2bac162b37dbaf784d349c8327a6626fa266
diff --git a/bitmap.c b/bitmap.c
index 71f87ec..e8320d8 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -189,7 +189,7 @@
{
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 74c49be..5064825 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 @@
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