"make depend"

[oweals/openssl.git] / crypto / evp / e_cbc_d.c

diff --git a/crypto/evp/e_cbc_d.c b/crypto/evp/e_cbc_d.c
index accc01e95e0e668d82a5f52c1e4accbf9f5181a8..e97368142b1216d3427fe76abd5f4702a4a5e3b5 100644 (file)
--- a/crypto/evp/e_cbc_d.c
+++ b/crypto/evp/e_cbc_d.c
@@ -1,5 +1,5 @@
 /* crypto/evp/e_cbc_d.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
@@ -77,35 +77,30 @@ static EVP_CIPHER d_cbc_cipher=
        8,8,8,
        des_cbc_init_key,
        des_cbc_cipher,
+       NULL,
+       sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ks)),
+       EVP_CIPHER_get_asn1_iv,
+       EVP_CIPHER_set_asn1_iv,
        };
 
-EVP_CIPHER *EVP_des_cbc()
+EVP_CIPHER *EVP_des_cbc(void)
        {
        return(&d_cbc_cipher);
        }
        
-static void des_cbc_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
        if (iv != NULL)
-               memcpy(&(ctx->c.des_cbc.oiv[0]),iv,8);
-       memcpy(&(ctx->c.des_cbc.iv[0]),&(ctx->c.des_cbc.oiv[0]),8);
+               memcpy(&(ctx->oiv[0]),iv,8);
+       memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
        if (key != NULL)
-               des_set_key((des_cblock *)key,ctx->c.des_cbc.ks);
+               des_set_key(key,ctx->c.des_ks);
        }
 
-static void des_cbc_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
-       des_ncbc_encrypt(
-               (des_cblock *)in,(des_cblock *)out,
-               (long)inl, ctx->c.des_cbc.ks,
-               (des_cblock *)&(ctx->c.des_cbc.iv[0]),
-               ctx->encrypt);
+       des_ncbc_encrypt(in,out,inl,ctx->c.des_ks,&(ctx->iv[0]),ctx->encrypt);
        }