Deleted Added
full compact
2c2
< * Copyright (c) 2000-2004 Mark R V Murray
---
> * Copyright (c) 2000-2013 Mark R V Murray
29c29
< __FBSDID("$FreeBSD: head/sys/dev/random/hash.c 143418 2005-03-11 15:42:51Z ume $");
---
> __FBSDID("$FreeBSD: head/sys/dev/random/hash.c 255362 2013-09-07 14:15:13Z markm $");
39c39
< /* initialise the hash */
---
> /* Initialise the hash */
41c41
< yarrow_hash_init(struct yarrowhash *context)
---
> randomdev_hash_init(struct randomdev_hash *context)
46c46
< /* iterate the hash */
---
> /* Iterate the hash */
48c48
< yarrow_hash_iterate(struct yarrowhash *context, void *data, size_t size)
---
> randomdev_hash_iterate(struct randomdev_hash *context, void *data, size_t size)
53c53
< /* Conclude by returning the hash in the supplied /buf/ which must be
---
> /* Conclude by returning the hash in the supplied <*buf> which must be
57c57
< yarrow_hash_finish(struct yarrowhash *context, void *buf)
---
> randomdev_hash_finish(struct randomdev_hash *context, void *buf)
63,64c63,64
< * from the supplied /data/ which must be KEYSIZE bytes of binary
< * data.
---
> * from the supplied <*data> which must be KEYSIZE bytes of binary
> * data. Use CBC mode for better avalanche.
67c67
< yarrow_encrypt_init(struct yarrowkey *context, void *data)
---
> randomdev_encrypt_init(struct randomdev_key *context, void *data)
74c74,75
< * KEYSIZE bytes are encrypted from /d_in/ to /d_out/.
---
> * <length> bytes are encrypted from <*d_in> to <*d_out>. <length> must be
> * a multiple of BLOCKSIZE.
77c78
< yarrow_encrypt(struct yarrowkey *context, void *d_in, void *d_out)
---
> randomdev_encrypt(struct randomdev_key *context, void *d_in, void *d_out, unsigned length)
79,80c80
< rijndael_blockEncrypt(&context->cipher, &context->key, d_in,
< KEYSIZE*8, d_out);
---
> rijndael_blockEncrypt(&context->cipher, &context->key, d_in, length*8, d_out);