X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/84f87e82eb7ab4fb0bb39d5d9800b740d528e6c9..935da5a413575e01bc3273bb93b2efacbbe47759:/ipif/mech-pkcs5.c

diff --git a/ipif/mech-pkcs5.c b/ipif/mech-pkcs5.c
index 3603276..f03787b 100644
--- a/ipif/mech-pkcs5.c
+++ b/ipif/mech-pkcs5.c
@@ -1,13 +1,30 @@
 /*
- * PKCS#5 padding
+ * PKCS#5 padding mechanism for udp tunnel
  *
  * arguments: block size to pad to, must be power of 2
  *
  * encoding: append between 1 and n bytes, all of the same value being
  *           the number of bytes appended
  */
+/*
+ * Copyright (C) 2000 Ian Jackson
+ *
+ * This 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.
+ *
+ * This program 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 userv-utils; if not, write to the Free Software
+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
 
-#include "mech.h"
+#include "forwarder.h"
 
 struct mechdata {
   unsigned mask;
@@ -21,7 +38,7 @@ static unsigned long setup(struct mechdata **md_r) {
 
   blocksize= getarg_ulong();
   md->mask= blocksize - 1;
-  arg_assert(!md->mask & blocksize);
+  arg_assert(!(md->mask & blocksize));
   arg_assert(blocksize <= 255);
 
   *md_r= md;
@@ -58,11 +75,11 @@ static const char *mdec_pkcs5(struct mechdata *md, struct buffer *buf) {
   unsigned padlen;
   int i;
 
-  BUF_UNPREPEND(padp,buf,1);
+  BUF_UNAPPEND(padp,buf,1);
   padlen= *padp;
-  if (!padlen || (padlen & ~md->mask)) return "invalid length";
+  if (!padlen || (padlen > md->mask+1)) return "invalid length";
 
-  BUF_UNPREPEND(padp,buf,padlen-1);
+  BUF_UNAPPEND(padp,buf,padlen-1);
   for (i=0; i<padlen-1; i++)
     if (*++padp != padlen) return "corrupted padding";