X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fe_ofb_i.c;h=36c14b492e1ddb57c5d4b3c81714128bb24f24b4;hp=dbf370b7b6a07c57b5ef91226d9a4a9bf4af02f3;hb=be06a9348d83187071270a29aabfe10cc3904f85;hpb=b7896b3cb86d80206af14a14d69b0717786f2729

diff --git a/crypto/evp/e_ofb_i.c b/crypto/evp/e_ofb_i.c
index dbf370b7b6..36c14b492e 100644
--- 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,54 @@
 
 #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,
+static int 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,
+static int 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,
+	EVP_CIPH_OFB_MODE,
 	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,
+	NULL
 	};
 
-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 int 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));
+	return 1;
 	}
 
-static void idea_ofb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static int 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);
+	return 1;
 	}
 
 #endif