merge 5.7p1

1 files changed, 2 insertions, 1 deletions

diff --git a/cipher-acss.c b/cipher-acss.c
index cb0bf736c..e755f92b9 100644
--- a/cipher-acss.c
+++ b/cipher-acss.c
@@ -23,6 +23,7 @@
 #if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00907000L)
 
 #include "acss.h"
+#include "openbsd-compat/openssl-compat.h"
 
 #define data(ctx) ((EVP_ACSS_KEY *)(ctx)->cipher_data)
 
@@ -43,7 +44,7 @@ acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 
 static int
 acss_ciph(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in,
-    unsigned int inl)
+    LIBCRYPTO_EVP_INL_TYPE inl)
 {
         acss(&data(ctx)->ks,inl,in,out);
         return 1;