oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Rename rc2_40_cbc internal variable to something better.

Browse Source 
Unbreak des-ede3-cbc.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16532 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-01-13 08:25:00 +00:00
parent f906d4c919
commit 849dc3cc72
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/des/evp.c
View File

@@ -525,8 +525,7 @@ EVP_rc2_cbc(void)
const EVP_CIPHER * const EVP_CIPHER *
EVP_rc2_40_cbc(void) EVP_rc2_40_cbc(void)
{ {
/* XXX */ static const EVP_CIPHER rc2_40_cbc = {
static const EVP_CIPHER rc2_cbc = {
0, 0,
RC2_BLOCK_SIZE, RC2_BLOCK_SIZE,
5, 5,
@@ -541,7 +540,7 @@ EVP_rc2_40_cbc(void)
NULL, NULL,
NULL NULL
}; };
return &rc2_cbc; return &rc2_40_cbc;
} }
/* /*
@@ -580,9 +579,9 @@ des_ede3_cbc_init(EVP_CIPHER_CTX *ctx,
{ {
struct des_ede3_cbc *k = ctx->cipher_data; struct des_ede3_cbc *k = ctx->cipher_data;
DES_key_sched((DES_cblock *)key, &k->ks[0]); DES_key_sched((DES_cblock *)(key), &k->ks[0]);
DES_key_sched((DES_cblock *)key + 8, &k->ks[1]); DES_key_sched((DES_cblock *)(key + 8), &k->ks[1]);
DES_key_sched((DES_cblock *)key + 16, &k->ks[2]); DES_key_sched((DES_cblock *)(key + 16), &k->ks[2]);
return 1; return 1;
} }