Commit d0e79d7e authored by Bodo Möller's avatar Bodo Möller
Browse files

Constify crypto/cast.

parent c1003dfd

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


 Changes between 0.9.8l (?) and 0.9.8m (?)  [xx XXX xxxx]



  *) Constify crypto/cast (i.e., <openssl/cast.h>): a CAST_KEY doesn't

     change when encrypting or decrypting.

     [Bodo Moeller]



  *) Add option SSL_OP_LEGACY_SERVER_CONNECT which will allow clients to

     connect (but not renegotiate) with servers which do not support RI.

     Until RI is more widely deployed this option is enabled by default.

crypto/cast/c_cfb64.c

+1 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
 */



void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,

			long length, CAST_KEY *schedule, unsigned char *ivec,

			long length, const CAST_KEY *schedule, unsigned char *ivec,

			int *num, int enc)

	{

	register CAST_LONG v0,v1,t;
@@ -119,4 +119,3 @@ void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out, 
	v0=v1=ti[0]=ti[1]=t=c=cc=0;

	*num=n;

	}

crypto/cast/c_ecb.c

+1 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
const char CAST_version[]="CAST" OPENSSL_VERSION_PTEXT;



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

		      CAST_KEY *ks, int enc)

		      const CAST_KEY *ks, int enc)

	{

	CAST_LONG l,d[2];
@@ -77,4 +77,3 @@ void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, 
	l=d[1]; l2n(l,out);

	l=d[0]=d[1]=0;

	}

crypto/cast/c_enc.c

+3 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#include <openssl/cast.h>

#include "cast_lcl.h"



void CAST_encrypt(CAST_LONG *data, CAST_KEY *key)

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

	{

	register CAST_LONG l,r,*k,t;
@@ -91,7 +91,7 @@ void CAST_encrypt(CAST_LONG *data, CAST_KEY *key) 
	data[0]=r&0xffffffffL;

	}



void CAST_decrypt(CAST_LONG *data, CAST_KEY *key)

void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key)

	{

	register CAST_LONG l,r,*k,t;
@@ -124,7 +124,7 @@ void CAST_decrypt(CAST_LONG *data, CAST_KEY *key) 
	}



void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,

	     CAST_KEY *ks, unsigned char *iv, int enc)

	     const CAST_KEY *ks, unsigned char *iv, int enc)

	{

	register CAST_LONG tin0,tin1;

	register CAST_LONG tout0,tout1,xor0,xor1;
@@ -204,4 +204,3 @@ void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, 
	tin0=tin1=tout0=tout1=xor0=xor1=0;

	tin[0]=tin[1]=0;

	}

crypto/cast/c_ofb64.c

+1 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
 * 64bit block we have used is contained in *num;

 */

void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,

			long length, CAST_KEY *schedule, unsigned char *ivec,

			long length, const CAST_KEY *schedule, unsigned char *ivec,

			int *num)

	{

	register CAST_LONG v0,v1,t;
@@ -108,4 +108,3 @@ void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, 
	t=v0=v1=ti[0]=ti[1]=0;

	*num=n;

	}