]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Move a variable declaration to the block where it's used
authordtucker@openbsd.org <dtucker@openbsd.org>
Thu, 16 May 2019 08:47:27 +0000 (08:47 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Fri, 17 May 2019 00:07:43 +0000 (10:07 +1000)
to make things a little tidier for -portable.

OpenBSD-Commit-ID: 616379861be95619e5358768b7dee4793e2f3a75

ssh-pkcs11-helper.c

index 97fb1212c08e1ba398fc666c4a15020c1e114c2e..807ceb6603251f1fb0d3236dff753c6a23f25952 100644 (file)
@@ -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,