From b0f56bf7fa6224dc0d34abf039204e2b2e5b9750 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Mon, 26 Nov 2001 20:37:46 +0000 Subject: Add entropy source identifiers for random seed calls git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14018 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/ChangeLog | 10 ++++++++++ src/lib/krb5/krb/gen_seqnum.c | 2 +- src/lib/krb5/krb/init_ctx.c | 2 +- src/lib/krb5/krb/mk_req_ext.c | 2 +- src/lib/krb5/krb/sendauth.c | 4 ++-- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 1b91275..e27110b 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,13 @@ +2001-11-26 Sam Hartman + + * gen_seqnum.c (krb5_generate_seq_number): add entropy source id + + * sendauth.c (krb5_sendauth): Add entropy source ID + + * mk_req_ext.c (krb5_mk_req_extended): Add entropy source ID to random seed call + + * init_ctx.c (init_common): Specify entropy source for random seed + 2001-11-16 Sam Hartman * init_ctx.c (krb5_set_default_tgs_enctypes): rename from diff --git a/src/lib/krb5/krb/gen_seqnum.c b/src/lib/krb5/krb/gen_seqnum.c index e9b3878..3c075a3 100644 --- a/src/lib/krb5/krb/gen_seqnum.c +++ b/src/lib/krb5/krb/gen_seqnum.c @@ -46,7 +46,7 @@ krb5_generate_seq_number(context, key, seqno) seed.length = key->length; seed.data = key->contents; - if ((retval = krb5_c_random_seed(context, &seed))) + if ((retval = krb5_c_random_add_entropy(context, KRB5_C_RANDSOURCE_TRUSTEDPARTY, &seed))) return(retval); seed.length = sizeof(*seqno); diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index 6d87c73..368c093 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -155,7 +155,7 @@ init_common (context, secure) seed_data.pid = getpid (); seed.length = sizeof(seed_data); seed.data = (char *) &seed_data; - if ((retval = krb5_c_random_seed(ctx, &seed))) + if ((retval = krb5_c_random_add_entropy(ctx, KRB5_C_RANDSOURCE_TIMING, &seed))) goto cleanup; ctx->default_realm = 0; diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c index 7725746..cec4b83 100644 --- a/src/lib/krb5/krb/mk_req_ext.c +++ b/src/lib/krb5/krb/mk_req_ext.c @@ -138,7 +138,7 @@ krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds, krb5_crypto_us_timeofday (&rnd_data.sec, &rnd_data.usec); d.length = sizeof (rnd_data); d.data = (char *) &rnd_data; - (void) krb5_c_random_seed (context, &d); + (void) krb5_c_random_add_entropy (context, KRB5_C_RANDSOURCE_TIMING, &d); if ((retval = krb5_generate_subkey(context, &(in_creds)->keyblock, &(*auth_context)->local_subkey))) diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c index 0cf0aa6..6e8ded8 100644 --- a/src/lib/krb5/krb/sendauth.c +++ b/src/lib/krb5/krb/sendauth.c @@ -179,13 +179,13 @@ krb5_sendauth(context, auth_context, if (getpeername (*(int*)fd, (GETPEERNAME_ARG2_TYPE *) rnd_data, &len2) == 0) { d.length = len2; - (void) krb5_c_random_seed (context, &d); + (void) krb5_c_random_add_entropy (context, KRB5_C_RANDSOURCE_EXTERNAL_PROTOCOL, &d); } len2 = sizeof (rnd_data); if (getsockname (*(int*)fd, (GETSOCKNAME_ARG2_TYPE *) rnd_data, &len2) == 0) { d.length = len2; - (void) krb5_c_random_seed (context, &d); + (void) krb5_c_random_add_entropy (context, KRB5_C_RANDSOURCE_EXTERNAL_PROTOCOL, &d); } } -- cgit v1.1