summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh-add.c4
-rw-r--r--ssh-agent.c4
-rw-r--r--ssh-keygen.c4
-rw-r--r--ssh-keysign.c4
-rw-r--r--ssh.c4
-rw-r--r--sshd.c4
7 files changed, 16 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 18a356510..f18c8de92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
4 [ssh-keysign.8 ssh.1 sshd.8] 4 [ssh-keysign.8 ssh.1 sshd.8]
5 use the same template for all FILES sections; i.e. -compact/.Pp where we 5 use the same template for all FILES sections; i.e. -compact/.Pp where we
6 have multiple items, and .Pa for path names; 6 have multiple items, and .Pa for path names;
7 - tedu@cvs.openbsd.org 2010/08/12 23:34:39
8 [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c]
9 OpenSSL_add_all_algorithms is the name of the function we have a man page
10 for, so use that. ok djm
7 11
820100827 1220100827
9 - (dtucker) [contrib/redhat/sshd.init] Bug #1810: initlog is deprecated, 13 - (dtucker) [contrib/redhat/sshd.init] Bug #1810: initlog is deprecated,
diff --git a/ssh-add.c b/ssh-add.c
index fb641ec48..e3e89d34c 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.96 2010/05/14 00:47:22 djm Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.97 2010/08/12 23:34:38 tedu Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -372,7 +372,7 @@ main(int argc, char **argv)
372 init_rng(); 372 init_rng();
373 seed_rng(); 373 seed_rng();
374 374
375 SSLeay_add_all_algorithms(); 375 OpenSSL_add_all_algorithms();
376 376
377 /* At first, get a connection to the authentication agent. */ 377 /* At first, get a connection to the authentication agent. */
378 ac = ssh_get_authentication_connection(); 378 ac = ssh_get_authentication_connection();
diff --git a/ssh-agent.c b/ssh-agent.c
index 2c0e28696..d5690e0c5 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.166 2010/04/16 01:47:26 djm Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.167 2010/08/12 23:34:38 tedu Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1092,7 +1092,7 @@ main(int ac, char **av)
1092 prctl(PR_SET_DUMPABLE, 0); 1092 prctl(PR_SET_DUMPABLE, 0);
1093#endif 1093#endif
1094 1094
1095 SSLeay_add_all_algorithms(); 1095 OpenSSL_add_all_algorithms();
1096 1096
1097 __progname = ssh_get_progname(av[0]); 1097 __progname = ssh_get_progname(av[0]);
1098 init_rng(); 1098 init_rng();
diff --git a/ssh-keygen.c b/ssh-keygen.c
index d90b1dfdd..37670ba67 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.197 2010/08/04 06:07:11 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.198 2010/08/12 23:34:38 tedu Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1781,7 +1781,7 @@ main(int argc, char **argv)
1781 1781
1782 __progname = ssh_get_progname(argv[0]); 1782 __progname = ssh_get_progname(argv[0]);
1783 1783
1784 SSLeay_add_all_algorithms(); 1784 OpenSSL_add_all_algorithms();
1785 log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); 1785 log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
1786 1786
1787 init_rng(); 1787 init_rng();
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 0c7077050..eddbcf707 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keysign.c,v 1.32 2010/08/04 06:08:40 djm Exp $ */ 1/* $OpenBSD: ssh-keysign.c,v 1.33 2010/08/12 23:34:39 tedu Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -194,7 +194,7 @@ main(int argc, char **argv)
194 if (key_fd[0] == -1 && key_fd[1] == -1) 194 if (key_fd[0] == -1 && key_fd[1] == -1)
195 fatal("could not open any host key"); 195 fatal("could not open any host key");
196 196
197 SSLeay_add_all_algorithms(); 197 OpenSSL_add_all_algorithms();
198 for (i = 0; i < 256; i++) 198 for (i = 0; i < 256; i++)
199 rnd[i] = arc4random(); 199 rnd[i] = arc4random();
200 RAND_seed(rnd, sizeof(rnd)); 200 RAND_seed(rnd, sizeof(rnd));
diff --git a/ssh.c b/ssh.c
index 4419f7642..34215a00d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.346 2010/08/12 21:49:44 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.347 2010/08/12 23:34:39 tedu Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -599,7 +599,7 @@ main(int ac, char **av)
599 if (!host) 599 if (!host)
600 usage(); 600 usage();
601 601
602 SSLeay_add_all_algorithms(); 602 OpenSSL_add_all_algorithms();
603 ERR_load_crypto_strings(); 603 ERR_load_crypto_strings();
604 604
605 /* Initialize the command to execute on remote host. */ 605 /* Initialize the command to execute on remote host. */
diff --git a/sshd.c b/sshd.c
index a7d3ee5c4..e61c0b9d6 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.375 2010/04/16 01:47:26 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.376 2010/08/12 23:34:39 tedu Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1464,7 +1464,7 @@ main(int ac, char **av)
1464 else 1464 else
1465 closefrom(REEXEC_DEVCRYPTO_RESERVED_FD); 1465 closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
1466 1466
1467 SSLeay_add_all_algorithms(); 1467 OpenSSL_add_all_algorithms();
1468 1468
1469 /* 1469 /*
1470 * Force logging to stderr until we have loaded the private host 1470 * Force logging to stderr until we have loaded the private host