8 files changed, 21 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 63216685b..594ebc24c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
-2010910
+20100910
  - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact
    return code since it can apparently return -1 under some conditions.  From
    openssh bugs werbittewas de, ok djm@
+ - OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2010/08/31 12:33:38
+     [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c]
+     reintroduce commit from tedu@, which I pulled out for release
+     engineering:
+       OpenSSL_add_all_algorithms is the name of the function we have a
+       man page for, so use that.  ok djm
 
 20100831
  - OpenBSD CVS Sync
diff --git a/ssh-add.c b/ssh-add.c
index 31e618390..8bf5675fb 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.99 2010/08/31 11:54:45 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
@@ -373,7 +373,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();
diff --git a/ssh-agent.c b/ssh-agent.c
index fbfd79c13..87939b2b6 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.169 2010/08/31 11:54:45 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.170 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
@@ -1146,7 +1146,7 @@ main(int ac, char **av)
         prctl(PR_SET_DUMPABLE, 0);
 #endif
 
-        SSLeay_add_all_algorithms();
+        OpenSSL_add_all_algorithms();
 
         __progname = ssh_get_progname(av[0]);
         init_rng();
diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
index 3069ca5bc..0627ee5c0 100644
--- a/ssh-ecdsa.c
+++ b/ssh-ecdsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD */
+/* $OpenBSD$ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 448585185..a66e8508c 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.200 2010/08/31 11:54:45 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.201 2010/08/31 12:33:38 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1804,7 +1804,7 @@ main(int argc, char **argv)
 
         __progname = ssh_get_progname(argv[0]);
 
-        SSLeay_add_all_algorithms();
+        OpenSSL_add_all_algorithms();
         log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
 
         init_rng();
diff --git a/ssh-keysign.c b/ssh-keysign.c
index cf3bf1b9b..d05156005 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.34 2010/08/16 04:06:06 djm Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.35 2010/08/31 12:33:38 djm Exp $ */
 /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.
  *
@@ -194,7 +194,7 @@ main(int argc, char **argv)
         if (key_fd[0] == -1 && key_fd[1] == -1)
                 fatal("could not open any host key");
 
-        SSLeay_add_all_algorithms();
+        OpenSSL_add_all_algorithms();
         for (i = 0; i < 256; i++)
                 rnd[i] = arc4random();
         RAND_seed(rnd, sizeof(rnd));
diff --git a/ssh.c b/ssh.c
index 1cdfc58e3..e5b643258 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.349 2010/08/31 11:54:45 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.350 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
@@ -599,7 +599,7 @@ main(int ac, char **av)
         if (!host)
                 usage();
 
-        SSLeay_add_all_algorithms();
+        OpenSSL_add_all_algorithms();
         ERR_load_crypto_strings();
 
         /* Initialize the command to execute on remote host. */
diff --git a/sshd.c b/sshd.c
index 658a4978d..7995f5a1d 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.378 2010/08/31 11:54:45 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.379 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
@@ -1467,7 +1467,7 @@ main(int ac, char **av)
         else
                 closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
 
-        SSLeay_add_all_algorithms();
+        OpenSSL_add_all_algorithms();
 
         /*
          * Force logging to stderr until we have loaded the private host