From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 22 Oct 2013 05:42:44 +0000 (+0200)
Subject: Added underscore to camellia gcm context.
X-Git-Tag: gnutls_3_2_5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc5103b0e36ebbd4423ba843117349d4e6e44479;p=thirdparty%2Fgnutls.git

Added underscore to camellia gcm context.
---

diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c
index e0629e8af6..9522059186 100644
--- 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 6b7cc8e2df..45d31fea6d 100644
--- 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 cfd359b1fb..415562131d 100644
--- 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);