summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5/krb/gen_seqnum.c
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2007-03-25 23:09:48 +0000
committerKen Raeburn <raeburn@mit.edu>2007-03-25 23:09:48 +0000
commitc978ebd447e168fdd9f617f6ffa460d736e6963b (patch)
tree92b01f85e9effc52bdd5eeed6d0d6422051a67a7 /src/lib/krb5/krb/gen_seqnum.c
parent63e2917b180feb71ab9af60dfc04141e9b523ec1 (diff)
downloadkrb5-c978ebd447e168fdd9f617f6ffa460d736e6963b.tar.gz
krb5-c978ebd447e168fdd9f617f6ffa460d736e6963b.tar.xz
krb5-c978ebd447e168fdd9f617f6ffa460d736e6963b.zip
Convert keyblock or padata types to krb5_data without compiler warnings.
(Added inline functions, with appropriate casts, for data conversion.) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19280 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/krb/gen_seqnum.c')
-rw-r--r--src/lib/krb5/krb/gen_seqnum.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/krb5/krb/gen_seqnum.c b/src/lib/krb5/krb/gen_seqnum.c
index 3737640977..06564ee4a1 100644
--- a/src/lib/krb5/krb/gen_seqnum.c
+++ b/src/lib/krb5/krb/gen_seqnum.c
@@ -35,14 +35,23 @@
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
+static inline krb5_data
+key2data (krb5_keyblock k)
+{
+ krb5_data d;
+ d.magic = KV5M_DATA;
+ d.length = k.length;
+ d.data = (char *) k.contents;
+ return d;
+}
+
krb5_error_code
krb5_generate_seq_number(krb5_context context, const krb5_keyblock *key, krb5_ui_4 *seqno)
{
krb5_data seed;
krb5_error_code retval;
- seed.length = key->length;
- seed.data = key->contents;
+ seed = key2data(*key);
if ((retval = krb5_c_random_add_entropy(context, KRB5_C_RANDSOURCE_TRUSTEDPARTY, &seed)))
return(retval);