Apply apply-all

Author: sander

prototype.lisp

@@ -211,11 +211,7 @@
 
 (defclass document () ((pk :reader pk :initarg :pk)))
 (defun make-document (hdk doc salt index)
-  (make-instance 'document
-                 :pk (blind-public-key (bl hdk)
-                                       (pk doc)
-                                       (derive-blind-key (bl hdk) salt)
-                                       (create-context hdk index))))
+  (make-instance 'document :pk (apply-all hdk index (pk doc) salt)))
 
 (defclass app ()
   ((hdk :reader hdk :initarg :hdk)
@@ -242,12 +238,9 @@
 		   (nth-value 2 (fold-hdk app hdk))))
 (defun accept-key (app hdk kh index pk-expected)
   (let* ((salt (decap (kem (hdk app)) kh (delegate-key-creation app hdk)))
-         (pk-bl (get-key-info app hdk))
-	 (bk (derive-blind-key (bl (hdk app)) salt))
-         (ctx (create-context (hdk app) index)))
-    (let ((pk-blinded (blind-public-key (bl (hdk app)) pk-bl bk ctx)))
-      (assert (crypto:ec-point-equal pk-expected pk-blinded)))
-    (append hdk (list kh index))))
+         (pk (apply-all (hdk app) index (get-key-info app hdk) salt)))
+    (assert (crypto:ec-point-equal pk-expected pk)))
+  (append hdk (list kh index)))
 
 (defconstant +hdk-root+ '(0))
 (defclass unit ()