From 9a3d0dc062e4ebcafdc399ed8522df97066b139e Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 7 Oct 2010 22:06:42 +1100
Subject:    - djm@cvs.openbsd.org 2010/10/01 23:05:32      [cipher-3des1.c
 cipher-bf1.c cipher-ctr.c openbsd-compat/openssl-compat.h]      adapt to API
 changes in openssl-1.0.0a      NB. contains compat code to select correct API
 for older OpenSSL

---
 cipher-acss.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cipher-acss.c')

diff --git a/cipher-acss.c b/cipher-acss.c
index cb0bf736c..df74b0cb6 100644
--- a/cipher-acss.c
+++ b/cipher-acss.c
@@ -43,7 +43,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;
-- 
cgit v1.2.3


From 80e99539385bf55f09f4e0fa3e37b5eff9cc9cbe Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 7 Oct 2010 22:12:08 +1100
Subject:  - (djm) [cipher-acss.c] Add missing header.

---
 ChangeLog     | 1 +
 cipher-acss.c | 1 +
 2 files changed, 2 insertions(+)

(limited to 'cipher-acss.c')

diff --git a/ChangeLog b/ChangeLog
index 3ddf1f961..8d8615bb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@
      [sshconnect.c]
      swapped args to kill(2)
  - (djm) [openbsd-compat/glob.c] restore ARG_MAX compat code.
+ - (djm) [cipher-acss.c] Add missing header.
 
 20100924
  - (djm) OpenBSD CVS Sync
diff --git a/cipher-acss.c b/cipher-acss.c
index df74b0cb6..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)
 
-- 
cgit v1.2.3