diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ssh-add.c | 4 | ||||
| -rw-r--r-- | ssh-agent.c | 4 | ||||
| -rw-r--r-- | ssh-keygen.c | 4 | ||||
| -rw-r--r-- | ssh-keysign.c | 4 | ||||
| -rw-r--r-- | ssh.c | 4 | ||||
| -rw-r--r-- | sshd.c | 4 |
7 files changed, 15 insertions, 12 deletions
@@ -8,6 +8,9 @@ [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c] OpenSSL_add_all_algorithms is the name of the function we have a man page for, so use that. ok djm + - djm@cvs.openbsd.org 2010/08/16 04:06:06 + [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c] + backout previous temporarily; discussed with deraadt@ 20100827 - (dtucker) [contrib/redhat/sshd.init] Bug #1810: initlog is deprecated, @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.97 2010/08/12 23:34:38 tedu Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.98 2010/08/16 04:06:06 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -372,7 +372,7 @@ main(int argc, char **argv) init_rng(); seed_rng(); - OpenSSL_add_all_algorithms(); + SSLeay_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 d5690e0c..e6725ea8 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.167 2010/08/12 23:34:38 tedu Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.168 2010/08/16 04:06:06 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1092,7 +1092,7 @@ main(int ac, char **av) prctl(PR_SET_DUMPABLE, 0); #endif - OpenSSL_add_all_algorithms(); + SSLeay_add_all_algorithms(); __progname = ssh_get_progname(av[0]); init_rng(); diff --git a/ssh-keygen.c b/ssh-keygen.c index 37670ba6..93f59800 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.198 2010/08/12 23:34:38 tedu Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.199 2010/08/16 04:06:06 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1781,7 +1781,7 @@ main(int argc, char **argv) __progname = ssh_get_progname(argv[0]); - OpenSSL_add_all_algorithms(); + SSLeay_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 eddbcf70..cf3bf1b9 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keysign.c,v 1.33 2010/08/12 23:34:39 tedu Exp $ */ +/* $OpenBSD: ssh-keysign.c,v 1.34 2010/08/16 04:06:06 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"); - OpenSSL_add_all_algorithms(); + SSLeay_add_all_algorithms(); for (i = 0; i < 256; i++) rnd[i] = arc4random(); RAND_seed(rnd, sizeof(rnd)); @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.347 2010/08/12 23:34:39 tedu Exp $ */ +/* $OpenBSD: ssh.c,v 1.348 2010/08/16 04:06:06 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(); - OpenSSL_add_all_algorithms(); + SSLeay_add_all_algorithms(); ERR_load_crypto_strings(); /* Initialize the command to execute on remote host. */ @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.376 2010/08/12 23:34:39 tedu Exp $ */ +/* $OpenBSD: sshd.c,v 1.377 2010/08/16 04:06:06 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1464,7 +1464,7 @@ main(int ac, char **av) else closefrom(REEXEC_DEVCRYPTO_RESERVED_FD); - OpenSSL_add_all_algorithms(); + SSLeay_add_all_algorithms(); /* * Force logging to stderr until we have loaded the private host |