[src/trunk]: src/crypto/external/bsd/openssh/dist The previous patch didn't a...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/22261b30de38
branches:  trunk
changeset: 786823:22261b30de38
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Tue May 14 05:18:11 2013 +0000

description:
The previous patch didn't apply cleanly, because our code doesn't
use #ifdef OPENSSL_HAS_ECC.
Apply manually.
Drop now unused len variable.

diffstat:

 crypto/external/bsd/openssh/dist/readconf.c |  36 ++++++++--------------------
 1 files changed, 10 insertions(+), 26 deletions(-)

diffs (66 lines):

diff -r 0b4f83baf4b5 -r 22261b30de38 crypto/external/bsd/openssh/dist/readconf.c
--- a/crypto/external/bsd/openssh/dist/readconf.c       Tue May 14 00:27:39 2013 +0000
+++ b/crypto/external/bsd/openssh/dist/readconf.c       Tue May 14 05:18:11 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readconf.c,v 1.9 2013/04/29 17:59:50 mlelstv Exp $     */
+/*     $NetBSD: readconf.c,v 1.10 2013/05/14 05:18:11 mlelstv Exp $    */
 /* $OpenBSD: readconf.c,v 1.196 2013/02/22 04:45:08 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: readconf.c,v 1.9 2013/04/29 17:59:50 mlelstv Exp $");
+__RCSID("$NetBSD: readconf.c,v 1.10 2013/05/14 05:18:11 mlelstv Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -1334,8 +1334,6 @@
 void
 fill_default_options(Options * options)
 {
-       int len;
-
        if (options->forward_agent == -1)
                options->forward_agent = 0;
        if (options->forward_x11 == -1)
@@ -1413,30 +1411,16 @@
                options->protocol = SSH_PROTO_2;
        if (options->num_identity_files == 0) {
                if (options->protocol & SSH_PROTO_1) {
-                       len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1;
-                       options->identity_files[options->num_identity_files] =
-                           xmalloc(len);
-                       snprintf(options->identity_files[options->num_identity_files++],
-                           len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY);
+                       add_identity_file(options, "~/",
+                           _PATH_SSH_CLIENT_IDENTITY, 0);
                }
                if (options->protocol & SSH_PROTO_2) {
-                       len = 2 + strlen(_PATH_SSH_CLIENT_ID_RSA) + 1;
-                       options->identity_files[options->num_identity_files] =
-                           xmalloc(len);
-                       snprintf(options->identity_files[options->num_identity_files++],
-                           len, "~/%.100s", _PATH_SSH_CLIENT_ID_RSA);
-
-                       len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1;
-                       options->identity_files[options->num_identity_files] =
-                           xmalloc(len);
-                       snprintf(options->identity_files[options->num_identity_files++],
-                           len, "~/%.100s", _PATH_SSH_CLIENT_ID_DSA);
-
-                       len = 2 + strlen(_PATH_SSH_CLIENT_ID_ECDSA) + 1;
-                       options->identity_files[options->num_identity_files] =
-                           xmalloc(len);
-                       snprintf(options->identity_files[options->num_identity_files++],
-                           len, "~/%.100s", _PATH_SSH_CLIENT_ID_ECDSA);
+                       add_identity_file(options, "~/",
+                           _PATH_SSH_CLIENT_ID_RSA, 0);
+                       add_identity_file(options, "~/",
+                           _PATH_SSH_CLIENT_ID_DSA, 0);
+                       add_identity_file(options, "~/",
+                           _PATH_SSH_CLIENT_ID_ECDSA, 0);
                }
        }
        if (options->escape_char == -1)