Change #include filenames from <foo.h> to <openssl.h>.

[openssl.git] / crypto / evp / e_ecb_i.c

diff --git a/crypto/evp/e_ecb_i.c b/crypto/evp/e_ecb_i.c
index 318c4c3afd540dee9b47337b08156c89e4a1fed4..a9948ce49f8a3c41c8b8b9679146c60b1302f6f3 100644 (file)
--- a/crypto/evp/e_ecb_i.c
+++ b/crypto/evp/e_ecb_i.c
@@ -1,5 +1,5 @@
 /* crypto/evp/e_ecb_i.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
@@ -60,8 +60,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 idea_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
@@ -79,40 +79,39 @@ static EVP_CIPHER i_ecb_cipher=
        8,16,0,
        idea_ecb_init_key,
        idea_ecb_cipher,
+       NULL,
+       sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.idea_ks)),
+       NULL,
+       NULL,
        };
 
-EVP_CIPHER *EVP_idea_ecb()
+EVP_CIPHER *EVP_idea_ecb(void)
        {
        return(&i_ecb_cipher);
        }
        
-static void idea_ecb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void idea_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
        if (key != NULL)
                {
                if (enc)
-                       idea_set_encrypt_key(key,&(ctx->c.idea_ecb.ks));
+                       idea_set_encrypt_key(key,&(ctx->c.idea_ks));
                else
                        {
                        IDEA_KEY_SCHEDULE tmp;
 
                        idea_set_encrypt_key(key,&tmp);
-                       idea_set_decrypt_key(&tmp, &(ctx->c.idea_ecb.ks));
+                       idea_set_decrypt_key(&tmp, &(ctx->c.idea_ks));
                        memset((unsigned char *)&tmp,0,
                                sizeof(IDEA_KEY_SCHEDULE));
                        }
                }
        }
 
-static void idea_ecb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void idea_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
        unsigned int i;
 
@@ -121,7 +120,7 @@ unsigned int inl;
        for (i=0; i<=inl; i+=8)
                {
                idea_ecb_encrypt(
-                       &(in[i]),&(out[i]),&(ctx->c.idea_ecb.ks));
+                       &(in[i]),&(out[i]),&(ctx->c.idea_ks));
                }
        }