merge 5.7p1

1 files changed, 5 insertions, 2 deletions

diff --git a/ssh-add.c b/ssh-add.c
index fb641ec48..125d6645b 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.96 2010/05/14 00:47:22 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.100 2010/08/31 12:33:38 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -70,6 +70,9 @@ extern char *__progname;
 static char *default_files[] = {
         _PATH_SSH_CLIENT_ID_RSA,
         _PATH_SSH_CLIENT_ID_DSA,
+#ifdef OPENSSL_HAS_ECC
+        _PATH_SSH_CLIENT_ID_ECDSA,
+#endif
         _PATH_SSH_CLIENT_IDENTITY,
         NULL
 };
@@ -372,7 +375,7 @@ main(int argc, char **argv)
         init_rng();
         seed_rng();
 
-        SSLeay_add_all_algorithms();
+        OpenSSL_add_all_algorithms();
 
         /* At first, get a connection to the authentication agent. */
         ac = ssh_get_authentication_connection();