diff options
| author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
| commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
| tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /openbsd-compat/openssl-compat.c | |
| parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
| parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) | |
merge 5.9p1
Diffstat (limited to 'openbsd-compat/openssl-compat.c')
| -rw-r--r-- | openbsd-compat/openssl-compat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c index b617fdf19..5189cab61 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: openssl-compat.c,v 1.13 2011/01/21 22:37:06 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.c,v 1.14 2011/05/10 01:13:38 dtucker Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> | 4 | * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> |
| @@ -134,9 +134,9 @@ RSA_get_default_method(void) | |||
| 134 | 134 | ||
| 135 | #ifdef USE_OPENSSL_ENGINE | 135 | #ifdef USE_OPENSSL_ENGINE |
| 136 | void | 136 | void |
| 137 | ssh_SSLeay_add_all_algorithms(void) | 137 | ssh_OpenSSL_add_all_algorithms(void) |
| 138 | { | 138 | { |
| 139 | SSLeay_add_all_algorithms(); | 139 | OpenSSL_add_all_algorithms(); |
| 140 | 140 | ||
| 141 | /* Enable use of crypto hardware */ | 141 | /* Enable use of crypto hardware */ |
| 142 | ENGINE_load_builtin_engines(); | 142 | ENGINE_load_builtin_engines(); |