Attachment #3462 for bug #3238

Lines 2898-2903 if test "x$openssl" = "xyes" ; then Link Here

(-)a/configure.ac (+5 lines)
2898	EVP_chacha20 \	2898	EVP_chacha20 \
2899	])	2899	])
2900		2900
		2901	# OpenSSL 3.x API
		2902	AC_CHECK_FUNCS([ \
		2903	EVP_CIPHER_CTX_get_iv_state \
		2904	])
		2905
2901	if test "x$openssl_engine" = "xyes" ; then	2906	if test "x$openssl_engine" = "xyes" ; then
2902	AC_MSG_CHECKING([for OpenSSL ENGINE support])	2907	AC_MSG_CHECKING([for OpenSSL ENGINE support])
2903	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[	2908	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[




}
#endif /* HAVE_RSA_SET0_FACTORS */

#if !defined(HAVE_EVP_CIPHER_CTX_GET_IV) && !defined(HAVE_EVP_CIPHER_CTX_GET_IV_STATE)
int
EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx, unsigned char *iv, size_t len)
{

	}
	return 1;
}
#endif /* !HAVE_EVP_CIPHER_CTX_GET_IV && !HAVE_EVP_CIPHER_CTX_GET_IV_STATE */

#ifdef HAVE_EVP_CIPHER_CTX_GET_IV_STATE
int
EVP_CIPHER_CTX_get_iv(EVP_CIPHER_CTX *ctx, void *iv, size_t len)
{
	return EVP_CIPHER_CTX_get_iv_state(ctx, iv, len);
}
#endif /* HAVE_EVP_CIPHER_CTX_GET_IV_STATE*/

#ifndef HAVE_EVP_CIPHER_CTX_SET_IV
int

Lines 112-118 void DSA_get0_key(const DSA d, const BIGNUM *pub_key, Link Here

(-)a/openbsd-compat/openssl-compat.h (-1 / +1 lines)
112	int DSA_set0_key(DSA d, BIGNUM pub_key, BIGNUM *priv_key);	112	int DSA_set0_key(DSA d, BIGNUM pub_key, BIGNUM *priv_key);
113	#endif /* HAVE_DSA_SET0_KEY */	113	#endif /* HAVE_DSA_SET0_KEY */
114		114
115	#ifndef HAVE_EVP_CIPHER_CTX_GET_IV	115	#if !defined(HAVE_EVP_CIPHER_CTX_GET_IV) && !defined(HAVE_EVP_CIPHER_CTX_GET_IV_STATE)
116	int EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx,	116	int EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx,
117	unsigned char *iv, size_t len);	117	unsigned char *iv, size_t len);
118	#endif /* HAVE_EVP_CIPHER_CTX_GET_IV */	118	#endif /* HAVE_EVP_CIPHER_CTX_GET_IV */

Return to bug 3238

Lines 334-340 RSA_set0_factors(RSA r, BIGNUM p, BIGNUM *q) Link Here

(-)a/openbsd-compat/libressl-api-compat.c (-2 / +10 lines)
334	}	334	}
335	#endif /* HAVE_RSA_SET0_FACTORS */	335	#endif /* HAVE_RSA_SET0_FACTORS */
336		336
337	#ifndef HAVE_EVP_CIPHER_CTX_GET_IV	337	#if !defined(HAVE_EVP_CIPHER_CTX_GET_IV) && !defined(HAVE_EVP_CIPHER_CTX_GET_IV_STATE)
338	int	338	int
339	EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX ctx, unsigned char iv, size_t len)	339	EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX ctx, unsigned char iv, size_t len)
340	{	340	{
Lines 361-367 EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX ctx, unsigned char iv, size_t len) Link Here
361	}	361	}
362	return 1;	362	return 1;
363	}	363	}
364	#endif /* HAVE_EVP_CIPHER_CTX_GET_IV */	364	#endif /* !HAVE_EVP_CIPHER_CTX_GET_IV && !HAVE_EVP_CIPHER_CTX_GET_IV_STATE */
		365
		366	#ifdef HAVE_EVP_CIPHER_CTX_GET_IV_STATE
		367	int
		368	EVP_CIPHER_CTX_get_iv(EVP_CIPHER_CTX ctx, void iv, size_t len)
		369	{
		370	return EVP_CIPHER_CTX_get_iv_state(ctx, iv, len);
		371	}
		372	#endif /* HAVE_EVP_CIPHER_CTX_GET_IV_STATE*/
365		373
366	#ifndef HAVE_EVP_CIPHER_CTX_SET_IV	374	#ifndef HAVE_EVP_CIPHER_CTX_SET_IV
367	int	375	int