Make all MACs inherit from a MAC class

8 files changed, 9 insertions, 7 deletions

diff --git a/src/macs/blake2-mac.lisp b/src/macs/blake2-mac.lisp
index 6b2f9c9..235ae56 100644
--- a/src/macs/blake2-mac.lisp
+++ b/src/macs/blake2-mac.lisp
@@ -4,7 +4,7 @@
 (in-package :crypto)
 
 
-(defclass blake2-mac ()
+(defclass blake2-mac (mac)
   ((digest :accessor blake2-digest :initarg :digest)
    (digest-length :accessor digest-length :initarg :digest-length)))
 
diff --git a/src/macs/blake2s-mac.lisp b/src/macs/blake2s-mac.lisp
index 6dd8609..6db4900 100644
--- a/src/macs/blake2s-mac.lisp
+++ b/src/macs/blake2s-mac.lisp
@@ -4,7 +4,7 @@
 (in-package :crypto)
 
 
-(defclass blake2s-mac ()
+(defclass blake2s-mac (mac)
   ((digest :accessor blake2s-digest :initarg :digest)
    (digest-length :accessor digest-length :initarg :digest-length)))
 
diff --git a/src/macs/cmac.lisp b/src/macs/cmac.lisp
index 8aaf408..5f4ae3f 100644
--- a/src/macs/cmac.lisp
+++ b/src/macs/cmac.lisp
@@ -3,7 +3,7 @@
 
 (in-package :crypto)
 
-(defclass cmac ()
+(defclass cmac (mac)
   ((cipher :reader cmac-cipher :initarg :cipher)
    (subkey1 :reader cmac-subkey1 :initarg :subkey1
             :type (simple-array (unsigned-byte 8) (*)))
diff --git a/src/macs/gmac.lisp b/src/macs/gmac.lisp
index d57c5e0..d110891 100644
--- a/src/macs/gmac.lisp
+++ b/src/macs/gmac.lisp
@@ -5,7 +5,7 @@
 (in-package :crypto)
 
 
-(defclass gmac ()
+(defclass gmac (mac)
   ((accumulator :accessor gmac-accumulator
                 :initform (make-array 16 :element-type '(unsigned-byte 8))
                 :type (simple-array (unsigned-byte 8) (16)))
diff --git a/src/macs/hmac.lisp b/src/macs/hmac.lisp
index 3e07ab8..9eb0d4e 100644
--- a/src/macs/hmac.lisp
+++ b/src/macs/hmac.lisp
@@ -3,7 +3,7 @@
 
 (in-package :crypto)
 
-(defclass hmac ()
+(defclass hmac (mac)
   ((inner-digest :reader inner-digest :initarg :inner-digest)
    (outer-digest :reader outer-digest :initarg :outer-digest)))
 
diff --git a/src/macs/mac.lisp b/src/macs/mac.lisp
index 1d1d8ef..313dca6 100644
--- a/src/macs/mac.lisp
+++ b/src/macs/mac.lisp
@@ -4,6 +4,8 @@
 (in-package :crypto)
 
 
+(defclass mac () ())
+
 (defun macp (sym)
   (get sym '%make-mac))
 
diff --git a/src/macs/poly1305.lisp b/src/macs/poly1305.lisp
index b65ea01..f3aca1b 100644
--- a/src/macs/poly1305.lisp
+++ b/src/macs/poly1305.lisp
@@ -5,7 +5,7 @@
 (in-package :crypto)
 
 
-(defclass poly1305 ()
+(defclass poly1305 (mac)
   ((accumulator :accessor poly1305-accumulator
                 :initform (make-array 5 :element-type '(unsigned-byte 32))
                 :type (simple-array (unsigned-byte 32) (5)))
diff --git a/src/macs/skein-mac.lisp b/src/macs/skein-mac.lisp
index 2b5840d..408473c 100644
--- a/src/macs/skein-mac.lisp
+++ b/src/macs/skein-mac.lisp
@@ -4,7 +4,7 @@
 (in-package :crypto)
 
 
-(defclass skein-mac ()
+(defclass skein-mac (mac)
   ((value :accessor skein-value :initarg :value)
    (tweak :accessor skein-tweak :initarg :tweak)
    (cfg :accessor skein-cfg :initarg :cfg)