X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/fea9a197c6ca55a1c3c57798e0dc59949c59633c..df82bc85db06b9cd8917aec33aadaf151d9d4a46:/mgf-def.h

diff --git a/mgf-def.h b/mgf-def.h
index 9565093..6d9f4e5 100644
--- a/mgf-def.h
+++ b/mgf-def.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: mgf-def.h,v 1.1 2000/06/17 11:33:11 mdw Exp $
+ * $Id: mgf-def.h,v 1.2 2004/04/08 01:36:15 mdw Exp $
  *
  * Definitions for the MGF-1 mask generator
  *
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,26 +15,18 @@
  * 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.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mgf-def.h,v $
- * Revision 1.1  2000/06/17 11:33:11  mdw
- * MGF-1 support, as defined in PKCS#1.
- *
- */
-
 #ifndef CATACOMB_MGF_DEF_H
 #define CATACOMB_MGF_DEF_H
 
@@ -95,7 +87,7 @@ void pre##_mgfkeybegin(pre##_mgfctx *k)					\
   k->bsz = 0;								\
   pre##_init(&k->k);							\
 }									\
-  									\
+									\
 void pre##_mgfkeyadd(pre##_mgfctx *k, const void *p, size_t sz)		\
 {									\
   pre##_hash(&k->k, p, sz);						\
@@ -153,8 +145,8 @@ void pre##_mgfencrypt(pre##_mgfctx *k, const void *s,			\
     k->bsz -= n;							\
     if (dd) {								\
       if (!ss) {							\
-        memcpy(dd, p, n);						\
-        dd += n;							\
+	memcpy(dd, p, n);						\
+	dd += n;							\
       } else {								\
 	while (n) {							\
 	  *dd++ = *ss++ ^ *p++;						\
@@ -180,8 +172,8 @@ void pre##_mgfencrypt(pre##_mgfctx *k, const void *s,			\
     if (dd) {								\
       const octet *p = k->buf;						\
       if (!ss) {							\
-        memcpy(dd, p, n);						\
-        dd += n;							\
+	memcpy(dd, p, n);						\
+	dd += n;							\
       } else {								\
 	while (n) {							\
 	  *dd++ = *ss++ ^ *p++;						\
@@ -427,22 +419,22 @@ int main(void)								\
     if (memcmp(pt, text, sizeof(text)) == 0) {				\
       done++;								\
       if (sizeof(text) < 40 || done % 8 == 0)				\
-        fputc('.', stdout);						\
+	fputc('.', stdout);						\
       if (done % 480 == 0)						\
-        fputs("\n\t", stdout);						\
+	fputs("\n\t", stdout);						\
       fflush(stdout);							\
     } else {								\
       printf("\nError (sz = %lu)\n", (unsigned long)sz);		\
       status = 1;							\
       printf("\tplaintext      = "); hexdump(text, sz);			\
-        printf(", "); hexdump(text + sz, rest);				\
-        fputc('\n', stdout);						\
+	printf(", "); hexdump(text + sz, rest);				\
+	fputc('\n', stdout);						\
       printf("\tciphertext     = "); hexdump(ct, sz);			\
-        printf(", "); hexdump(ct + sz, rest);				\
-        fputc('\n', stdout);						\
+	printf(", "); hexdump(ct + sz, rest);				\
+	fputc('\n', stdout);						\
       printf("\trecovered text = "); hexdump(pt, sz);			\
-        printf(", "); hexdump(pt + sz, rest);				\
-        fputc('\n', stdout);						\
+	printf(", "); hexdump(pt + sz, rest);				\
+	fputc('\n', stdout);						\
       fputc('\n', stdout);						\
     }									\
     if (sz < 63)							\