diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2023-10-16 10:40:00 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-10-16 11:13:41 +0200 |
| commit | 62db354b696b378a164b6e478cb6b0171dcb0c3d (patch) | |
| tree | 8df8ae461a413a386cb24f42d59129748b9b4202 /sshkey.c | |
| parent | run t-extra regress tests (diff) | |
| download | openssh-62db354b696b378a164b6e478cb6b0171dcb0c3d.tar.xz openssh-62db354b696b378a164b6e478cb6b0171dcb0c3d.zip | |
upstream: Move declaration of "len" into the block where it's used.
This lets us compile Portable with -Werror with when OpenSSL doesn't have
Ed25519 support.
OpenBSD-Commit-ID: e02e4b4af351946562a7caee905da60eff16ba29
Diffstat (limited to '')
| -rw-r--r-- | sshkey.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.139 2023/10/11 22:41:05 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.140 2023/10/16 08:40:00 dtucker Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -3422,7 +3422,6 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type, struct sshkey *prv = NULL; BIO *bio = NULL; int r; - size_t len; if (keyp != NULL) *keyp = NULL; @@ -3504,6 +3503,8 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type, #ifdef OPENSSL_HAS_ED25519 } else if (EVP_PKEY_base_id(pk) == EVP_PKEY_ED25519 && (type == KEY_UNSPEC || type == KEY_ED25519)) { + size_t len; + if ((prv = sshkey_new(KEY_UNSPEC)) == NULL || (prv->ed25519_sk = calloc(1, ED25519_SK_SZ)) == NULL || (prv->ed25519_pk = calloc(1, ED25519_PK_SZ)) == NULL) { |