aboutsummaryrefslogtreecommitdiff
path: root/sys/geom/geom_aes.c
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2002-09-28 11:57:20 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2002-09-28 11:57:20 +0000
commit4ae677009edd2ac1517bb8800024fd8157b256e7 (patch)
tree40b1e818a036fa605ff8ea48182d112c3308e3fb /sys/geom/geom_aes.c
parenteadf0ffdce0a6b06da3ad18f4af443e66fd540cc (diff)
downloadsrc-4ae677009edd2ac1517bb8800024fd8157b256e7.tar.gz
src-4ae677009edd2ac1517bb8800024fd8157b256e7.zip
Style, whitespace and lint fixes.
Sponsored by: DARPA & NAI Labs.
Notes
Notes: svn path=/head/; revision=104087
Diffstat (limited to 'sys/geom/geom_aes.c')
-rw-r--r--sys/geom/geom_aes.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c
index ed9e66e82f88..ea11fa63caf9 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -56,9 +56,9 @@
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/libkern.h>
-#include <sys/md5.h>
-#include <sys/endian.h>
#endif
+#include <sys/endian.h>
+#include <sys/md5.h>
#include <sys/errno.h>
#include <geom/geom.h>
@@ -354,7 +354,7 @@ g_aes_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
u_char *p;
p = sc->master_key;
- for (i = 0; i < sizeof sc->master_key; i ++)
+ for (i = 0; i < (int)sizeof sc->master_key; i ++)
*p++ = i;
}
if (sc->keying == KEY_RANDOM) {
@@ -363,7 +363,7 @@ g_aes_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
u_char *p;
p = sc->master_key;
- for (i = 0; i < sizeof sc->master_key; i += sizeof u) {
+ for (i = 0; i < (int)sizeof sc->master_key; i += sizeof u) {
u = arc4random();
*p++ = u;
*p++ = u >> 8;