diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-10-13 06:24:51 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-10-20 12:01:03 +1100 |
commit | 224f193d6a4b57e7a0cb2b9ecd3b6c54d721d8c2 (patch) | |
tree | c50b88dccac477cdfeb23f208b54b605e9c1313b | |
parent | cfa46825b5ef7097373ed8e31b01a4538a8db565 (diff) |
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
-rw-r--r-- | sshkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.56 2017/08/12 06:42:52 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.57 2017/10/13 06:24:51 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. | 4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. |
@@ -3304,7 +3304,7 @@ sshkey_private_pem_to_blob(struct sshkey *key, struct sshbuf *blob, | |||
3304 | int blen, len = strlen(_passphrase); | 3304 | int blen, len = strlen(_passphrase); |
3305 | u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL; | 3305 | u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL; |
3306 | const EVP_CIPHER *cipher = (len > 0) ? EVP_aes_128_cbc() : NULL; | 3306 | const EVP_CIPHER *cipher = (len > 0) ? EVP_aes_128_cbc() : NULL; |
3307 | const u_char *bptr; | 3307 | char *bptr; |
3308 | BIO *bio = NULL; | 3308 | BIO *bio = NULL; |
3309 | 3309 | ||
3310 | if (len > 0 && len <= 4) | 3310 | if (len > 0 && len <= 4) |