RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-25 03:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove remaining references to SSLeay

Browse Source 
Prompted by Rosen Penev
This commit is contained in:
Damien Miller 2018-10-23 17:10:41 +11:00
parent b9fea45a68
commit 859754bdeb
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -2602,8 +2602,9 @@ if test "x$openssl" = "xyes" ; then
if(fd == NULL) if(fd == NULL)
exit(1); exit(1);
if ((rc = fprintf(fd, "%08lx (%s)\n", (unsigned long)SSLeay(), if ((rc = fprintf(fd, "%08lx (%s)\n",
SSLeay_version(SSLEAY_VERSION))) < 0) (unsigned long)OpenSSL_version_num(),
OpenSSL_version(OPENSSL_VERSION))) < 0)
exit(1); exit(1);
exit(0); exit(0);
@ -2645,7 +2646,7 @@ if test "x$openssl" = "xyes" ; then
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#include <openssl/crypto.h> #include <openssl/crypto.h>
]], [[ ]], [[
exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); exit(OpenSSL_version_num() == OPENSSL_VERSION_NUMBER ? 0 : 1);
]])], ]])],
[ [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
@ -2673,7 +2674,7 @@ if test "x$openssl" = "xyes" ; then
AC_MSG_CHECKING([if programs using OpenSSL functions will link]) AC_MSG_CHECKING([if programs using OpenSSL functions will link])
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[ #include <openssl/evp.h> ]], [AC_LANG_PROGRAM([[ #include <openssl/evp.h> ]],
[[ SSLeay_add_all_algorithms(); ]])], [[ OpenSSL_add_all_algorithms(); ]])],
[ [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
], ],
@ -2684,7 +2685,7 @@ if test "x$openssl" = "xyes" ; then
AC_MSG_CHECKING([if programs using OpenSSL need -ldl]) AC_MSG_CHECKING([if programs using OpenSSL need -ldl])
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[ #include <openssl/evp.h> ]], [AC_LANG_PROGRAM([[ #include <openssl/evp.h> ]],
[[ SSLeay_add_all_algorithms(); ]])], [[ OpenSSL_add_all_algorithms(); ]])],
[ [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
], ],

6
entropy.c
View File

@ -219,9 +219,11 @@ seed_rng(void)
#ifndef OPENSSL_PRNG_ONLY #ifndef OPENSSL_PRNG_ONLY
unsigned char buf[RANDOM_SEED_SIZE]; unsigned char buf[RANDOM_SEED_SIZE];
#endif #endif
if (!ssh_compatible_openssl(OPENSSL_VERSION_NUMBER, SSLeay())) if (!ssh_compatible_openssl(OPENSSL_VERSION_NUMBER,
OpenSSL_version_num()))
fatal("OpenSSL version mismatch. Built against %lx, you " fatal("OpenSSL version mismatch. Built against %lx, you "
"have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay()); "have %lx", (u_long)OPENSSL_VERSION_NUMBER,
OpenSSL_version_num());
#ifndef OPENSSL_PRNG_ONLY #ifndef OPENSSL_PRNG_ONLY
if (RAND_status() == 1) { if (RAND_status() == 1) {