Added underscore to camellia gcm context.

diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c
index e0629e8af6840422043bb4ff32b587cad32ba992..95220591868a70eda44f34c1bc72bfe22475c73a 100644 (file)
--- a/lib/nettle/cipher.c
+++ b/lib/nettle/cipher.c
@@ -71,7 +71,7 @@ struct nettle_cipher_ctx
     struct des3_ctx des3;
     struct des_ctx des;
     struct gcm_aes_ctx aes_gcm;
-    struct gcm_camellia_ctx camellia_gcm;
+    struct _gcm_camellia_ctx camellia_gcm;
     struct salsa20_ctx salsa20;
   } ctx;
   void *ctx_ptr;

diff --git a/lib/nettle/gcm-camellia.c b/lib/nettle/gcm-camellia.c
index 6b7cc8e2dfa000ffa3693df2fbca57a48967d63a..45d31fea6d31624faff596d31c41b17427169c9c 100644 (file)
--- a/lib/nettle/gcm-camellia.c
+++ b/lib/nettle/gcm-camellia.c
@@ -20,7 +20,7 @@
  *
  */
 
-/* gcm_aes.c
+/* gcm_camellia.c
  *
  * Galois counter mode using Camellia as the underlying cipher.
  */
@@ -34,40 +34,40 @@
 #include <gcm-camellia.h>
 
 void
-_gcm_camellia_set_key(struct gcm_camellia_ctx *ctx, unsigned length, const uint8_t *key)
+_gcm_camellia_set_key(struct _gcm_camellia_ctx *ctx, unsigned length, const uint8_t *key)
 {
   GCM_SET_KEY(ctx, camellia_set_encrypt_key, camellia_crypt, length, key);
 }
 
 void
-_gcm_camellia_set_iv(struct gcm_camellia_ctx *ctx,
+_gcm_camellia_set_iv(struct _gcm_camellia_ctx *ctx,
               unsigned length, const uint8_t *iv)
 {
   GCM_SET_IV(ctx, length, iv);
 }
 
 void
-_gcm_camellia_update(struct gcm_camellia_ctx *ctx, unsigned length, const uint8_t *data)
+_gcm_camellia_update(struct _gcm_camellia_ctx *ctx, unsigned length, const uint8_t *data)
 {
   GCM_UPDATE(ctx, length, data);
 }
 
 void
-_gcm_camellia_encrypt(struct gcm_camellia_ctx *ctx,
+_gcm_camellia_encrypt(struct _gcm_camellia_ctx *ctx,
                unsigned length, uint8_t *dst, const uint8_t *src)
 {
   GCM_ENCRYPT(ctx, camellia_crypt, length, dst, src);
 }
 
 void
-_gcm_camellia_decrypt(struct gcm_camellia_ctx *ctx,
+_gcm_camellia_decrypt(struct _gcm_camellia_ctx *ctx,
                unsigned length, uint8_t *dst, const uint8_t *src)
 {
   GCM_DECRYPT(ctx, camellia_crypt, length, dst, src);
 }
 
 void
-_gcm_camellia_digest(struct gcm_camellia_ctx *ctx,
+_gcm_camellia_digest(struct _gcm_camellia_ctx *ctx,
               unsigned length, uint8_t *digest)
 {
   GCM_DIGEST(ctx, camellia_crypt, length, digest);

diff --git a/lib/nettle/gcm-camellia.h b/lib/nettle/gcm-camellia.h
index cfd359b1fb8919acc80bb21de37f3bc2898439d8..415562131d1000d0ea0814c25631398c53ca6cac 100644 (file)
--- a/lib/nettle/gcm-camellia.h
+++ b/lib/nettle/gcm-camellia.h
@@ -22,15 +22,15 @@
 
 #include <nettle/camellia.h>
 
-struct gcm_camellia_ctx GCM_CTX(struct camellia_ctx);
+struct _gcm_camellia_ctx GCM_CTX(struct camellia_ctx);
 
-void _gcm_camellia_set_key(struct gcm_camellia_ctx *ctx, unsigned length, const uint8_t *key);
-void _gcm_camellia_set_iv(struct gcm_camellia_ctx *ctx,
+void _gcm_camellia_set_key(struct _gcm_camellia_ctx *ctx, unsigned length, const uint8_t *key);
+void _gcm_camellia_set_iv(struct _gcm_camellia_ctx *ctx,
               unsigned length, const uint8_t *iv);
-void _gcm_camellia_update(struct gcm_camellia_ctx *ctx, unsigned length, const uint8_t *data);
-void _gcm_camellia_encrypt(struct gcm_camellia_ctx *ctx,
+void _gcm_camellia_update(struct _gcm_camellia_ctx *ctx, unsigned length, const uint8_t *data);
+void _gcm_camellia_encrypt(struct _gcm_camellia_ctx *ctx,
                unsigned length, uint8_t *dst, const uint8_t *src);
-void _gcm_camellia_decrypt(struct gcm_camellia_ctx *ctx,
+void _gcm_camellia_decrypt(struct _gcm_camellia_ctx *ctx,
                unsigned length, uint8_t *dst, const uint8_t *src);
-void _gcm_camellia_digest(struct gcm_camellia_ctx *ctx,
+void _gcm_camellia_digest(struct _gcm_camellia_ctx *ctx,
               unsigned length, uint8_t *digest);