projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
file rsa_x931g.c was added on branch OpenSSL_0_9_8-stable on 2008-09-16 22:54:29...
[oweals/openssl.git]
/
crypto
/
des
/
xcbc_enc.c
diff --git
a/crypto/des/xcbc_enc.c
b/crypto/des/xcbc_enc.c
index bb910a080d56607628d907ef91f8f6464d98d207..47246eb466497c0667c1221aa83bc5b7811a36a2 100644
(file)
--- a/
crypto/des/xcbc_enc.c
+++ b/
crypto/des/xcbc_enc.c
@@
-79,8
+79,8
@@
static unsigned char desx_white_in2out[256]={
0xA7,0x1C,0xC9,0x09,0x69,0x9A,0x83,0xCF,0x29,0x39,0xB9,0xE9,0x4C,0xFF,0x43,0xAB,
};
0xA7,0x1C,0xC9,0x09,0x69,0x9A,0x83,0xCF,0x29,0x39,0xB9,0xE9,0x4C,0xFF,0x43,0xAB,
};
-void
des_xwhite_in2out(const_des_cblock *des_key, const_des
_cblock *in_white,
-
des
_cblock *out_white)
+void
DES_xwhite_in2out(const_DES_cblock *des_key, const_DES
_cblock *in_white,
+
DES
_cblock *out_white)
{
int out0,out1;
int i;
{
int out0,out1;
int i;
@@
-107,10
+107,10
@@
void des_xwhite_in2out(const_des_cblock *des_key, const_des_cblock *in_white,
}
}
}
}
-void
des
_xcbc_encrypt(const unsigned char *in, unsigned char *out,
- long length,
des
_key_schedule *schedule,
-
des_cblock *ivec, const_des
_cblock *inw,
- const_
des
_cblock *outw, int enc)
+void
DES
_xcbc_encrypt(const unsigned char *in, unsigned char *out,
+ long length,
DES
_key_schedule *schedule,
+
DES_cblock *ivec, const_DES
_cblock *inw,
+ const_
DES
_cblock *outw, int enc)
{
register DES_LONG tin0,tin1;
register DES_LONG tout0,tout1,xor0,xor1;
{
register DES_LONG tin0,tin1;
register DES_LONG tout0,tout1,xor0,xor1;
@@
-139,7
+139,7
@@
void des_xcbc_encrypt(const unsigned char *in, unsigned char *out,
c2l(in,tin1);
tin0^=tout0^inW0; tin[0]=tin0;
tin1^=tout1^inW1; tin[1]=tin1;
c2l(in,tin1);
tin0^=tout0^inW0; tin[0]=tin0;
tin1^=tout1^inW1; tin[1]=tin1;
-
des
_encrypt1(tin,schedule,DES_ENCRYPT);
+
DES
_encrypt1(tin,schedule,DES_ENCRYPT);
tout0=tin[0]^outW0; l2c(tout0,out);
tout1=tin[1]^outW1; l2c(tout1,out);
}
tout0=tin[0]^outW0; l2c(tout0,out);
tout1=tin[1]^outW1; l2c(tout1,out);
}
@@
-148,7
+148,7
@@
void des_xcbc_encrypt(const unsigned char *in, unsigned char *out,
c2ln(in,tin0,tin1,l+8);
tin0^=tout0^inW0; tin[0]=tin0;
tin1^=tout1^inW1; tin[1]=tin1;
c2ln(in,tin0,tin1,l+8);
tin0^=tout0^inW0; tin[0]=tin0;
tin1^=tout1^inW1; tin[1]=tin1;
-
des
_encrypt1(tin,schedule,DES_ENCRYPT);
+
DES
_encrypt1(tin,schedule,DES_ENCRYPT);
tout0=tin[0]^outW0; l2c(tout0,out);
tout1=tin[1]^outW1; l2c(tout1,out);
}
tout0=tin[0]^outW0; l2c(tout0,out);
tout1=tin[1]^outW1; l2c(tout1,out);
}
@@
-164,7
+164,7
@@
void des_xcbc_encrypt(const unsigned char *in, unsigned char *out,
{
c2l(in,tin0); tin[0]=tin0^outW0;
c2l(in,tin1); tin[1]=tin1^outW1;
{
c2l(in,tin0); tin[0]=tin0^outW0;
c2l(in,tin1); tin[1]=tin1^outW1;
-
des
_encrypt1(tin,schedule,DES_DECRYPT);
+
DES
_encrypt1(tin,schedule,DES_DECRYPT);
tout0=tin[0]^xor0^inW0;
tout1=tin[1]^xor1^inW1;
l2c(tout0,out);
tout0=tin[0]^xor0^inW0;
tout1=tin[1]^xor1^inW1;
l2c(tout0,out);
@@
-176,7
+176,7
@@
void des_xcbc_encrypt(const unsigned char *in, unsigned char *out,
{
c2l(in,tin0); tin[0]=tin0^outW0;
c2l(in,tin1); tin[1]=tin1^outW1;
{
c2l(in,tin0); tin[0]=tin0^outW0;
c2l(in,tin1); tin[1]=tin1^outW1;
-
des
_encrypt1(tin,schedule,DES_DECRYPT);
+
DES
_encrypt1(tin,schedule,DES_DECRYPT);
tout0=tin[0]^xor0^inW0;
tout1=tin[1]^xor1^inW1;
l2cn(tout0,tout1,out,l+8);
tout0=tin[0]^xor0^inW0;
tout1=tin[1]^xor1^inW1;
l2cn(tout0,tout1,out,l+8);