summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>2002-01-08 17:42:31 +0000
committerSam Hartman <hartmans@mit.edu>2002-01-08 17:42:31 +0000
commit436ffb7faf45b3a8da6af57b96610b42c1da2e10 (patch)
tree52373a4203efc7c156a90cc48a3a5d402918af9c
parent9a5a0e37097561741190e83d176053fe3be829a9 (diff)
downloadkrb5-436ffb7faf45b3a8da6af57b96610b42c1da2e10.tar.gz
krb5-436ffb7faf45b3a8da6af57b96610b42c1da2e10.tar.xz
krb5-436ffb7faf45b3a8da6af57b96610b42c1da2e10.zip
Assign entropy source identifier
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14088 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/krb5/krb/ChangeLog2
-rw-r--r--src/lib/krb5/krb/gen_subkey.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 367c173ef0..c999bfaba4 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,5 +1,7 @@
2002-01-08 Sam Hartman <hartmans@mit.edu>
+ * gen_subkey.c (krb5_generate_subkey): Label entropy sources
+
* init_ctx.c (init_common): Use /dev/urandom if present for random data
2001-12-05 Ezra Peisach <epeisach@mit.edu>
diff --git a/src/lib/krb5/krb/gen_subkey.c b/src/lib/krb5/krb/gen_subkey.c
index 41b8dd3a9e..6144e34631 100644
--- a/src/lib/krb5/krb/gen_subkey.c
+++ b/src/lib/krb5/krb/gen_subkey.c
@@ -1,7 +1,7 @@
/*
* lib/krb5/krb/gen_subkey.c
*
- * Copyright 1991 by the Massachusetts Institute of Technology.
+ * Copyright 1991, 2002 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
* Export of this software from the United States of America may
@@ -40,7 +40,7 @@ krb5_generate_subkey(context, key, subkey)
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);
if ((*subkey = (krb5_keyblock *) malloc(sizeof(krb5_keyblock))) == NULL)