Add entropy source identifiers for random seed calls

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14018 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 1b91275b3a7bdc3894351f56f493e198923d53d2..e27110bb703614ef6c4fd6261004c88da74417e2 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,13 @@
+2001-11-26  Sam Hartman  <hartmans@mit.edu>
+
+       * 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  <hartmans@mit.edu>
 
        * 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 e9b387815edf5d87819de4a4a2035af401fc2253..3c075a301439dc810768da5db2743242f44296c4 100644 (file)
--- 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 6d87c73aecdd86e84cef75012e7a538ef86d00b4..368c0935baf4e500f5f4e93a03bfe4f87c1d222d 100644 (file)
--- 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 7725746c9d28f73bc24e3be6d1258a19102f1fbd..cec4b8385202e77e09c488ea5da87d7c87a50a2b 100644 (file)
--- 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 0cf0aa6545f36df61c83e7fd9051d623c5bbf110..6e8ded8369217071580cfb531a63f73b5533d374 100644 (file)
--- 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);
            }
        }