Commit 57ae2e24 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fourth phase EVP revision. 

Declare ciphers in terms of macros. This reduces
the amount of code and places each block cipher EVP
definition in a single file instead of being spread
over 4 files.
parent 380d3aa6

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
     cipher mode. They also all do nothing if the 'key' parameter is NULL and

     for CFB and OFB modes they zero ctx->num.



     Most of the routines have the same form and so can be declared in terms

     of macros.



     By shifting this to the top level EVP_CipherInit() it can be removed from

     all individual ciphers. If the cipher wants to handle IVs or keys

     differently it can set the EVP_CIPH_CUSTOM_IV or EVP_CIPH_ALWAYS_CALL_INIT

crypto/evp/Makefile.ssl

+112 −437

File changed.

Preview size limit exceeded, changes collapsed.

crypto/evp/e_cbc_bf.c→crypto/evp/e_bf.c

+7 −33
Original line number Diff line number Diff line 
/* crypto/evp/e_cbc_bf.c */

/* crypto/evp/e_bf.c */

/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

 * All rights reserved.

 *
@@ -60,47 +60,21 @@ 
#include <stdio.h>

#include "cryptlib.h"

#include <openssl/evp.h>

#include "evp_locl.h"

#include <openssl/objects.h>



static int bf_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

static int bf_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

	unsigned char *iv,int enc);

static int bf_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

	unsigned char *in, unsigned int inl);

static EVP_CIPHER bfish_cbc_cipher=

	{

	NID_bf_cbc,

	8,EVP_BLOWFISH_KEY_SIZE,8,

	EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH,

	bf_cbc_init_key,

	bf_cbc_cipher,

	NULL,

	sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+

		sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)),

	EVP_CIPHER_set_asn1_iv,

	EVP_CIPHER_get_asn1_iv,

	NULL

	};



EVP_CIPHER *EVP_bf_cbc(void)

	{

	return(&bfish_cbc_cipher);

	}

IMPLEMENT_BLOCK_CIPHER(bf, bf_ks, BF, bf_ks, NID_bf, 8, 16, 8,

			0, bf_init_key, NULL, 

			EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)

	

static int bf_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

static int bf_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

	     unsigned char *iv, int enc)

	{

	BF_set_key(&(ctx->c.bf_ks),EVP_CIPHER_CTX_key_length(ctx),key);

	return 1;

	}



static int bf_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

	     unsigned char *in, unsigned int inl)

	{

	BF_cbc_encrypt(

		in,out,(long)inl,

		&(ctx->c.bf_ks),&(ctx->iv[0]),

		ctx->encrypt);

	return 1;

	}



#endif

crypto/evp/e_cbc_c.c→crypto/evp/e_cast.c

+9 −34
Original line number Diff line number Diff line 
/* crypto/evp/e_cbc_c.c */

/* crypto/evp/e_cast.c */

/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

 * All rights reserved.

 *
@@ -62,46 +62,21 @@ 
#include "cryptlib.h"

#include <openssl/evp.h>

#include <openssl/objects.h>

#include "evp_locl.h"



static int cast_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

static int cast_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

	unsigned char *iv,int enc);

static int cast_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

	unsigned char *in, unsigned int inl);

static EVP_CIPHER cast5_cbc_cipher=

	{

	NID_cast5_cbc,

	8,EVP_CAST5_KEY_SIZE,8,

	EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH,

	cast_cbc_init_key,

	cast_cbc_cipher,

	NULL,

	sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+

		sizeof((((EVP_CIPHER_CTX *)NULL)->c.cast_ks)),

	EVP_CIPHER_set_asn1_iv,

	EVP_CIPHER_get_asn1_iv,

	NULL

	};



EVP_CIPHER *EVP_cast5_cbc(void)

	{

	return(&cast5_cbc_cipher);

	}

IMPLEMENT_BLOCK_CIPHER(cast5, cast_ks, CAST, cast_ks, 

			NID_cast5, 8, EVP_CAST5_KEY_SIZE, 8,

			EVP_CIPH_VARIABLE_LENGTH, cast_init_key, NULL,

			EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)

			

static int cast_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

static int cast_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

	     unsigned char *iv, int enc)

	{

	CAST_set_key(&(ctx->c.cast_ks),EVP_CIPHER_CTX_key_length(ctx),key);

	return 1;

	}



static int cast_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

	     unsigned char *in, unsigned int inl)

	{

	CAST_cbc_encrypt(

		in,out,(long)inl,

		&(ctx->c.cast_ks),&(ctx->iv[0]),

		ctx->encrypt);

	return 1;

	}



#endif

crypto/evp/e_cbc_3d.c

deleted100644 → 0
+0 −145
Original line number Diff line number Diff line 
/* crypto/evp/e_cbc_3d.c */

/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

 * All rights reserved.

 *

 * This package is an SSL implementation written

 * by Eric Young (eay@cryptsoft.com).

 * The implementation was written so as to conform with Netscapes SSL.

 * 

 * This library is free for commercial and non-commercial use as long as

 * the following conditions are aheared to.  The following conditions

 * apply to all code found in this distribution, be it the RC4, RSA,

 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation

 * included with this distribution is covered by the same copyright terms

 * except that the holder is Tim Hudson (tjh@cryptsoft.com).

 * 

 * Copyright remains Eric Young's, and as such any Copyright notices in

 * the code are not to be removed.

 * If this package is used in a product, Eric Young should be given attribution

 * as the author of the parts of the library used.

 * This can be in the form of a textual message at program startup or

 * in documentation (online or textual) provided with the package.

 * 

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 * 3. All advertising materials mentioning features or use of this software

 *    must display the following acknowledgement:

 *    "This product includes cryptographic software written by

 *     Eric Young (eay@cryptsoft.com)"

 *    The word 'cryptographic' can be left out if the rouines from the library

 *    being used are not cryptographic related :-).

 * 4. If you include any Windows specific code (or a derivative thereof) from 

 *    the apps directory (application code) you must include an acknowledgement:

 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

 * 

 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND

 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

 * SUCH DAMAGE.

 * 

 * The licence and distribution terms for any publically available version or

 * derivative of this code cannot be changed.  i.e. this code cannot simply be

 * copied and put under another distribution licence

 * [including the GNU Public Licence.]

 */



#ifndef NO_DES

#include <stdio.h>

#include "cryptlib.h"

#include <openssl/evp.h>

#include <openssl/objects.h>



static int des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

	unsigned char *iv,int enc);

static int des_cbc_ede3_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

	unsigned char *iv,int enc);

static int des_cbc_ede_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

	unsigned char *in, unsigned int inl);

static EVP_CIPHER d_cbc_ede_cipher2=

	{

	NID_des_ede_cbc,

	8,16,8,

	EVP_CIPH_CBC_MODE,

	des_cbc_ede_init_key,

	des_cbc_ede_cipher,

	NULL,

	sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+

		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),

	EVP_CIPHER_set_asn1_iv,

	EVP_CIPHER_get_asn1_iv,

	NULL

	};



static EVP_CIPHER d_cbc_ede_cipher3=

	{

	NID_des_ede3_cbc,

	8,24,8,

	EVP_CIPH_CBC_MODE,

	des_cbc_ede3_init_key,

	des_cbc_ede_cipher,

	NULL,

	sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+

		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),

	EVP_CIPHER_set_asn1_iv,

	EVP_CIPHER_get_asn1_iv,

	NULL

	};



EVP_CIPHER *EVP_des_ede_cbc(void)

	{

	return(&d_cbc_ede_cipher2);

	}



EVP_CIPHER *EVP_des_ede3_cbc(void)

	{

	return(&d_cbc_ede_cipher3);

	}

	

static int des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

	     unsigned char *iv, int enc)

	{

	des_cblock *deskey = (des_cblock *)key;



	des_set_key_unchecked(&deskey[0],ctx->c.des_ede.ks1);

	des_set_key_unchecked(&deskey[1],ctx->c.des_ede.ks2);

	memcpy( (char *)ctx->c.des_ede.ks3,

			(char *)ctx->c.des_ede.ks1,

			sizeof(ctx->c.des_ede.ks1));

	return 1;

	}



static int des_cbc_ede3_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

	     unsigned char *iv, int enc)

	{

	des_cblock *deskey = (des_cblock *)key;



	des_set_key_unchecked(&deskey[0],ctx->c.des_ede.ks1);

	des_set_key_unchecked(&deskey[1],ctx->c.des_ede.ks2);

	des_set_key_unchecked(&deskey[2],ctx->c.des_ede.ks3);



	return 1;

	}



static int des_cbc_ede_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

	     unsigned char *in, unsigned int inl)

	{

	des_ede3_cbc_encrypt(in,out,inl, ctx->c.des_ede.ks1,

		ctx->c.des_ede.ks2,ctx->c.des_ede.ks3,

		(des_cblock *) &(ctx->iv[0]),

		ctx->encrypt);

	return 1;

	}

#endif