svc/conntrack.in: Maintain config groups in a dictionary.

[tripe] / server / bulkcrypto.c

diff --git a/server/bulkcrypto.c b/server/bulkcrypto.c
index 365aa1760abc7bddb5ee18bcdcb3c31125cb5fbf..7d754cd7accb7d283bf335b66a1faf3ab088b9ca 100644 (file)
--- a/server/bulkcrypto.c
+++ b/server/bulkcrypto.c
@@ -9,19 +9,18 @@
  *
  * This file is part of Trivial IP Encryption (TrIPE).
  *
- * TrIPE is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * TrIPE is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your
+ * option) any later version.
  *
- * TrIPE 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 General Public License for more details.
+ * TrIPE 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 General Public License
+ * for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with TrIPE; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with TrIPE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /*----- Header files ------------------------------------------------------*/
@@ -73,7 +72,7 @@ typedef struct gencomp_algs {
 
 typedef struct gencomp_chal {
   bulkchal _b;
-  gmac *m; size_t tagsz;
+  gmac *m;
 } gencomp_chal;
 
 static int gencomp_getalgs(gencomp_algs *a, const algswitch *asw,
@@ -537,7 +536,8 @@ static void iiv_tracealgs(const bulkalgs *aa)
   const iiv_algs *a = (const iiv_algs *)aa;
 
   gencomp_tracealgs(&a->ga);
-  trace(T_CRYPTO, "crypto: blkc = %.*s", strlen(a->b->name) - 4, a->b->name);
+  trace(T_CRYPTO,
+       "crypto: blkc = %.*s", (int)strlen(a->b->name) - 4, a->b->name);
 }
 #endif
 
@@ -1047,6 +1047,7 @@ static int naclbox_decrypt(bulkctx *bbc, unsigned ty,
 
   poly1305_hash(&poly, ppk, sz);
   poly1305_done(&poly, buf_u);
+  TRACE_MAC(buf_u, POLY1305_TAGSZ);
   if (!ct_memeq(buf_u, pmac, POLY1305_TAGSZ)) {
     TRACE_MACERR(pmac, POLY1305_TAGSZ);
     return (KSERR_DECRYPT);