Remove NOPROTO definitions and error code comments.

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

diff --git a/crypto/evp/e_ecb_bf.c b/crypto/evp/e_ecb_bf.c
index f625862e4783a4b26eedaa5e9511e83b2a353257..d6924ac87096a4401dedd0020604c0367fd2daf5 100644 (file)
--- a/crypto/evp/e_ecb_bf.c
+++ b/crypto/evp/e_ecb_bf.c
@@ -1,5 +1,5 @@
 /* crypto/evp/e_ecb_bf.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,47 +60,40 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
-#ifndef NOPROTO
 static void bf_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
        unsigned char *iv,int enc);
 static void bf_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *in, unsigned int inl);
-#else
-static void bf_ecb_init_key();
-static void bf_ecb_cipher();
-#endif
-
 static EVP_CIPHER bfish_ecb_cipher=
        {
        NID_bf_ecb,
        8,EVP_BLOWFISH_KEY_SIZE,0,
        bf_ecb_init_key,
        bf_ecb_cipher,
+       NULL,
+       sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)),
+       NULL,
+       NULL,
        };
 
-EVP_CIPHER *EVP_bf_ecb()
+EVP_CIPHER *EVP_bf_ecb(void)
        {
        return(&bfish_ecb_cipher);
        }
        
-static void bf_ecb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void bf_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
        if (key != NULL)
-               BF_set_key(&(ctx->c.bf_ecb.ks),EVP_BLOWFISH_KEY_SIZE,key);
+               BF_set_key(&(ctx->c.bf_ks),EVP_BLOWFISH_KEY_SIZE,key);
        }
 
-static void bf_ecb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void bf_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
        unsigned int i;
 
@@ -110,7 +103,7 @@ unsigned int inl;
                {
                BF_ecb_encrypt(
                        &(in[i]),&(out[i]),
-                       &(ctx->c.bf_ecb.ks),ctx->encrypt);
+                       &(ctx->c.bf_ks),ctx->encrypt);
                }
        }