[openssh-commits] [openssh] 04/12: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 224f193d6a4b57e7a0cb2b9ecd3b6c54d721d8c2
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Oct 13 06:24:51 2017 +0000

    upstream commit
    
    BIO_get_mem_data() is supposed to take a char* as pointer
    argument, so don't pass it a const char*
    
    Upstream-ID: 1ccd91eb7f4dd4f0fa812d4f956987cd00b5f6ec
---
 sshkey.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sshkey.c b/sshkey.c
index e91c54f5..1e390420 100644
--- a/sshkey.c
+++ b/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.
@@ -3304,7 +3304,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)

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.