X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/de8edc7fdb0a26ca9cb736a49b020a64ee4a0d40..e713954af6c6dd7c05877b9002247c4cbd336b31:/server/bulkcrypto.c

diff --git a/server/bulkcrypto.c b/server/bulkcrypto.c
index 0e02f747..0f6c6562 100644
--- 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 ------------------------------------------------------*/
@@ -98,7 +97,7 @@ static int gencomp_getalgs(gencomp_algs *a, const algswitch *asw,
   if ((p = key_getattr(kf, k, "mac")) != 0) {
     dstr_reset(&d);
     dstr_puts(&d, p);
-    if ((q = strchr(d.buf, '/')) != 0)
+    if ((q = strrchr(d.buf, '/')) != 0)
       *q++ = 0;
     if ((a->m = gmac_byname(d.buf)) == 0) {
       a_format(e, "unknown-mac", "%s", d.buf, A_END);
@@ -1047,6 +1046,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);