symm/{chacha,salsa20}.[ch]: Compress systematic naming better in comments.

[catacomb] / symm / salsa20.h

diff --git a/symm/salsa20.h b/symm/salsa20.h
index 4a0d1eb..7b2d00b 100644 (file)
--- a/symm/salsa20.h
+++ b/symm/salsa20.h
@@ -5,6 +5,26 @@
  * (c) 2015 Straylight/Edgeware
  */
 
+/*----- Licensing notice --------------------------------------------------*
+ *
+ * This file is part of Catacomb.
+ *
+ * Catacomb is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Catacomb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with Catacomb; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
 #ifndef CATACOMB_SALSA20_H
 #define CATACOMB_SALSA20_H
 
@@ -85,7 +105,7 @@ extern void salsa20_init(salsa20_ctx */*ctx*/,
 
 extern void salsa20_setnonce(salsa20_ctx */*ctx*/, const void */*nonce*/);
 
-/* --- @salsa20_seek@, @salsa20_seeku64@ --- *
+/* --- @salsa20_seek{,u64}@ --- *
  *
  * Arguments:  @salsa20_ctx *ctx@ = pointer to context
  *             @unsigned long i@, @kludge64 i@ = new position to set
@@ -101,7 +121,7 @@ extern void salsa20_setnonce(salsa20_ctx */*ctx*/, const void */*nonce*/);
 extern void salsa20_seek(salsa20_ctx */*ctx*/, unsigned long /*i*/);
 extern void salsa20_seeku64(salsa20_ctx */*ctx*/, kludge64 /*i*/);
 
-/* --- @salsa20_tell@, @salsa20_tellu64@ --- *
+/* --- @salsa20_tell{,u64}@ --- *
  *
  * Arguments:  @salsa20_ctx *ctx@ = pointer to context
  *
@@ -209,7 +229,7 @@ extern void xsalsa2012_setnonce(xsalsa2012_ctx */*ctx*/,
 extern void xsalsa208_setnonce(xsalsa208_ctx */*ctx*/,
                               const void */*nonce*/);
 
-/* --- @xsalsa20{,12,8}_seek@, @xsalsa20{,12,8}_seeku64@ --- *
+/* --- @xsalsa20{,12,8}_seek{,u64}@ --- *
  *
  * Arguments:  @xsalsa20R_ctx *ctx@ = pointer to context
  *             @unsigned long i@, @kludge64 i@ = new position to set
@@ -233,7 +253,7 @@ extern void xsalsa20_seeku64(xsalsa20_ctx */*ctx*/, kludge64 /*i*/);
 extern void xsalsa2012_seeku64(xsalsa2012_ctx */*ctx*/, kludge64 /*i*/);
 extern void xsalsa208_seeku64(xsalsa208_ctx */*ctx*/, kludge64 /*i*/);
 
-/* --- @xsalsa20{,12,8}_tell@, @xsalsa20{,12,8}_tellu64@ --- *
+/* --- @xsalsa20{,12,8}_tell{,u64}@ --- *
  *
  * Arguments:  @salsa20_ctx *ctx@ = pointer to context
  *