diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ssh-add.c | 4 | ||||
-rw-r--r-- | ssh-agent.c | 4 | ||||
-rw-r--r-- | ssh-ecdsa.c | 2 | ||||
-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 |
8 files changed, 21 insertions, 14 deletions
@@ -1,7 +1,14 @@ | |||
1 | 2010910 | 1 | 20100910 |
2 | - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact | 2 | - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact |
3 | return code since it can apparently return -1 under some conditions. From | 3 | return code since it can apparently return -1 under some conditions. From |
4 | openssh bugs werbittewas de, ok djm@ | 4 | openssh bugs werbittewas de, ok djm@ |
5 | - OpenBSD CVS Sync | ||
6 | - djm@cvs.openbsd.org 2010/08/31 12:33:38 | ||
7 | [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c] | ||
8 | reintroduce commit from tedu@, which I pulled out for release | ||
9 | engineering: | ||
10 | OpenSSL_add_all_algorithms is the name of the function we have a | ||
11 | man page for, so use that. ok djm | ||
5 | 12 | ||
6 | 20100831 | 13 | 20100831 |
7 | - OpenBSD CVS Sync | 14 | - OpenBSD CVS Sync |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-add.c,v 1.99 2010/08/31 11:54:45 djm Exp $ */ | 1 | /* $OpenBSD: ssh-add.c,v 1.100 2010/08/31 12:33:38 djm 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 |
@@ -373,7 +373,7 @@ main(int argc, char **argv) | |||
373 | init_rng(); | 373 | init_rng(); |
374 | seed_rng(); | 374 | seed_rng(); |
375 | 375 | ||
376 | SSLeay_add_all_algorithms(); | 376 | OpenSSL_add_all_algorithms(); |
377 | 377 | ||
378 | /* At first, get a connection to the authentication agent. */ | 378 | /* At first, get a connection to the authentication agent. */ |
379 | ac = ssh_get_authentication_connection(); | 379 | 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 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.169 2010/08/31 11:54:45 djm Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.170 2010/08/31 12:33:38 djm 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 |
@@ -1146,7 +1146,7 @@ main(int ac, char **av) | |||
1146 | prctl(PR_SET_DUMPABLE, 0); | 1146 | prctl(PR_SET_DUMPABLE, 0); |
1147 | #endif | 1147 | #endif |
1148 | 1148 | ||
1149 | SSLeay_add_all_algorithms(); | 1149 | OpenSSL_add_all_algorithms(); |
1150 | 1150 | ||
1151 | __progname = ssh_get_progname(av[0]); | 1151 | __progname = ssh_get_progname(av[0]); |
1152 | init_rng(); | 1152 | 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 @@ | |||
1 | /* $OpenBSD */ | 1 | /* $OpenBSD$ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * 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 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.200 2010/08/31 11:54:45 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.201 2010/08/31 12:33:38 djm 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 |
@@ -1804,7 +1804,7 @@ main(int argc, char **argv) | |||
1804 | 1804 | ||
1805 | __progname = ssh_get_progname(argv[0]); | 1805 | __progname = ssh_get_progname(argv[0]); |
1806 | 1806 | ||
1807 | SSLeay_add_all_algorithms(); | 1807 | OpenSSL_add_all_algorithms(); |
1808 | log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); | 1808 | log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); |
1809 | 1809 | ||
1810 | init_rng(); | 1810 | 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 @@ | |||
1 | /* $OpenBSD: ssh-keysign.c,v 1.34 2010/08/16 04:06:06 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keysign.c,v 1.35 2010/08/31 12:33:38 djm 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)); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.349 2010/08/31 11:54:45 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.350 2010/08/31 12:33:38 djm 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. */ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.378 2010/08/31 11:54:45 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.379 2010/08/31 12:33:38 djm 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 |
@@ -1467,7 +1467,7 @@ main(int ac, char **av) | |||
1467 | else | 1467 | else |
1468 | closefrom(REEXEC_DEVCRYPTO_RESERVED_FD); | 1468 | closefrom(REEXEC_DEVCRYPTO_RESERVED_FD); |
1469 | 1469 | ||
1470 | SSLeay_add_all_algorithms(); | 1470 | OpenSSL_add_all_algorithms(); |
1471 | 1471 | ||
1472 | /* | 1472 | /* |
1473 | * Force logging to stderr until we have loaded the private host | 1473 | * Force logging to stderr until we have loaded the private host |