svn commit: lorikeet r347 - in trunk/heimdal/lib/des: .
abartlet at samba.org
abartlet at samba.org
Sat Jun 18 11:04:54 GMT 2005
Author: abartlet
Date: 2005-06-18 11:04:54 +0000 (Sat, 18 Jun 2005)
New Revision: 347
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=347
Log:
Rename parameter, as 'encrypt' shadows a global.
Andrew Bartlett
Modified:
trunk/heimdal/lib/des/aes.c
trunk/heimdal/lib/des/des.c
trunk/heimdal/lib/des/rc2.c
Changeset:
Modified: trunk/heimdal/lib/des/aes.c
===================================================================
--- trunk/heimdal/lib/des/aes.c 2005-06-17 08:25:08 UTC (rev 346)
+++ trunk/heimdal/lib/des/aes.c 2005-06-18 11:04:54 UTC (rev 347)
@@ -79,12 +79,12 @@
void
AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
unsigned long size, const AES_KEY *key,
- unsigned char *iv, int encrypt)
+ unsigned char *iv, int forward_encrypt)
{
unsigned char tmp[AES_BLOCK_SIZE];
int i;
- if (encrypt) {
+ if (forward_encrypt) {
while (size >= AES_BLOCK_SIZE) {
for (i = 0; i < AES_BLOCK_SIZE; i++)
tmp[i] = in[i] ^ iv[i];
Modified: trunk/heimdal/lib/des/des.c
===================================================================
--- trunk/heimdal/lib/des/des.c 2005-06-17 08:25:08 UTC (rev 346)
+++ trunk/heimdal/lib/des/des.c 2005-06-18 11:04:54 UTC (rev 347)
@@ -241,10 +241,10 @@
*/
void
-DES_encrypt(uint32_t u[2], DES_key_schedule *ks, int encrypt)
+DES_encrypt(uint32_t u[2], DES_key_schedule *ks, int forward_encrypt)
{
IP(u);
- desx(u, ks, encrypt);
+ desx(u, ks, forward_encrypt);
FP(u);
}
@@ -254,11 +254,11 @@
void
DES_ecb_encrypt(DES_cblock *input, DES_cblock *output,
- DES_key_schedule *ks, int encrypt)
+ DES_key_schedule *ks, int forward_encrypt)
{
uint32_t u[2];
load(*input, u);
- DES_encrypt(u, ks, encrypt);
+ DES_encrypt(u, ks, forward_encrypt);
store(u, *output);
}
@@ -268,14 +268,14 @@
void
DES_cbc_encrypt(unsigned char *input, unsigned char *output, long length,
- DES_key_schedule *ks, DES_cblock *iv, int encrypt)
+ DES_key_schedule *ks, DES_cblock *iv, int forward_encrypt)
{
uint32_t u[2];
uint32_t uiv[2];
load(*iv, uiv);
- if (encrypt) {
+ if (forward_encrypt) {
while (length >= DES_CBLOCK_LEN) {
load(input, u);
u[0] ^= uiv[0]; u[1] ^= uiv[1];
@@ -329,14 +329,14 @@
void
DES_pcbc_encrypt(unsigned char *input, unsigned char *output, long length,
- DES_key_schedule *ks, DES_cblock *iv, int encrypt)
+ DES_key_schedule *ks, DES_cblock *iv, int forward_encrypt)
{
uint32_t u[2];
uint32_t uiv[2];
load(*iv, uiv);
- if (encrypt) {
+ if (forward_encrypt) {
uint32_t t[2];
while (length >= DES_CBLOCK_LEN) {
load(input, u);
@@ -391,10 +391,10 @@
static void
_des3_encrypt(uint32_t u[2], DES_key_schedule *ks1, DES_key_schedule *ks2,
- DES_key_schedule *ks3, int encrypt)
+ DES_key_schedule *ks3, int forward_encrypt)
{
IP(u);
- if (encrypt) {
+ if (forward_encrypt) {
desx(u, ks1, 1); /* IP + FP cancel out each other */
desx(u, ks2, 0);
desx(u, ks3, 1);
@@ -416,11 +416,11 @@
DES_key_schedule *ks1,
DES_key_schedule *ks2,
DES_key_schedule *ks3,
- int encrypt)
+ int forward_encrypt)
{
uint32_t u[2];
load(*input, u);
- _des3_encrypt(u, ks1, ks2, ks3, encrypt);
+ _des3_encrypt(u, ks1, ks2, ks3, forward_encrypt);
store(u, *output);
return;
}
@@ -433,14 +433,14 @@
DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
long length, DES_key_schedule *ks1,
DES_key_schedule *ks2, DES_key_schedule *ks3,
- DES_cblock *iv, int encrypt)
+ DES_cblock *iv, int forward_encrypt)
{
uint32_t u[2];
uint32_t uiv[2];
load(*iv, uiv);
- if (encrypt) {
+ if (forward_encrypt) {
while (length >= DES_CBLOCK_LEN) {
load(input, u);
u[0] ^= uiv[0]; u[1] ^= uiv[1];
@@ -496,14 +496,14 @@
void
DES_cfb64_encrypt(unsigned char *input, unsigned char *output,
long length, DES_key_schedule *ks, DES_cblock *iv,
- int *num, int encrypt)
+ int *num, int forward_encrypt)
{
unsigned char tmp[DES_CBLOCK_LEN];
uint32_t uiv[2];
load(*iv, uiv);
- if (encrypt) {
+ if (forward_encrypt) {
int i = *num;
while (length > 0) {
@@ -606,13 +606,14 @@
void
DES_string_to_key(const char *str, DES_cblock *key)
{
- unsigned char *s, *k;
+ const unsigned char *s;
+ unsigned char *k;
DES_key_schedule ks;
size_t i, len;
memset(key, 0, sizeof(*key));
k = *key;
- s = (unsigned char *)str;
+ s = (const unsigned char *)str;
len = strlen(str);
for (i = 0; i < len; i++) {
@@ -878,7 +879,7 @@
}
static void
-desx(uint32_t block[2], DES_key_schedule *ks, int encrypt)
+desx(uint32_t block[2], DES_key_schedule *ks, int forward_encrypt)
{
uint32_t *keys;
uint32_t fval, work, right, left;
@@ -887,7 +888,7 @@
left = block[0];
right = block[1];
- if (encrypt) {
+ if (forward_encrypt) {
keys = &ks->ks[0];
for( round = 0; round < 8; round++ ) {
Modified: trunk/heimdal/lib/des/rc2.c
===================================================================
--- trunk/heimdal/lib/des/rc2.c 2005-06-17 08:25:08 UTC (rev 346)
+++ trunk/heimdal/lib/des/rc2.c 2005-06-18 11:04:54 UTC (rev 347)
@@ -198,12 +198,12 @@
void
RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long size,
- RC2_KEY *key, unsigned char *iv, int encrypt)
+ RC2_KEY *key, unsigned char *iv, int forward_encrypt)
{
unsigned char tmp[RC2_BLOCK_SIZE];
int i;
- if (encrypt) {
+ if (forward_encrypt) {
while (size >= RC2_BLOCK_SIZE) {
for (i = 0; i < RC2_BLOCK_SIZE; i++)
tmp[i] = in[i] ^ iv[i];
More information about the samba-cvs
mailing list