Constify crypto/cast.

This commit is contained in:
Bodo Möller 2009-12-22 10:58:33 +00:00
parent fbed9f8158
commit 7427379e9b
6 changed files with 16 additions and 16 deletions

View File

@ -39,6 +39,10 @@
Changes between 0.9.8m (?) and 1.0.0 [xx XXX xxxx] Changes between 0.9.8m (?) and 1.0.0 [xx XXX xxxx]
*) Constify crypto/cast (i.e., <openssl/cast.h>): a CAST_KEY doesn't
change when encrypting or decrypting.
[Bodo Moeller]
*) Add load_crls() function to apps tidying load_certs() too. Add option *) Add load_crls() function to apps tidying load_certs() too. Add option
to verify utility to allow additional CRLs to be included. to verify utility to allow additional CRLs to be included.
[Steve Henson] [Steve Henson]

View File

@ -65,7 +65,7 @@
*/ */
void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out, 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) int *num, int enc)
{ {
register CAST_LONG v0,v1,t; 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; v0=v1=ti[0]=ti[1]=t=c=cc=0;
*num=n; *num=n;
} }

View File

@ -63,7 +63,7 @@
const char CAST_version[]="CAST" OPENSSL_VERSION_PTEXT; const char CAST_version[]="CAST" OPENSSL_VERSION_PTEXT;
void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, 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]; 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[1]; l2n(l,out);
l=d[0]=d[1]=0; l=d[0]=d[1]=0;
} }

View File

@ -59,7 +59,7 @@
#include <openssl/cast.h> #include <openssl/cast.h>
#include "cast_lcl.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; register CAST_LONG l,r,*k,t;
@ -91,7 +91,7 @@ void CAST_encrypt(CAST_LONG *data, CAST_KEY *key)
data[0]=r&0xffffffffL; 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; 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, 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 tin0,tin1;
register CAST_LONG tout0,tout1,xor0,xor1; 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; tin0=tin1=tout0=tout1=xor0=xor1=0;
tin[0]=tin[1]=0; tin[0]=tin[1]=0;
} }

View File

@ -64,7 +64,7 @@
* 64bit block we have used is contained in *num; * 64bit block we have used is contained in *num;
*/ */
void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, 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) int *num)
{ {
register CAST_LONG v0,v1,t; 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; t=v0=v1=ti[0]=ti[1]=0;
*num=n; *num=n;
} }

View File

@ -85,17 +85,17 @@ typedef struct cast_key_st
void CAST_set_key(CAST_KEY *key, int len, const 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, void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, const CAST_KEY *key,
int enc); int enc);
void CAST_encrypt(CAST_LONG *data,CAST_KEY *key); void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key);
void CAST_decrypt(CAST_LONG *data,CAST_KEY *key); void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key);
void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, 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);
void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out, 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); int *num, int enc);
void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, 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); int *num);
#ifdef __cplusplus #ifdef __cplusplus