Use distinct context structs and functions for camellia128 and
camellia256.

* camellia.h (struct camellia_ctx): Replaced flag camellia128 by
expanded key length nkeys.

* camellia.c (camellia_set_encrypt_key): Renamed, from...
(camellia_set_key): ... old name.
(camellia_invert_key): New function.
(camellia_set_decrypt_key): New function, using
camellia_invert_key.
(camellia_crypt): Renamed, from...
(camellia_encrypt): ... old name.
(camellia_decrypt): Deleted, no longer needed. camellia_crypt used
for both encryption and decryption.

Rev: nettle/ChangeLog:1.95
Rev: nettle/camellia-meta.c:1.2
Rev: nettle/camellia.c:1.4
Rev: nettle/camellia.h:1.4

camellia-meta.c.
(HEADERS): Added camellia.h.

* camellia-meta.c: New file.

* camellia.h: Rewrote interface to match nettle conventions.

* camellia.c: Converted to nettle conventions.
(camellia_encrypt128, camellia_encrypt256): Unified to new
function...
(camellia_encrypt): ...New function, with a loop doing 6
regular rounds, one FL round and one FLINV round per iteration,
with iteration count depending on the key size.

Rev: nettle/ChangeLog:1.89
Rev: nettle/Makefile.in:1.25
Rev: nettle/camellia-meta.c:1.1
Rev: nettle/camellia.c:1.2
Rev: nettle/camellia.h:1.2

config.h.

Rev: src/nettle/ChangeLog:1.195
Rev: src/nettle/aes-decrypt-table.c:1.4
Rev: src/nettle/aes-decrypt.c:1.5
Rev: src/nettle/aes-encrypt-table.c:1.4
Rev: src/nettle/aes-encrypt.c:1.5
Rev: src/nettle/aes-meta.c:1.3
Rev: src/nettle/aes-set-decrypt-key.c:1.2
Rev: src/nettle/aes-set-encrypt-key.c:1.2
Rev: src/nettle/aes.c:1.12
Rev: src/nettle/aesdata.c:1.2
Rev: src/nettle/arcfour-meta.c:1.2
Rev: src/nettle/arcfour.c:1.3
Rev: src/nettle/base16-decode.c:1.2
Rev: src/nettle/base16-encode.c:1.2
Rev: src/nettle/base16-meta.c:1.3
Rev: src/nettle/base64-decode.c:1.5
Rev: src/nettle/base64-encode.c:1.3
Rev: src/nettle/base64-meta.c:1.4
Rev: src/nettle/bignum-random.c:1.3
Rev: src/nettle/bignum.c:1.7
Rev: src/nettle/blowfish.c:1.4
Rev: src/nettle/buffer-init.c:1.3
Rev: src/nettle/buffer.c:1.8
Rev: src/nettle/cast128-meta.c:1.3
Rev: src/nettle/cast128.c:1.4
Rev: src/nettle/cbc.c:1.6
Rev: src/nettle/des-compat.c:1.10
Rev: src/nettle/des.c:1.7
Rev: src/nettle/des3.c:1.2
Rev: src/nettle/dsa-keygen.c:1.6
Rev: src/nettle/dsa-sign.c:1.7
Rev: src/nettle/dsa-verify.c:1.4
Rev: src/nettle/dsa.c:1.5
Rev: src/nettle/examples/io.c:1.4
Rev: src/nettle/examples/nettle-benchmark.c:1.8
Rev: src/nettle/examples/nettle-openssl.c:1.2
Rev: src/nettle/examples/rsa-keygen.c:1.10
Rev: src/nettle/examples/rsa-sign.c:1.5
Rev: src/nettle/examples/rsa-verify.c:1.4
Rev: src/nettle/hmac-md5.c:1.5
Rev: src/nettle/hmac-sha1.c:1.2
Rev: src/nettle/hmac-sha256.c:1.2
Rev: src/nettle/hmac.c:1.4
Rev: src/nettle/knuth-lfib.c:1.2
Rev: src/nettle/md5-compat.c:1.3
Rev: src/nettle/md5-meta.c:1.2
Rev: src/nettle/md5.c:1.6
Rev: src/nettle/memxor.c:1.2
Rev: src/nettle/nettle-internal.c:1.3
Rev: src/nettle/pgp-encode.c:1.4
Rev: src/nettle/pkcs1-rsa-md5.c:1.2
Rev: src/nettle/pkcs1-rsa-sha1.c:1.2
Rev: src/nettle/pkcs1.c:1.2
Rev: src/nettle/realloc.c:1.3
Rev: src/nettle/rsa-compat.c:1.8
Rev: src/nettle/rsa-decrypt.c:1.4
Rev: src/nettle/rsa-encrypt.c:1.5
Rev: src/nettle/rsa-keygen.c:1.5
Rev: src/nettle/rsa-md5-sign.c:1.2
Rev: src/nettle/rsa-md5-verify.c:1.2
Rev: src/nettle/rsa-sha1-sign.c:1.2
Rev: src/nettle/rsa-sha1-verify.c:1.2
Rev: src/nettle/rsa-sign.c:1.3
Rev: src/nettle/rsa-verify.c:1.2
Rev: src/nettle/rsa.c:1.12
Rev: src/nettle/rsa2openpgp.c:1.2
Rev: src/nettle/rsa2sexp.c:1.7
Rev: src/nettle/serpent-meta.c:1.2
Rev: src/nettle/serpent.c:1.4
Rev: src/nettle/sexp-format.c:1.9
Rev: src/nettle/sexp-transport-format.c:1.2
Rev: src/nettle/sexp-transport.c:1.4
Rev: src/nettle/sexp.c:1.14
Rev: src/nettle/sexp2bignum.c:1.5
Rev: src/nettle/sexp2dsa.c:1.4
Rev: src/nettle/sexp2rsa.c:1.11
Rev: src/nettle/sha1-meta.c:1.2
Rev: src/nettle/sha1.c:1.8
Rev: src/nettle/sha256-meta.c:1.2
Rev: src/nettle/sha256.c:1.3
Rev: src/nettle/tools/input.c:1.2
Rev: src/nettle/tools/misc.c:1.2
Rev: src/nettle/tools/output.c:1.3
Rev: src/nettle/tools/parse.c:1.2
Rev: src/nettle/tools/sexp-conv.c:1.14
Rev: src/nettle/twofish-meta.c:1.2
Rev: src/nettle/twofish.c:1.6
Rev: src/nettle/yarrow256.c:1.17
Rev: src/nettle/yarrow_key_event.c:1.4

* arcfour-meta.c: New file.
* cast128-meta.c: New file.
* serpent-meta.c: New file.
* twofish-meta.c: New file.

Rev: src/nettle/aes-meta.c:1.1
Rev: src/nettle/arcfour-meta.c:1.1
Rev: src/nettle/cast128-meta.c:1.1
Rev: src/nettle/serpent-meta.c:1.1
Rev: src/nettle/twofish-meta.c:1.1

Rev: src/nettle/hmac-md5.c:1.1
Rev: src/nettle/hmac.c:1.1
Rev: src/nettle/hmac.h:1.1
Rev: src/nettle/md5-meta.c:1.1
Rev: src/nettle/nettle-meta.h:1.1
Rev: src/nettle/sha1-meta.c:1.1
Rev: src/nettle/sha256-meta.c:1.1

Rev: src/nettle/md5-compat.c:1.2

1321-style interface.

Rev: src/nettle/md5-compat.c:1.1
Rev: src/nettle/md5-compat.h:1.1

Rev: src/nettle/ChangeLog:1.10
Rev: src/nettle/aes.h:1.4
Rev: src/nettle/arcfour.h:1.3
Rev: src/nettle/blowfish.h:1.7
Rev: src/nettle/cast128.h:1.3
Rev: src/nettle/des.h:1.4
Rev: src/nettle/md5.h:1.3
Rev: src/nettle/memxor.h:1.2
Rev: src/nettle/serpent.h:1.5
Rev: src/nettle/sha1.h:1.3
Rev: src/nettle/twofish.h:1.4

Rev: src/nettle/aes.c:1.3
Rev: src/nettle/aes.h:1.3
Rev: src/nettle/arcfour.c:1.2
Rev: src/nettle/arcfour.h:1.2
Rev: src/nettle/blowfish.h:1.5
Rev: src/nettle/cast128.c:1.2
Rev: src/nettle/cast128.h:1.2
Rev: src/nettle/des.c:1.3
Rev: src/nettle/des.h:1.3
Rev: src/nettle/macros.h:1.3
Rev: src/nettle/md5.c:1.2
Rev: src/nettle/md5.h:1.2
Rev: src/nettle/serpent.h:1.4
Rev: src/nettle/sha1.c:1.3
Rev: src/nettle/sha1.h:1.2
Rev: src/nettle/twofish.c:1.3
Rev: src/nettle/twofish.h:1.3

Rev: src/nettle/.bootstrap:1.1
Rev: src/nettle/.c-style:1.1
Rev: src/nettle/AUTHORS:1.1
Rev: src/nettle/ChangeLog:1.1
Rev: src/nettle/Makefile.am:1.1
Rev: src/nettle/NEWS:1.1
Rev: src/nettle/README:1.1
Rev: src/nettle/aes.c:1.1
Rev: src/nettle/aes.h:1.1
Rev: src/nettle/arcfour.c:1.1
Rev: src/nettle/arcfour.h:1.1
Rev: src/nettle/configure.in:1.1
Rev: src/nettle/macros.h:1.1
Rev: src/nettle/md5.c:1.1
Rev: src/nettle/md5.h:1.1
Rev: src/nettle/memxor.c:1.1
Rev: src/nettle/memxor.h:1.1
Rev: src/nettle/testsuite/.c-style:1.1
Rev: src/nettle/testsuite/Makefile.am:1.1
Rev: src/nettle/testsuite/aes-test.m4:1.1
Rev: src/nettle/testsuite/arcfour-test.m4:1.1
Rev: src/nettle/testsuite/macros.m4:1.1
Rev: src/nettle/testsuite/md5-test.m4:1.1
Rev: src/nettle/testsuite/run-tests:1.1
Rev: src/nettle/testsuite/testutils.c:1.1
Rev: src/nettle/testsuite/testutils.h:1.1