generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Constify

Browse Source
This commit is contained in:
Richard Levitte 2000-02-08 14:19:14 +00:00
parent 0cd4498b8f
commit cf0694015e
7 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
crypto/bf/bf_cbc.c
View File

@ -59,8 +59,8 @@
#include <openssl/blowfish.h> #include <openssl/blowfish.h>
#include "bf_locl.h" #include "bf_locl.h"
void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
BF_KEY *ks, unsigned char *iv, int encrypt) const BF_KEY *schedule, unsigned char *ivec, int encrypt)
{ {
register BF_LONG tin0,tin1; register BF_LONG tin0,tin1;
register BF_LONG tout0,tout1,xor0,xor1; 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) if (encrypt)
{ {
n2l(iv,tout0); n2l(ivec,tout0);
n2l(iv,tout1); n2l(ivec,tout1);
iv-=8; ivec-=8;
for (l-=8; l>=0; l-=8) for (l-=8; l>=0; l-=8)
{ {
n2l(in,tin0); n2l(in,tin0);
@ -80,7 +80,7 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
tin1^=tout1; tin1^=tout1;
tin[0]=tin0; tin[0]=tin0;
tin[1]=tin1; tin[1]=tin1;
BF_encrypt(tin,ks); BF_encrypt(tin,schedule);
tout0=tin[0]; tout0=tin[0];
tout1=tin[1]; tout1=tin[1];
l2n(tout0,out); l2n(tout0,out);
@ -93,27 +93,27 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
tin1^=tout1; tin1^=tout1;
tin[0]=tin0; tin[0]=tin0;
tin[1]=tin1; tin[1]=tin1;
BF_encrypt(tin,ks); BF_encrypt(tin,schedule);
tout0=tin[0]; tout0=tin[0];
tout1=tin[1]; tout1=tin[1];
l2n(tout0,out); l2n(tout0,out);
l2n(tout1,out); l2n(tout1,out);
} }
l2n(tout0,iv); l2n(tout0,ivec);
l2n(tout1,iv); l2n(tout1,ivec);
} }
else else
{ {
n2l(iv,xor0); n2l(ivec,xor0);
n2l(iv,xor1); n2l(ivec,xor1);
iv-=8; ivec-=8;
for (l-=8; l>=0; l-=8) for (l-=8; l>=0; l-=8)
{ {
n2l(in,tin0); n2l(in,tin0);
n2l(in,tin1); n2l(in,tin1);
tin[0]=tin0; tin[0]=tin0;
tin[1]=tin1; tin[1]=tin1;
BF_decrypt(tin,ks); BF_decrypt(tin,schedule);
tout0=tin[0]^xor0; tout0=tin[0]^xor0;
tout1=tin[1]^xor1; tout1=tin[1]^xor1;
l2n(tout0,out); l2n(tout0,out);
@ -127,15 +127,15 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
n2l(in,tin1); n2l(in,tin1);
tin[0]=tin0; tin[0]=tin0;
tin[1]=tin1; tin[1]=tin1;
BF_decrypt(tin,ks); BF_decrypt(tin,schedule);
tout0=tin[0]^xor0; tout0=tin[0]^xor0;
tout1=tin[1]^xor1; tout1=tin[1]^xor1;
l2nn(tout0,tout1,out,l+8); l2nn(tout0,tout1,out,l+8);
xor0=tin0; xor0=tin0;
xor1=tin1; xor1=tin1;
} }
l2n(xor0,iv); l2n(xor0,ivec);
l2n(xor1,iv); l2n(xor1,ivec);
} }
tin0=tin1=tout0=tout1=xor0=xor1=0; tin0=tin1=tout0=tout1=xor0=xor1=0;
tin[0]=tin[1]=0; tin[0]=tin[1]=0;

4
crypto/bf/bf_cfb64.c
View File

@ -64,8 +64,8 @@
* 64bit block we have used is contained in *num; * 64bit block we have used is contained in *num;
*/ */
void BF_cfb64_encrypt(unsigned char *in, unsigned char *out, long length, void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length,
BF_KEY *schedule, unsigned char *ivec, int *num, int encrypt) const BF_KEY *schedule, unsigned char *ivec, int *num, int encrypt)
{ {
register BF_LONG v0,v1,t; register BF_LONG v0,v1,t;
register int n= *num; register int n= *num;

8
crypto/bf/bf_ecb.c
View File

@ -78,17 +78,17 @@ const char *BF_options(void)
#endif #endif
} }
void BF_ecb_encrypt(unsigned char *in, unsigned char *out, BF_KEY *ks, void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
int encrypt) const BF_KEY *key, int encrypt)
{ {
BF_LONG l,d[2]; BF_LONG l,d[2];
n2l(in,l); d[0]=l; n2l(in,l); d[0]=l;
n2l(in,l); d[1]=l; n2l(in,l); d[1]=l;
if (encrypt) if (encrypt)
BF_encrypt(d,ks); BF_encrypt(d,key);
else else
BF_decrypt(d,ks); BF_decrypt(d,key);
l=d[0]; l2n(l,out); l=d[0]; l2n(l,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;

36
crypto/bf/bf_enc.c
View File

@ -69,7 +69,7 @@
to modify the code. to modify the code.
#endif #endif
void BF_encrypt(BF_LONG *data, BF_KEY *key) void BF_encrypt(BF_LONG *data, const BF_KEY *key)
{ {
#ifndef BF_PTR2 #ifndef BF_PTR2
register BF_LONG l,r,*p,*s; register BF_LONG l,r,*p,*s;
@ -145,7 +145,7 @@ void BF_encrypt(BF_LONG *data, BF_KEY *key)
#ifndef BF_DEFAULT_OPTIONS #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 #ifndef BF_PTR2
register BF_LONG l,r,*p,*s; register BF_LONG l,r,*p,*s;
@ -219,8 +219,8 @@ void BF_decrypt(BF_LONG *data, BF_KEY *key)
#endif #endif
} }
void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
BF_KEY *ks, unsigned char *iv, int encrypt) const BF_KEY *schedule, unsigned char *ivec, int encrypt)
{ {
register BF_LONG tin0,tin1; register BF_LONG tin0,tin1;
register BF_LONG tout0,tout1,xor0,xor1; 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) if (encrypt)
{ {
n2l(iv,tout0); n2l(ivec,tout0);
n2l(iv,tout1); n2l(ivec,tout1);
iv-=8; ivec-=8;
for (l-=8; l>=0; l-=8) for (l-=8; l>=0; l-=8)
{ {
n2l(in,tin0); n2l(in,tin0);
@ -240,7 +240,7 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
tin1^=tout1; tin1^=tout1;
tin[0]=tin0; tin[0]=tin0;
tin[1]=tin1; tin[1]=tin1;
BF_encrypt(tin,ks); BF_encrypt(tin,schedule);
tout0=tin[0]; tout0=tin[0];
tout1=tin[1]; tout1=tin[1];
l2n(tout0,out); l2n(tout0,out);
@ -253,27 +253,27 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
tin1^=tout1; tin1^=tout1;
tin[0]=tin0; tin[0]=tin0;
tin[1]=tin1; tin[1]=tin1;
BF_encrypt(tin,ks); BF_encrypt(tin,schedule);
tout0=tin[0]; tout0=tin[0];
tout1=tin[1]; tout1=tin[1];
l2n(tout0,out); l2n(tout0,out);
l2n(tout1,out); l2n(tout1,out);
} }
l2n(tout0,iv); l2n(tout0,ivec);
l2n(tout1,iv); l2n(tout1,ivec);
} }
else else
{ {
n2l(iv,xor0); n2l(ivec,xor0);
n2l(iv,xor1); n2l(ivec,xor1);
iv-=8; ivec-=8;
for (l-=8; l>=0; l-=8) for (l-=8; l>=0; l-=8)
{ {
n2l(in,tin0); n2l(in,tin0);
n2l(in,tin1); n2l(in,tin1);
tin[0]=tin0; tin[0]=tin0;
tin[1]=tin1; tin[1]=tin1;
BF_decrypt(tin,ks); BF_decrypt(tin,schedule);
tout0=tin[0]^xor0; tout0=tin[0]^xor0;
tout1=tin[1]^xor1; tout1=tin[1]^xor1;
l2n(tout0,out); l2n(tout0,out);
@ -287,15 +287,15 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
n2l(in,tin1); n2l(in,tin1);
tin[0]=tin0; tin[0]=tin0;
tin[1]=tin1; tin[1]=tin1;
BF_decrypt(tin,ks); BF_decrypt(tin,schedule);
tout0=tin[0]^xor0; tout0=tin[0]^xor0;
tout1=tin[1]^xor1; tout1=tin[1]^xor1;
l2nn(tout0,tout1,out,l+8); l2nn(tout0,tout1,out,l+8);
xor0=tin0; xor0=tin0;
xor1=tin1; xor1=tin1;
} }
l2n(xor0,iv); l2n(xor0,ivec);
l2n(xor1,iv); l2n(xor1,ivec);
} }
tin0=tin1=tout0=tout1=xor0=xor1=0; tin0=tin1=tout0=tout1=xor0=xor1=0;
tin[0]=tin[1]=0; tin[0]=tin[1]=0;

4
crypto/bf/bf_ofb64.c
View File

@ -63,8 +63,8 @@
* used. The extra state information to record how much of the * used. The extra state information to record how much of the
* 64bit block we have used is contained in *num; * 64bit block we have used is contained in *num;
*/ */
void BF_ofb64_encrypt(unsigned char *in, unsigned char *out, long length, void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length,
BF_KEY *schedule, unsigned char *ivec, int *num) const BF_KEY *schedule, unsigned char *ivec, int *num)
{ {
register BF_LONG v0,v1,t; register BF_LONG v0,v1,t;
register int n= *num; register int n= *num;

2
crypto/bf/bf_skey.c
View File

@ -62,7 +62,7 @@
#include "bf_locl.h" #include "bf_locl.h"
#include "bf_pi.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; int i;
BF_LONG *p,ri,in[2]; BF_LONG *p,ri,in[2];

24
crypto/bf/blowfish.h
View File

@ -103,17 +103,19 @@ typedef struct bf_key_st
} BF_KEY; } BF_KEY;
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);
void BF_ecb_encrypt(unsigned char *in,unsigned char *out,BF_KEY *key,
int enc); void BF_encrypt(BF_LONG *data,const BF_KEY *key);
void BF_encrypt(BF_LONG *data,BF_KEY *key); void BF_decrypt(BF_LONG *data,const BF_KEY *key);
void BF_decrypt(BF_LONG *data,BF_KEY *key);
void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
BF_KEY *ks, unsigned char *iv, int enc); const BF_KEY *key, int enc);
void BF_cfb64_encrypt(unsigned char *in, unsigned char *out, long length, void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
BF_KEY *schedule, unsigned char *ivec, int *num, int enc); const BF_KEY *schedule, unsigned char *ivec, int enc);
void BF_ofb64_encrypt(unsigned char *in, unsigned char *out, long length, void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length,
BF_KEY *schedule, unsigned char *ivec, int *num); 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); const char *BF_options(void);
#ifdef __cplusplus #ifdef __cplusplus