summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-05-16 10:47:27 +0200
committerDarren Tucker <dtucker@dtucker.net>2019-05-17 02:07:43 +0200
commit5c8d14c512f5d413095b22bdba08a6bb990f1e97 (patch)
tree0c4414c06e53678cc3e53abc7b80dfe5ca587df9
parentupstream: When doing the fork+exec'ing for ssh-keysign, rearrange (diff)
downloadopenssh-5c8d14c512f5d413095b22bdba08a6bb990f1e97.tar.xz
openssh-5c8d14c512f5d413095b22bdba08a6bb990f1e97.zip
upstream: Move a variable declaration to the block where it's used
to make things a little tidier for -portable. OpenBSD-Commit-ID: 616379861be95619e5358768b7dee4793e2f3a75
-rw-r--r--ssh-pkcs11-helper.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c
index 97fb1212c..807ceb660 100644
--- a/ssh-pkcs11-helper.c
+++ b/ssh-pkcs11-helper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11-helper.c,v 1.17 2019/01/23 02:01:10 djm Exp $ */
+/* $OpenBSD: ssh-pkcs11-helper.c,v 1.18 2019/05/16 08:47:27 dtucker Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
*
@@ -195,7 +195,6 @@ process_sign(void)
else {
if ((found = lookup_key(key)) != NULL) {
#ifdef WITH_OPENSSL
- u_int xslen;
int ret;
if (key->type == KEY_RSA) {
@@ -208,7 +207,8 @@ process_sign(void)
ok = 0;
}
} else if (key->type == KEY_ECDSA) {
- xslen = ECDSA_size(key->ecdsa);
+ u_int xslen = ECDSA_size(key->ecdsa);
+
signature = xmalloc(xslen);
/* "The parameter type is ignored." */
ret = ECDSA_sign(-1, data, dlen, signature,