catcrypt.c: Don't close output file twice.

[u/mdw/catacomb] / gcipher.h

diff --git a/gcipher.h b/gcipher.h
index 4831913..5682738 100644 (file)
--- a/gcipher.h
+++ b/gcipher.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: gcipher.h,v 1.1 1999/12/10 23:16:01 mdw Exp $
+ * $Id: gcipher.h,v 1.5 2004/04/21 00:37:32 mdw Exp $
  *
  * Generic symmetric cipher interface
  *
  * (c) 1999 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: gcipher.h,v $
- * Revision 1.1  1999/12/10 23:16:01  mdw
- * Generic interface.
- *
- */
-
 #ifndef CATACOMB_GCIPHER_H
 #define CATACOMB_GCIPHER_H
 
@@ -46,20 +38,20 @@
 
 #include <stddef.h>
 
-/*----- Generic symmetric cipher interface --------------------------------*/
+#include <mLib/bits.h>
 
-typedef struct gccipher_base {
-  const char *name;                    /* Cipher name */
-  size_t keysz;                                /* Preferred key size in bytes */
-  size_t blksz;                                /* Block size or zero if none */
-} gccipher_base;
+#ifndef CATACOMB_KEYSZ_H
+#  include "keysz.h"
+#endif
+
+/*----- Generic symmetric cipher interface --------------------------------*/
 
 typedef struct gcipher {
   const struct gcipher_ops *ops;       /* Pointer to cipher operations */
 } gcipher;
 
 typedef struct gcipher_ops {
-  const struct gccipher_base *b;       /* Pointer to basic information */
+  const struct gccipher *c;            /* Pointer to cipher class */
   void (*encrypt)(gcipher */*c*/, const void */*s*/,
                  void */*t*/, size_t /*sz*/);
   void (*decrypt)(gcipher */*c*/, const void */*s*/,
@@ -70,10 +62,33 @@ typedef struct gcipher_ops {
 } gcipher_ops;
 
 typedef struct gccipher {
-  gccipher_base b;
+  const char *name;                    /* Cipher name */
+  const octet *keysz;                  /* Preferred key size table */
+  size_t blksz;                                /* Block size or zero if none */
   gcipher *(*init)(const void */*k*/, size_t /*sz*/);
 } gccipher;
 
+#define GC_INIT(cc, k, sz)     (cc)->init((k), (sz))
+#define GC_CLASS(cc)           (cc)->ops->c
+#define GC_ENCRYPT(c, s, t, sz)        (c)->ops->encrypt((c), (s), (t), (sz))
+#define GC_DECRYPT(c, s, t, sz)        (c)->ops->decrypt((c), (s), (t), (sz))
+#define GC_DESTROY(c)          (c)->ops->destroy((c))
+#define GC_SETIV(c, iv)                (c)->ops->setiv((c), (iv))
+#define GC_BDRY(c)             (c)->ops->bdry((c))
+
+/*----- Tables ------------------------------------------------------------*/
+
+extern const gccipher *const gciphertab[];
+
+/* --- @gcipher_byname@ --- *
+ *
+ * Arguments:  @const char *p@ = pointer to name string
+ *
+ * Returns:    The named cipher class, or null.
+ */
+
+extern const gccipher *gcipher_byname(const char */*p*/);
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus