From bdbc25951c3f5b2f1623c859b1c2c314dde5f8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Groenvall?= Date: Wed, 21 Feb 1996 10:45:37 +0000 Subject: [PATCH] cleanup git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@272 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/des/rnd_keys.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/des/rnd_keys.c b/lib/des/rnd_keys.c index 64ea7d167..e4dca5bca 100644 --- a/lib/des/rnd_keys.c +++ b/lib/des/rnd_keys.c @@ -14,6 +14,25 @@ RCSID("$Id$"); #include #include +/* this is for broken Solaris */ +#ifndef HAVE_GETHOSTID + +#include + +static long gethostid(void) +{ + static int flag=0; + static long hostid; + if(!flag){ + char s[32]; + sysinfo(SI_HW_SERIAL, s, 32); + sscanf(s, "%u", &hostid); + flag=1; + } + return hostid; +} +#endif + /* * Create a sequence of random 64 bit blocks. * The sequence is indexed with a long long and @@ -75,25 +94,6 @@ des_new_random_key(des_cblock *key) return(0); } -/* this is for broken Solaris */ -#ifndef HAVE_GETHOSTID - -#include - -static long gethostid(void) -{ - static int flag=0; - static long hostid; - if(!flag){ - char s[32]; - sysinfo(SI_HW_SERIAL, s, 32); - sscanf(s, "%u", &hostid); - flag=1; - } - return hostid; -} -#endif - /* * des_init_random_number_generator: * @@ -141,7 +141,7 @@ des_init_random_number_generator(des_cblock *seed) des_set_random_generator_seed(&new_key); } -/* This is for backwards compatibility */ +/* This is for backwards compatibility. */ int des_random_key(unsigned char *ret) {