openssh unix dev - Nov 2018 - [PATCH] Fix configure check for EVP_CIPHER_CTX_set_iv

This causes EVP_CIPHER_CTX_set_iv to get replaced unnecessarily (or
a duplicate symbol error if linking statically).
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 10696513..199975fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2865,7 +2865,7 @@ if test "x$openssl" = "xyes" ; then
 		[AC_DEFINE([HAVE_EVP_CIPHER_CTX_GET_IV], [1],
 		    [Define if libcrypto has EVP_CIPHER_CTX_get_iv])])
 	AC_SEARCH_LIBS([EVP_CIPHER_CTX_set_iv], [crypto],
-		[AC_DEFINE([HAVE_EVP_CIPHER_CTX_GET_IV], [1],
+		[AC_DEFINE([HAVE_EVP_CIPHER_CTX_SET_IV], [1],
 		    [Define if libcrypto has EVP_CIPHER_CTX_set_iv])])
 
 	AC_SEARCH_LIBS([RSA_get0_crt_params], [crypto],
-- 
2.19.1

On 5 November 2018 at 16:41, Michael Forney <mforney at mforney.org>
wrote:
> This causes EVP_CIPHER_CTX_set_iv to get replaced unnecessarily (or
> a duplicate symbol error if linking statically).
>
Applied, thanks.

>         AC_SEARCH_LIBS([EVP_CIPHER_CTX_set_iv], [crypto],
> -               [AC_DEFINE([HAVE_EVP_CIPHER_CTX_GET_IV], [1],
> +               [AC_DEFINE([HAVE_EVP_CIPHER_CTX_SET_IV], [1],
>                     [Define if libcrypto has EVP_CIPHER_CTX_set_iv])])
>
AC_SEARCH_LIBS sets that definition by default anyway.  Damien, is there
any reason we can't delete all those args?

-- 
Darren Tucker (dtucker at dtucker.net)
GPG key 11EAA6FA / A86E 3E07 5B19 5880 E860  37F4 9357 ECEF 11EA A6FA (new)
    Good judgement comes with experience. Unfortunately, the experience
usually comes from bad judgement.

On Mon, 5 Nov 2018, Darren Tucker wrote:
> On 5 November 2018 at 16:41, Michael Forney <mforney at mforney.org>
wrote:
> 
> > This causes EVP_CIPHER_CTX_set_iv to get replaced unnecessarily (or
> > a duplicate symbol error if linking statically).
> >
> 
> Applied, thanks.
should this go on the V_7_9 branch too?
> >         AC_SEARCH_LIBS([EVP_CIPHER_CTX_set_iv], [crypto],
> > -               [AC_DEFINE([HAVE_EVP_CIPHER_CTX_GET_IV], [1],
> > +               [AC_DEFINE([HAVE_EVP_CIPHER_CTX_SET_IV], [1],
> >                     [Define if libcrypto has EVP_CIPHER_CTX_set_iv])])
> >
> 
> AC_SEARCH_LIBS sets that definition by default anyway.  Damien, is there
> any reason we can't delete all those args?
IIRC I tried that and it didn't work, but maybe I'm misremembering.

-d