Commit 1921eaad authored by Ben Laurie's avatar Ben Laurie
Browse files

EVP constification.

parent 26a3a48d

Configure

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ my %table=( 
# Our development configs

"purify",	"purify gcc:-g -DPURIFY -Wall::(unknown):-lsocket -lnsl::::",

"debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror::(unknown):-lefence::::",

"debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::",

"debug-ben-debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::",

"debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::",

"debug-ben-debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::",

"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown):::::",

"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

"debug-bodo",	"gcc:-DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -m486 -pedantic -Wshadow -Wall::-D_REENTRANT::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

crypto/cast/c_skey.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
#define S6 CAST_S_table6

#define S7 CAST_S_table7



void CAST_set_key(CAST_KEY *key, int len, unsigned char *data)

void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data)

	{

	CAST_LONG x[16];

	CAST_LONG z[16];

crypto/cast/cast.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ typedef struct cast_key_st 
	} CAST_KEY;



 

void CAST_set_key(CAST_KEY *key, int len, unsigned char *data);

void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);

void CAST_ecb_encrypt(const unsigned char *in,unsigned char *out,CAST_KEY *key,

		      int enc);

void CAST_encrypt(CAST_LONG *data,CAST_KEY *key);

crypto/evp/e_bf.c

+4 −4
Original line number Diff line number Diff line
@@ -63,15 +63,15 @@ 
#include "evp_locl.h"

#include <openssl/objects.h>



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

	unsigned char *iv,int enc);

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

		       const unsigned char *iv, int enc);



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_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

	     unsigned char *iv, int enc)

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

		       const unsigned char *iv, int enc)

	{

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

	return 1;

crypto/evp/e_cast.c

+4 −4
Original line number Diff line number Diff line
@@ -64,16 +64,16 @@ 
#include <openssl/objects.h>

#include "evp_locl.h"



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

	unsigned char *iv,int enc);

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

			 const unsigned char *iv,int enc);



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_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

	     unsigned char *iv, int enc)

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

			 const unsigned char *iv, int enc)

	{

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

	return 1;