D51810.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51810.id.diff
View Options

	diff --git a/crypto/openssh/openbsd-compat/libressl-api-compat.c b/crypto/openssh/openbsd-compat/libressl-api-compat.c
	--- a/crypto/openssh/openbsd-compat/libressl-api-compat.c
	+++ b/crypto/openssh/openbsd-compat/libressl-api-compat.c
	@@ -26,6 +26,7 @@
	#include <openssl/evp.h>

	#ifndef HAVE_EVP_CIPHER_CTX_GET_IV
	+# ifndef HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV
	int
	EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX ctx, unsigned char iv, size_t len)
	{
	@@ -44,14 +45,15 @@
	if (len != 0) {
	if (iv == NULL)
	return 0;
	-# ifdef HAVE_EVP_CIPHER_CTX_IV
	+# ifdef HAVE_EVP_CIPHER_CTX_IV
	memcpy(iv, EVP_CIPHER_CTX_iv(ctx), len);
	-# else
	+# else
	memcpy(iv, ctx->iv, len);
	-# endif /* HAVE_EVP_CIPHER_CTX_IV */
	+# endif /* HAVE_EVP_CIPHER_CTX_IV */
	}
	return 1;
	}
	+# endif /* HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV */
	#endif /* HAVE_EVP_CIPHER_CTX_GET_IV */

	#ifndef HAVE_EVP_CIPHER_CTX_SET_IV
	diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h
	--- a/crypto/openssh/ssh_namespace.h
	+++ b/crypto/openssh/ssh_namespace.h
	@@ -9,7 +9,6 @@
	#define Blowfish_initstate Fssh_Blowfish_initstate
	#define Blowfish_stream2word Fssh_Blowfish_stream2word
	#define Decode Fssh_Decode
	-#define EVP_CIPHER_CTX_get_iv Fssh_EVP_CIPHER_CTX_get_iv
	#define EVP_CIPHER_CTX_set_iv Fssh_EVP_CIPHER_CTX_set_iv
	#define Encode Fssh_Encode
	#define Hide Fssh_Hide