- djm@cvs.openbsd.org 2009/11/20 00:54:01

[openssh.git] / cipher-acss.c

diff --git a/cipher-acss.c b/cipher-acss.c
index eea05df48b76f0836bb04bfb98ab5641dc444a8b..cb0bf736c39dfa08bea33e6951da909b4a16d7ec 100644 (file)
--- a/cipher-acss.c
+++ b/cipher-acss.c
@@ -15,11 +15,12 @@
  */
 
 #include "includes.h"
+
 #include <openssl/evp.h>
 
-RCSID("$Id$");
+#include <string.h>
 
-#if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00906000L)
+#if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00907000L)
 
 #include "acss.h"
 
@@ -33,7 +34,7 @@ typedef struct {
 #define EVP_CTRL_SET_ACSS_SUBKEY        0xff07
 
 static int
-acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 
+acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     const unsigned char *iv, int enc)
 {
        acss_setkey(&data(ctx)->ks,key,enc,ACSS_DATA);
@@ -41,7 +42,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, 
+acss_ciph(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in,
     unsigned int inl)
 {
        acss(&data(ctx)->ks,inl,in,out);