Replace camel case of internal scrypt functions.

* cipher/scrypt.c (_salsa20_core): Rename to salsa20_core.  Change
callers.
(_scryptBlockMix): Rename to scrypt_block_mix.  Change callers.
(_scryptROMix): Rename to scrypt_ro_mix. Change callers.
--

Signed-off-by: Werner Koch <wk@gnupg.org>

1 files changed, 11 insertions, 8 deletions

diff --git a/cipher/scrypt.c b/cipher/scrypt.c
index aca903d4..3c21c2af 100644
--- a/cipher/scrypt.c
+++ b/cipher/scrypt.c
@@ -76,7 +76,7 @@
 
 
 static void
-_salsa20_core(u32 *dst, const u32 *src, unsigned rounds)
+salsa20_core (u32 *dst, const u32 *src, unsigned int rounds)
 {
   u32 x[SALSA20_INPUT_LENGTH];
   unsigned i;
@@ -108,7 +108,7 @@ _salsa20_core(u32 *dst, const u32 *src, unsigned rounds)
 
 
 static void
-_scryptBlockMix (u32 r, unsigned char *B, unsigned char *tmp2)
+scrypt_block_mix (u32 r, unsigned char *B, unsigned char *tmp2)
 {
   u64 i;
   unsigned char *X = tmp2;
@@ -142,7 +142,7 @@ _scryptBlockMix (u32 r, unsigned char *B, unsigned char *tmp2)
       buf_xor(X, X, &B[i * 64], 64);
 
       /* X = Salsa (T) */
-      _salsa20_core ((u32*)(void*)X, (u32*)(void*)X, 8);
+      salsa20_core ((u32*)(void*)X, (u32*)(void*)X, 8);
 
       /* Y[i] = X */
       memcpy (&Y[i * 64], X, 64);
@@ -173,8 +173,9 @@ _scryptBlockMix (u32 r, unsigned char *B, unsigned char *tmp2)
 #endif
 }
 
+
 static void
-_scryptROMix (u32 r, unsigned char *B, u64 N,
+scrypt_ro_mix (u32 r, unsigned char *B, u64 N,
 	      unsigned char *tmp1, unsigned char *tmp2)
 {
   unsigned char *X = B, *T = B;
@@ -201,7 +202,7 @@ _scryptROMix (u32 r, unsigned char *B, u64 N,
       memcpy (&tmp1[i * 128 * r], X, 128 * r);
 
       /* X =  ScryptBlockMix (X) */
-      _scryptBlockMix (r, X, tmp2);
+      scrypt_block_mix (r, X, tmp2);
     }
 
   /* for i = 0 to N - 1 do */
@@ -216,7 +217,7 @@ _scryptROMix (u32 r, unsigned char *B, u64 N,
       buf_xor (T, T, &tmp1[j * 128 * r], 128 * r);
 
       /* X = scryptBlockMix (T) */
-      _scryptBlockMix (r, T, tmp2);
+      scrypt_block_mix (r, T, tmp2);
     }
 
 #if 0
@@ -234,7 +235,9 @@ _scryptROMix (u32 r, unsigned char *B, u64 N,
 #endif
 }
 
-/**
+
+/*
+ *
  */
 gcry_err_code_t
 _gcry_kdf_scrypt (const unsigned char *passwd, size_t passwdlen,
@@ -306,7 +309,7 @@ _gcry_kdf_scrypt (const unsigned char *passwd, size_t passwdlen,
                         1 /* iterations */, p * r128, B);
 
   for (i = 0; !ec && i < p; i++)
-    _scryptROMix (r, &B[i * r128], N, tmp1, tmp2);
+    scrypt_ro_mix (r, &B[i * r128], N, tmp1, tmp2);
 
   for (i = 0; !ec && i < p; i++)
     ec = _gcry_kdf_pkdf2 (passwd, passwdlen, GCRY_MD_SHA256, B, p * r128,