More multibyte character support.

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

diff --git a/crypto/evp/e_ofb_i.c b/crypto/evp/e_ofb_i.c
index dbf370b7b6a07c57b5ef91226d9a4a9bf4af02f3..389206ef3611d2a2735eed62e432ee200f52d9e9 100644 (file)
--- a/crypto/evp/e_ofb_i.c
+++ b/crypto/evp/e_ofb_i.c
@@ -1,5 +1,5 @@
 /* crypto/evp/e_ofb_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,57 +60,50 @@
 
 #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_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
        unsigned char *iv,int enc);
 static void idea_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *in, unsigned int inl);
-#else
-static void idea_ofb_init_key();
-static void idea_ofb_cipher();
-#endif
-
 static EVP_CIPHER i_ofb_cipher=
        {
        NID_idea_ofb64,
        1,IDEA_KEY_LENGTH,IDEA_BLOCK,
        idea_ofb_init_key,
        idea_ofb_cipher,
+       NULL,
+       sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.idea_ks)),
+       EVP_CIPHER_set_asn1_iv,
+       EVP_CIPHER_get_asn1_iv,
        };
 
-EVP_CIPHER *EVP_idea_ofb()
+EVP_CIPHER *EVP_idea_ofb(void)
        {
        return(&i_ofb_cipher);
        }
        
-static void idea_ofb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void idea_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
-       ctx->c.idea_cfb.num=0;
+       ctx->num=0;
 
        if (iv != NULL)
-               memcpy(&(ctx->c.idea_cfb.oiv[0]),iv,8);
-       memcpy(&(ctx->c.idea_cfb.iv[0]),&(ctx->c.idea_cfb.oiv[0]),8);
+               memcpy(&(ctx->oiv[0]),iv,8);
+       memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
        if (key != NULL)
-               idea_set_encrypt_key(key,&(ctx->c.idea_cfb.ks));
+               idea_set_encrypt_key(key,&(ctx->c.idea_ks));
        }
 
-static void idea_ofb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void idea_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
        idea_ofb64_encrypt(
                in,out,(long)inl,
-               &(ctx->c.idea_cfb.ks),&(ctx->c.idea_cfb.iv[0]),
-               &ctx->c.idea_cfb.num);
+               &(ctx->c.idea_ks),&(ctx->iv[0]),
+               &ctx->num);
        }
 
 #endif