summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshkey.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2017-10-13 06:24:51 +0000
committerdjm <djm@openbsd.org>2017-10-13 06:24:51 +0000
commitd5da3e9502915d7525a5e24a2ff293b7b39e7236 (patch)
tree9d87f10ea155a29cbf8812d10c5204df11d2482b /usr.bin/ssh/sshkey.c
parentDon't check for mirror availability but directly try to fetch SHA256.sig. That (diff)
downloadwireguard-openbsd-d5da3e9502915d7525a5e24a2ff293b7b39e7236.tar.xz
wireguard-openbsd-d5da3e9502915d7525a5e24a2ff293b7b39e7236.zip
BIO_get_mem_data() is supposed to take a char* as pointer argument,
so don't pass it a const char*
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
-rw-r--r--usr.bin/ssh/sshkey.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c
index 2e8f36f7edd..0ad9a65cc9d 100644
--- a/usr.bin/ssh/sshkey.c
+++ b/usr.bin/ssh/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.56 2017/08/12 06:42:52 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.57 2017/10/13 06:24:51 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@@ -3254,7 +3254,7 @@ sshkey_private_pem_to_blob(struct sshkey *key, struct sshbuf *blob,
int blen, len = strlen(_passphrase);
u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL;
const EVP_CIPHER *cipher = (len > 0) ? EVP_aes_128_cbc() : NULL;
- const u_char *bptr;
+ char *bptr;
BIO *bio = NULL;
if (len > 0 && len <= 4)