mp-gcd, gf-gcd: Tweak memory management subtly.

[u/mdw/catacomb] / gcipher.h

diff --git a/gcipher.h b/gcipher.h
index b8c34bf..42faad4 100644 (file)
--- a/gcipher.h
+++ b/gcipher.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: gcipher.h,v 1.2 2000/06/17 10:56:00 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,29 +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.2  2000/06/17 10:56:00  mdw
- * New key size interface.
- *
- * Revision 1.1  1999/12/10 23:16:01  mdw
- * Generic interface.
- *
- */
-
 #ifndef CATACOMB_GCIPHER_H
 #define CATACOMB_GCIPHER_H
 
@@ -75,6 +64,14 @@ typedef struct gccipher {
   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))
+
 /*----- Key size management -----------------------------------------------*/
 
 /* --- Key size type constants --- *
@@ -120,6 +117,19 @@ extern size_t keysz(size_t /*sz*/, const octet */*ksz*/);
 #define KSZ_ASSERT(pre, sz)                                            \
   assert(((void)"Bad key size for " #pre, KSZ_CHECK(pre, sz)))
 
+/*----- 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