diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | aes-decrypt.c | 2 | ||||
-rw-r--r-- | aes-encrypt.c | 2 | ||||
-rw-r--r-- | aes.h | 4 | ||||
-rw-r--r-- | blowfish.c | 8 | ||||
-rw-r--r-- | blowfish.h | 4 | ||||
-rw-r--r-- | cast128.c | 4 | ||||
-rw-r--r-- | cast128.h | 4 | ||||
-rw-r--r-- | serpent.c | 4 | ||||
-rw-r--r-- | serpent.h | 4 | ||||
-rw-r--r-- | twofish.c | 12 | ||||
-rw-r--r-- | twofish.h | 4 |
12 files changed, 33 insertions, 26 deletions
@@ -1,5 +1,12 @@ 2010-07-07 Niels Möller <nisse@lysator.liu.se> + * aes.h (aes_encrypt, aes_decrypt): Declare ctx argument as const. + Also updated implementation. + * blowfish.h (blowfish_encrypt, blowfish_decrypt): Likewise. + * cast128.h (cast128_encrypt, cast128_decrypt): Likewise. + * serpent.h (serpent_encrypt, serpent_decrypt): Likewise. + * twofish.h (twofish_encrypt, twofish_decrypt): Likewise. + * testsuite/Makefile.in (TS_NETTLE_SOURCES): Added camellia-test.c. diff --git a/aes-decrypt.c b/aes-decrypt.c index afbf827b..39b79c69 100644 --- a/aes-decrypt.c +++ b/aes-decrypt.c @@ -337,7 +337,7 @@ _aes_decrypt_table = }; void -aes_decrypt(struct aes_ctx *ctx, +aes_decrypt(const struct aes_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src) { diff --git a/aes-encrypt.c b/aes-encrypt.c index 5112e171..19fe0717 100644 --- a/aes-encrypt.c +++ b/aes-encrypt.c @@ -35,7 +35,7 @@ implementations of _nettle_aes_encrypt to get the table pointer. For PIC code, the details can be complex and system dependent. */ void -aes_encrypt(struct aes_ctx *ctx, +aes_encrypt(const struct aes_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src) { @@ -61,11 +61,11 @@ aes_set_decrypt_key(struct aes_ctx *ctx, unsigned length, const uint8_t *key); void -aes_encrypt(struct aes_ctx *ctx, +aes_encrypt(const struct aes_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src); void -aes_decrypt(struct aes_ctx *ctx, +aes_decrypt(const struct aes_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src); @@ -245,7 +245,7 @@ initial_ctx = #define R(c, l, r, i) do { l ^= c->p[i]; r ^= F(c, l); } while(0) static void -encrypt(struct blowfish_ctx *bc, uint32_t *ret_xl, uint32_t *ret_xr) +encrypt(const struct blowfish_ctx *bc, uint32_t *ret_xl, uint32_t *ret_xr) { uint32_t xl, xr; @@ -276,7 +276,7 @@ encrypt(struct blowfish_ctx *bc, uint32_t *ret_xl, uint32_t *ret_xr) } static void -decrypt(struct blowfish_ctx *bc, uint32_t *ret_xl, uint32_t *ret_xr ) +decrypt(const struct blowfish_ctx *bc, uint32_t *ret_xl, uint32_t *ret_xr ) { uint32_t xl, xr; @@ -311,7 +311,7 @@ decrypt(struct blowfish_ctx *bc, uint32_t *ret_xl, uint32_t *ret_xr ) #undef R void -blowfish_encrypt(struct blowfish_ctx *bc, unsigned length, +blowfish_encrypt(const struct blowfish_ctx *bc, unsigned length, uint8_t *outbuf, const uint8_t *inbuf) { uint32_t d1, d2; @@ -330,7 +330,7 @@ blowfish_encrypt(struct blowfish_ctx *bc, unsigned length, void -blowfish_decrypt(struct blowfish_ctx *bc, unsigned length, +blowfish_decrypt(const struct blowfish_ctx *bc, unsigned length, uint8_t *outbuf, const uint8_t *inbuf ) { uint32_t d1, d2; @@ -61,11 +61,11 @@ blowfish_set_key(struct blowfish_ctx *ctx, unsigned length, const uint8_t *key); void -blowfish_encrypt(struct blowfish_ctx *ctx, +blowfish_encrypt(const struct blowfish_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src); void -blowfish_decrypt(struct blowfish_ctx *ctx, +blowfish_decrypt(const struct blowfish_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src); @@ -71,7 +71,7 @@ /***** Encryption Function *****/ void -cast128_encrypt(struct cast128_ctx *ctx, +cast128_encrypt(const struct cast128_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src) { @@ -115,7 +115,7 @@ cast128_encrypt(struct cast128_ctx *ctx, /***** Decryption Function *****/ void -cast128_decrypt(struct cast128_ctx *ctx, +cast128_decrypt(const struct cast128_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src) { @@ -62,11 +62,11 @@ cast128_set_key(struct cast128_ctx *ctx, unsigned length, const uint8_t *key); void -cast128_encrypt(struct cast128_ctx *ctx, +cast128_encrypt(const struct cast128_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src); void -cast128_decrypt(struct cast128_ctx *ctx, +cast128_decrypt(const struct cast128_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src); @@ -124,7 +124,7 @@ serpent_set_key(struct serpent_ctx *ctx, } void -serpent_encrypt(struct serpent_ctx *ctx, +serpent_encrypt(const struct serpent_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *plain) { @@ -249,7 +249,7 @@ serpent_encrypt(struct serpent_ctx *ctx, } void -serpent_decrypt(struct serpent_ctx *ctx, +serpent_decrypt(const struct serpent_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *cipher) { @@ -66,11 +66,11 @@ serpent_set_key(struct serpent_ctx *ctx, unsigned length, const uint8_t *key); void -serpent_encrypt(struct serpent_ctx *ctx, +serpent_encrypt(const struct serpent_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src); void -serpent_decrypt(struct serpent_ctx *ctx, +serpent_decrypt(const struct serpent_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src); @@ -333,13 +333,13 @@ twofish_set_key(struct twofish_ctx *context, */ void -twofish_encrypt(struct twofish_ctx *context, +twofish_encrypt(const struct twofish_ctx *context, unsigned length, uint8_t *ciphertext, const uint8_t *plaintext) { - uint32_t * keys = context->keys; - uint32_t (*s_box)[256] = context->s_box; + const uint32_t * keys = context->keys; + const uint32_t (*s_box)[256] = context->s_box; assert( !(length % TWOFISH_BLOCK_SIZE) ); for ( ; length; length -= TWOFISH_BLOCK_SIZE) @@ -403,14 +403,14 @@ twofish_encrypt(struct twofish_ctx *context, */ void -twofish_decrypt(struct twofish_ctx *context, +twofish_decrypt(const struct twofish_ctx *context, unsigned length, uint8_t *plaintext, const uint8_t *ciphertext) { - uint32_t *keys = context->keys; - uint32_t (*s_box)[256] = context->s_box; + const uint32_t *keys = context->keys; + const uint32_t (*s_box)[256] = context->s_box; assert( !(length % TWOFISH_BLOCK_SIZE) ); for ( ; length; length -= TWOFISH_BLOCK_SIZE) @@ -63,11 +63,11 @@ twofish_set_key(struct twofish_ctx *ctx, unsigned length, const uint8_t *key); void -twofish_encrypt(struct twofish_ctx *ctx, +twofish_encrypt(const struct twofish_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src); void -twofish_decrypt(struct twofish_ctx *ctx, +twofish_decrypt(const struct twofish_ctx *ctx, unsigned length, uint8_t *dst, const uint8_t *src); |