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

get rid of DES3_CBC_encrypt_ivec, just use zero ivec in

Browse Source 
DES3_CBC_encrypt if passed ivec is NULL


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11341 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-09-03 17:31:12 +00:00
parent 0f97dad9f6
commit 2ccdee74a3
1 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/krb5/crypto.c
View File

@@ -1676,26 +1676,14 @@ DES3_CBC_encrypt(krb5_context context,
size_t len, size_t len,
krb5_boolean encrypt, krb5_boolean encrypt,
int usage, int usage,
void *ignore_ivec) void *ivec)
{ {
des_cblock ivec; des_cblock local_ivec;
des_key_schedule *s = key->schedule->data; des_key_schedule *s = key->schedule->data;
memset(&ivec, 0, sizeof(ivec)); if(ivec == NULL) {
des_ede3_cbc_encrypt(data, data, len, s[0], s[1], s[2], &ivec, encrypt); ivec = &local_ivec;
return 0; memset(local_ivec, 0, sizeof(local_ivec));
} }
static krb5_error_code
DES3_CBC_encrypt_ivec(krb5_context context,
struct key_data *key,
void *data,
size_t len,
krb5_boolean encrypt,
int usage,
void *ivec)
{
des_key_schedule *s = key->schedule->data;
des_ede3_cbc_encrypt(data, data, len, s[0], s[1], s[2], ivec, encrypt); des_ede3_cbc_encrypt(data, data, len, s[0], s[1], s[2], ivec, encrypt);
return 0; return 0;
} }
@@ -2070,17 +2058,6 @@ static struct encryption_type enctype_des3_cbc_none = {
F_PSEUDO, F_PSEUDO,
DES3_CBC_encrypt, DES3_CBC_encrypt,
}; };
static struct encryption_type enctype_des3_cbc_none_ivec = {
ETYPE_DES3_CBC_NONE_IVEC,
"des3-cbc-none-ivec",
8,
0,
&keytype_des3_derived,
&checksum_none,
NULL,
F_PSEUDO,
DES3_CBC_encrypt_ivec,
};
static struct encryption_type *etypes[] = { static struct encryption_type *etypes[] = {
&enctype_null, &enctype_null,
@@ -2094,8 +2071,7 @@ static struct encryption_type *etypes[] = {
&enctype_des_cbc_none, &enctype_des_cbc_none,
&enctype_des_cfb64_none, &enctype_des_cfb64_none,
&enctype_des_pcbc_none, &enctype_des_pcbc_none,
&enctype_des3_cbc_none, &enctype_des3_cbc_none
&enctype_des3_cbc_none_ivec
}; };
static unsigned num_etypes = sizeof(etypes) / sizeof(etypes[0]); static unsigned num_etypes = sizeof(etypes) / sizeof(etypes[0]);