diff options
author | Richard Levitte <levitte@openssl.org> | 2000-02-08 14:19:14 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2000-02-08 14:19:14 +0000 |
commit | cf0694015e8fcb6cd09f191299b6ad9d8793760e (patch) | |
tree | 8248f5e06d1b1f5da5c9fe4e65dd1a012503a7c0 | |
parent | 0cd4498b8f32bb0cb60724c42aa1014f724b2f2c (diff) |
Constify
-rw-r--r-- | crypto/bf/bf_cbc.c | 32 | ||||
-rw-r--r-- | crypto/bf/bf_cfb64.c | 4 | ||||
-rw-r--r-- | crypto/bf/bf_ecb.c | 8 | ||||
-rw-r--r-- | crypto/bf/bf_enc.c | 36 | ||||
-rw-r--r-- | crypto/bf/bf_ofb64.c | 4 | ||||
-rw-r--r-- | crypto/bf/bf_skey.c | 2 | ||||
-rw-r--r-- | crypto/bf/blowfish.h | 24 |
7 files changed, 56 insertions, 54 deletions
diff --git a/crypto/bf/bf_cbc.c b/crypto/bf/bf_cbc.c index 95d1cdcdf9..f949629dc6 100644 --- a/crypto/bf/bf_cbc.c +++ b/crypto/bf/bf_cbc.c @@ -59,8 +59,8 @@ #include <openssl/blowfish.h> #include "bf_locl.h" -void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, - BF_KEY *ks, unsigned char *iv, int encrypt) +void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, + const BF_KEY *schedule, unsigned char *ivec, int encrypt) { register BF_LONG tin0,tin1; register BF_LONG tout0,tout1,xor0,xor1; @@ -69,9 +69,9 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, if (encrypt) { - n2l(iv,tout0); - n2l(iv,tout1); - iv-=8; + n2l(ivec,tout0); + n2l(ivec,tout1); + ivec-=8; for (l-=8; l>=0; l-=8) { n2l(in,tin0); @@ -80,7 +80,7 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, tin1^=tout1; tin[0]=tin0; tin[1]=tin1; - BF_encrypt(tin,ks); + BF_encrypt(tin,schedule); tout0=tin[0]; tout1=tin[1]; l2n(tout0,out); @@ -93,27 +93,27 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, tin1^=tout1; tin[0]=tin0; tin[1]=tin1; - BF_encrypt(tin,ks); + BF_encrypt(tin,schedule); tout0=tin[0]; tout1=tin[1]; l2n(tout0,out); l2n(tout1,out); } - l2n(tout0,iv); - l2n(tout1,iv); + l2n(tout0,ivec); + l2n(tout1,ivec); } else { - n2l(iv,xor0); - n2l(iv,xor1); - iv-=8; + n2l(ivec,xor0); + n2l(ivec,xor1); + ivec-=8; for (l-=8; l>=0; l-=8) { n2l(in,tin0); n2l(in,tin1); tin[0]=tin0; tin[1]=tin1; - BF_decrypt(tin,ks); + BF_decrypt(tin,schedule); tout0=tin[0]^xor0; tout1=tin[1]^xor1; l2n(tout0,out); @@ -127,15 +127,15 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, n2l(in,tin1); tin[0]=tin0; tin[1]=tin1; - BF_decrypt(tin,ks); + BF_decrypt(tin,schedule); tout0=tin[0]^xor0; tout1=tin[1]^xor1; l2nn(tout0,tout1,out,l+8); xor0=tin0; xor1=tin1; } - l2n(xor0,iv); - l2n(xor1,iv); + l2n(xor0,ivec); + l2n(xor1,ivec); } tin0=tin1=tout0=tout1=xor0=xor1=0; tin[0]=tin[1]=0; diff --git a/crypto/bf/bf_cfb64.c b/crypto/bf/bf_cfb64.c index 1fb8905f49..6451c8d407 100644 --- a/crypto/bf/bf_cfb64.c +++ b/crypto/bf/bf_cfb64.c @@ -64,8 +64,8 @@ * 64bit block we have used is contained in *num; */ -void BF_cfb64_encrypt(unsigned char *in, unsigned char *out, long length, - BF_KEY *schedule, unsigned char *ivec, int *num, int encrypt) +void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length, + const BF_KEY *schedule, unsigned char *ivec, int *num, int encrypt) { register BF_LONG v0,v1,t; register int n= *num; diff --git a/crypto/bf/bf_ecb.c b/crypto/bf/bf_ecb.c index d8d6fff0ff..341991636f 100644 --- a/crypto/bf/bf_ecb.c +++ b/crypto/bf/bf_ecb.c @@ -78,17 +78,17 @@ const char *BF_options(void) #endif } -void BF_ecb_encrypt(unsigned char *in, unsigned char *out, BF_KEY *ks, - int encrypt) +void BF_ecb_encrypt(const unsigned char *in, unsigned char *out, + const BF_KEY *key, int encrypt) { BF_LONG l,d[2]; n2l(in,l); d[0]=l; n2l(in,l); d[1]=l; if (encrypt) - BF_encrypt(d,ks); + BF_encrypt(d,key); else - BF_decrypt(d,ks); + BF_decrypt(d,key); l=d[0]; l2n(l,out); l=d[1]; l2n(l,out); l=d[0]=d[1]=0; diff --git a/crypto/bf/bf_enc.c b/crypto/bf/bf_enc.c index 3d805759b5..a43361f433 100644 --- a/crypto/bf/bf_enc.c +++ b/crypto/bf/bf_enc.c @@ -69,7 +69,7 @@ to modify the code. #endif -void BF_encrypt(BF_LONG *data, BF_KEY *key) +void BF_encrypt(BF_LONG *data, const BF_KEY *key) { #ifndef BF_PTR2 register BF_LONG l,r,*p,*s; @@ -145,7 +145,7 @@ void BF_encrypt(BF_LONG *data, BF_KEY *key) #ifndef BF_DEFAULT_OPTIONS -void BF_decrypt(BF_LONG *data, BF_KEY *key) +void BF_decrypt(BF_LONG *data, const BF_KEY *key) { #ifndef BF_PTR2 register BF_LONG l,r,*p,*s; @@ -219,8 +219,8 @@ void BF_decrypt(BF_LONG *data, BF_KEY *key) #endif } -void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, - BF_KEY *ks, unsigned char *iv, int encrypt) +void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, + const BF_KEY *schedule, unsigned char *ivec, int encrypt) { register BF_LONG tin0,tin1; register BF_LONG tout0,tout1,xor0,xor1; @@ -229,9 +229,9 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, if (encrypt) { - n2l(iv,tout0); - n2l(iv,tout1); - iv-=8; + n2l(ivec,tout0); + n2l(ivec,tout1); + ivec-=8; for (l-=8; l>=0; l-=8) { n2l(in,tin0); @@ -240,7 +240,7 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, tin1^=tout1; tin[0]=tin0; tin[1]=tin1; - BF_encrypt(tin,ks); + BF_encrypt(tin,schedule); tout0=tin[0]; tout1=tin[1]; l2n(tout0,out); @@ -253,27 +253,27 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, tin1^=tout1; tin[0]=tin0; tin[1]=tin1; - BF_encrypt(tin,ks); + BF_encrypt(tin,schedule); tout0=tin[0]; tout1=tin[1]; l2n(tout0,out); l2n(tout1,out); } - l2n(tout0,iv); - l2n(tout1,iv); + l2n(tout0,ivec); + l2n(tout1,ivec); } else { - n2l(iv,xor0); - n2l(iv,xor1); - iv-=8; + n2l(ivec,xor0); + n2l(ivec,xor1); + ivec-=8; for (l-=8; l>=0; l-=8) { n2l(in,tin0); n2l(in,tin1); tin[0]=tin0; tin[1]=tin1; - BF_decrypt(tin,ks); + BF_decrypt(tin,schedule); tout0=tin[0]^xor0; tout1=tin[1]^xor1; l2n(tout0,out); @@ -287,15 +287,15 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, n2l(in,tin1); tin[0]=tin0; tin[1]=tin1; - BF_decrypt(tin,ks); + BF_decrypt(tin,schedule); tout0=tin[0]^xor0; tout1=tin[1]^xor1; l2nn(tout0,tout1,out,l+8); xor0=tin0; xor1=tin1; } - l2n(xor0,iv); - l2n(xor1,iv); + l2n(xor0,ivec); + l2n(xor1,ivec); } tin0=tin1=tout0=tout1=xor0=xor1=0; tin[0]=tin[1]=0; diff --git a/crypto/bf/bf_ofb64.c b/crypto/bf/bf_ofb64.c index 8ceb8d9bda..f2a9ff6e41 100644 --- a/crypto/bf/bf_ofb64.c +++ b/crypto/bf/bf_ofb64.c @@ -63,8 +63,8 @@ * used. The extra state information to record how much of the * 64bit block we have used is contained in *num; */ -void BF_ofb64_encrypt(unsigned char *in, unsigned char *out, long length, - BF_KEY *schedule, unsigned char *ivec, int *num) +void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, + const BF_KEY *schedule, unsigned char *ivec, int *num) { register BF_LONG v0,v1,t; register int n= *num; diff --git a/crypto/bf/bf_skey.c b/crypto/bf/bf_skey.c index eefa8e6f51..4fb869b129 100644 --- a/crypto/bf/bf_skey.c +++ b/crypto/bf/bf_skey.c @@ -62,7 +62,7 @@ #include "bf_locl.h" #include "bf_pi.h" -void BF_set_key(BF_KEY *key, int len, unsigned char *data) +void BF_set_key(BF_KEY *key, int len, const unsigned char *data) { int i; BF_LONG *p,ri,in[2]; diff --git a/crypto/bf/blowfish.h b/crypto/bf/blowfish.h index 02f73b2f30..78acfd63b4 100644 --- a/crypto/bf/blowfish.h +++ b/crypto/bf/blowfish.h @@ -103,17 +103,19 @@ typedef struct bf_key_st } BF_KEY; -void BF_set_key(BF_KEY *key, int len, unsigned char *data); -void BF_ecb_encrypt(unsigned char *in,unsigned char *out,BF_KEY *key, - int enc); -void BF_encrypt(BF_LONG *data,BF_KEY *key); -void BF_decrypt(BF_LONG *data,BF_KEY *key); -void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, - BF_KEY *ks, unsigned char *iv, int enc); -void BF_cfb64_encrypt(unsigned char *in, unsigned char *out, long length, - BF_KEY *schedule, unsigned char *ivec, int *num, int enc); -void BF_ofb64_encrypt(unsigned char *in, unsigned char *out, long length, - BF_KEY *schedule, unsigned char *ivec, int *num); +void BF_set_key(BF_KEY *key, int len, const unsigned char *data); + +void BF_encrypt(BF_LONG *data,const BF_KEY *key); +void BF_decrypt(BF_LONG *data,const BF_KEY *key); + +void BF_ecb_encrypt(const unsigned char *in, unsigned char *out, + const BF_KEY *key, int enc); +void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, + const BF_KEY *schedule, unsigned char *ivec, int enc); +void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length, + const BF_KEY *schedule, unsigned char *ivec, int *num, int enc); +void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, + const BF_KEY *schedule, unsigned char *ivec, int *num); const char *BF_options(void); #ifdef __cplusplus |