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

add some more pseudo crypto types

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8544 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-07-05 13:06:08 +00:00
parent 881b556392
commit cec6004120
1 changed files with 112 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
lib/krb5/crypto.c
View File

@@ -1438,6 +1438,33 @@ DES3_CBC_encrypt(struct key_data *key,
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);
} }
static void
DES_CFB64_encrypt_null_ivec(struct key_data *key,
void *data,
size_t len,
krb5_boolean encrypt)
{
des_cblock ivec;
int num = 0;
des_key_schedule *s = key->schedule->data;
memset(&ivec, 0, sizeof(ivec));
des_cfb64_encrypt(data, data, len, *s, &ivec, &num, encrypt);
}
static void
DES_PCBC_encrypt_key_ivec(struct key_data *key,
void *data,
size_t len,
krb5_boolean encrypt)
{
des_cblock ivec;
des_key_schedule *s = key->schedule->data;
memcpy(&ivec, key->key->keyvalue.data, sizeof(ivec));
des_pcbc_encrypt(data, data, len, *s, &ivec, encrypt);
}
static void static void
ARCFOUR_encrypt(struct key_data *key, ARCFOUR_encrypt(struct key_data *key,
void *data, void *data,
@@ -1540,6 +1567,28 @@ static struct encryption_type etypes[] = {
F_PSEUDO, F_PSEUDO,
DES_CBC_encrypt_null_ivec, DES_CBC_encrypt_null_ivec,
}, },
{
ETYPE_DES_CFB64_NONE,
"des-cfb64-none",
1,
0,
&keytype_des,
&checksum_none,
NULL,
F_PSEUDO,
DES_CFB64_encrypt_null_ivec,
},
{
ETYPE_DES_PCBC_NONE,
"des-pcbc-none",
8,
0,
&keytype_des,
&checksum_none,
NULL,
F_PSEUDO,
DES_PCBC_encrypt_key_ivec,
},
{ {
ETYPE_DES3_CBC_NONE, ETYPE_DES3_CBC_NONE,
"des3-cbc-none", "des3-cbc-none",
@@ -2106,6 +2155,7 @@ derive_key(krb5_context context,
(*et->encrypt)(key, k + i * et->blocksize, et->blocksize, 1); (*et->encrypt)(key, k + i * et->blocksize, et->blocksize, 1);
} }
} else { } else {
/* this case is probably broken, but won't be run anyway */
void *c = malloc(len); void *c = malloc(len);
size_t res_len = (kt->bits + 7) / 8; size_t res_len = (kt->bits + 7) / 8;
@@ -2345,3 +2395,64 @@ krb5_crypto_debug(krb5_context context,
} }
#endif /* CRYPTO_DEBUG */ #endif /* CRYPTO_DEBUG */
#if 0
int
main()
{
#if 0
int i;
krb5_context context;
krb5_crypto crypto;
struct key_data *d;
krb5_keyblock key;
char constant[4];
unsigned usage = ENCRYPTION_USAGE(3);
krb5_init_context(&context);
key.keytype = ETYPE_NEW_DES3_CBC_SHA1;
key.keyvalue.data = "\xb3\x85\x58\x94\xd9\xdc\x7c\xc8"
"\x25\xe9\x85\xab\x3e\xb5\xfb\x0e"
"\xc8\xdf\xab\x26\x86\x64\x15\x25";
key.keyvalue.length = 24;
krb5_crypto_init(context, &key, 0, &crypto);
d = _new_derived_key(crypto, usage);
if(d == NULL)
return ENOMEM;
krb5_copy_keyblock(context, crypto->key.key, &d->key);
_krb5_put_int(constant, usage, 4);
derive_key(context, crypto->et, d, constant, sizeof(constant));
return 0;
#else
int i;
krb5_context context;
krb5_crypto crypto;
struct key_data *d;
krb5_keyblock key;
Checksum res;
char *data = "what do ya want for nothing?";
krb5_init_context(&context);
key.keytype = ETYPE_NEW_DES3_CBC_SHA1;
key.keyvalue.data = "Jefe";
/* "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
"\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"; */
key.keyvalue.length = 4;
d = calloc(1, sizeof(*d));
d->key = &key;
res.checksum.length = 20;
res.checksum.data = malloc(res.checksum.length);
HMAC_SHA1_DES3_checksum(context, d, data, 28, &res);
return 0;
#endif
}
#endif